[operator] Fix bug with disabling feature gates (#1490)

* fix(operator): feature gates map allows add empty items * apply feedback * Add new CI test for feature gates --------- Co-authored-by: Marcel Araujo <[email protected]> Co-authored-by: Marcel Araujo <[email protected]>
open-telemetry · Jan 13, 2025 · c1fd94f · c1fd94f
1 parent 2d8972d
commit c1fd94f
Show file tree

Hide file tree

Showing 26 changed files with 55 additions and 48 deletions.
diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-operator
-version: 0.78.1
+version: 0.78.2
 description: OpenTelemetry Operator Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

diff --git a/charts/opentelemetry-operator/ci/feature-gates-values.yaml b/charts/opentelemetry-operator/ci/feature-gates-values.yaml
@@ -0,0 +1,7 @@
+manager:
+  collectorImage:
+    repository: "otel/opentelemetry-collector-k8s"
+  featureGatesMap:
+    operator.targetallocator.mtls: true
+    operator.collector.targetallocatorcr: false
+    operator.observability.prometheus: false
diff --git a/...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -90,7 +90,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml b/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -29,7 +29,7 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -222,7 +222,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -240,7 +240,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -25,7 +25,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/role.yaml b/charts/opentelemetry-operator/examples/default/rendered/role.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/service.yaml b/charts/opentelemetry-operator/examples/default/rendered/service.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -31,7 +31,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   name: opentelemetry-operator
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml b/...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "example-opentelemetry-operator-cert-manager"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "example-opentelemetry-operator-metrics"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -43,7 +43,7 @@ metadata:
   name: "example-opentelemetry-operator-webhook"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/...xamples/feature-gates/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/...xamples/feature-gates/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -90,7 +90,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/certmanager.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/certmanager.yaml
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -29,7 +29,7 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrole.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -256,7 +256,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -274,7 +274,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrolebinding.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -25,7 +25,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/deployment.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/deployment.yaml
@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -34,7 +34,7 @@ spec:
             - --health-probe-addr=:8081
             - --webhook-port=9443
             - --collector-image=otel/opentelemetry-collector-k8s:0.116.1
-            - --feature-gates=operator.targetallocator.mtls
+            - --feature-gates=-operator.collector.targetallocatorcr,-operator.observability.prometheus,operator.targetallocator.mtls
           command:
             - /manager
           env:

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/role.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/role.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/rolebinding.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/rolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/service.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/service.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -31,7 +31,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/serviceaccount.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   name: opentelemetry-operator
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/...telemetry-operator/examples/feature-gates/rendered/tests/test-certmanager-connection.yaml b/...telemetry-operator/examples/feature-gates/rendered/tests/test-certmanager-connection.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "example-opentelemetry-operator-cert-manager"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/...opentelemetry-operator/examples/feature-gates/rendered/tests/test-service-connection.yaml b/...opentelemetry-operator/examples/feature-gates/rendered/tests/test-service-connection.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "example-opentelemetry-operator-metrics"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm
@@ -43,7 +43,7 @@ metadata:
   name: "example-opentelemetry-operator-webhook"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.78.1
+    helm.sh/chart: opentelemetry-operator-0.78.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.116.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/feature-gates/values.yaml b/charts/opentelemetry-operator/examples/feature-gates/values.yaml
@@ -3,3 +3,5 @@ manager:
     repository: "otel/opentelemetry-collector-k8s"
   featureGatesMap:
     operator.targetallocator.mtls: true
+    operator.collector.targetallocatorcr: false
+    operator.observability.prometheus: false
diff --git a/charts/opentelemetry-operator/templates/_helpers.tpl b/charts/opentelemetry-operator/templates/_helpers.tpl
@@ -167,15 +167,13 @@ The image to use for opentelemetry-operator.
 {{- end }}
 
 {{- define "opentelemetry-operator.featureGatesMap" -}}
-{{$first := true}}
-{{- range $key, $value := .Values.manager.featureGatesMap -}}
-    {{- if $first -}}
-        {{ $first = false }}
-    {{- else -}}
-        ,
-    {{- end -}}
-    {{- if $value -}}
-        {{- $key }}
-    {{- end -}}
+{{- $list := list -}}
+{{- range $k, $v := .Values.manager.featureGatesMap -}}
+{{- if $v -}}
+{{- $list = append $list (printf "%s" $k) -}}
+{{- else }}
+{{- $list = append $list (printf "-%s" $k) -}}
+{{- end -}}
 {{- end -}}
+{{ join "," $list }}
 {{- end }}