Merge branch 'main' into main#release#patch

giantswarm · Oct 23, 2024 · 79185f4 · 79185f4
2 parents dfbe297 + 7df6850
commit 79185f4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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