diff --git a/CHANGELOG.md b/CHANGELOG.md index e362c30f..ce653acf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] + ## [0.12.1] - 2024-10-23 +### Added + +- Added enable/disable switch on `tbot` components + ## [0.12.0] - 2024-10-16 ### Changed diff --git a/helm/teleport-operator/templates/tbot-configmap.yaml b/helm/teleport-operator/templates/tbot-configmap.yaml index a4c9e90a..b2f1bb29 100644 --- a/helm/teleport-operator/templates/tbot-configmap.yaml +++ b/helm/teleport-operator/templates/tbot-configmap.yaml @@ -1,3 +1,4 @@ +{{- if .Values.tbot-deployment.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -25,3 +26,4 @@ data: destination: type: kubernetes_secret name: identity-output +{{- end }} diff --git a/helm/teleport-operator/templates/tbot-deployment.yaml b/helm/teleport-operator/templates/tbot-deployment.yaml index d31d7d23..2d1f21c2 100644 --- a/helm/teleport-operator/templates/tbot-deployment.yaml +++ b/helm/teleport-operator/templates/tbot-deployment.yaml @@ -1,3 +1,4 @@ +{{- if .Values.tbot-deployment.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -76,3 +77,4 @@ spec: {{- toYaml .Values.affinity | nindent 8 }} tolerations: {{- toYaml .Values.tolerations | nindent 8 }} +{{- end }} diff --git a/helm/teleport-operator/templates/tbot-networkpolicy.yaml b/helm/teleport-operator/templates/tbot-networkpolicy.yaml index 01964016..659522d0 100644 --- a/helm/teleport-operator/templates/tbot-networkpolicy.yaml +++ b/helm/teleport-operator/templates/tbot-networkpolicy.yaml @@ -1,3 +1,4 @@ +{{- if .Values.tbot-deployment.enabled }} {{- if .Values.ciliumNetworkPolicy.enabled }} apiVersion: cilium.io/v2 kind: CiliumNetworkPolicy @@ -40,3 +41,4 @@ spec: - Egress - Ingress {{- end }} +{{- end }} diff --git a/helm/teleport-operator/values.schema.json b/helm/teleport-operator/values.schema.json index 00e67450..a02cfc49 100644 --- a/helm/teleport-operator/values.schema.json +++ b/helm/teleport-operator/values.schema.json @@ -163,6 +163,14 @@ "type": "boolean" } } + }, + "tbot-deployment": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + } + } } } } diff --git a/helm/teleport-operator/values.yaml b/helm/teleport-operator/values.yaml index d0f96315..6fd8892c 100644 --- a/helm/teleport-operator/values.yaml +++ b/helm/teleport-operator/values.yaml @@ -64,5 +64,10 @@ affinity: - key: "node-role.kubernetes.io/control-plane" operator: "Exists" +# Enables `--tbot` flag, `teleport-tbot` App has to be installed tbot: enabled: false + +# Enables `teleport-operator-tbot` deployment +tbot-deployment: + enabled: true