[operator] Add the ability to add additionalLabels

This already existed in the `opentelemetry-collector` chart, now it is available in the `opentelemetry-operator` as well. These labels can be useful in environments where additional labels are recommended or required.
open-telemetry · Mar 6, 2024 · b32b80d · b32b80d
1 parent 84340a4
commit b32b80d
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 1 deletion.
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
@@ -11,6 +11,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: webhook
   name: example-opentelemetry-operator-mutation
 webhooks:
@@ -96,6 +97,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: webhook
   name: example-opentelemetry-operator-validation
 webhooks:

diff --git a/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml b/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml
@@ -9,6 +9,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: webhook
   name: example-opentelemetry-operator-serving-cert
   namespace: default
@@ -34,6 +35,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: webhook
   name: example-opentelemetry-operator-selfsigned-issuer
   namespace: default

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
@@ -9,6 +9,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   name: example-opentelemetry-operator-manager
 rules:
@@ -258,6 +259,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   name: example-opentelemetry-operator-metrics
 rules:
@@ -276,6 +278,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   name: example-opentelemetry-operator-proxy
 rules:

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml
@@ -9,6 +9,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   name: example-opentelemetry-operator-manager
 roleRef:
@@ -30,6 +31,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   name: example-opentelemetry-operator-proxy
 roleRef:

diff --git a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
@@ -9,6 +9,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   name: example-opentelemetry-operator
   namespace: default

diff --git a/charts/opentelemetry-operator/examples/default/rendered/role.yaml b/charts/opentelemetry-operator/examples/default/rendered/role.yaml
@@ -9,6 +9,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   name: example-opentelemetry-operator-leader-election
   namespace: default

diff --git a/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml
@@ -9,6 +9,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   name: example-opentelemetry-operator-leader-election
   namespace: default

diff --git a/charts/opentelemetry-operator/examples/default/rendered/service.yaml b/charts/opentelemetry-operator/examples/default/rendered/service.yaml
@@ -9,6 +9,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   name: example-opentelemetry-operator
   namespace: default
@@ -36,6 +37,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   name: example-opentelemetry-operator-webhook
   namespace: default

diff --git a/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml
@@ -11,4 +11,5 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
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
@@ -11,6 +11,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: webhook
   annotations:
     "helm.sh/hook": test

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
@@ -11,6 +11,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   annotations:
     "helm.sh/hook": test
@@ -48,6 +49,7 @@ metadata:
     app.kubernetes.io/version: "0.94.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
+
     app.kubernetes.io/component: controller-manager
   annotations:
     "helm.sh/hook": test

diff --git a/charts/opentelemetry-operator/templates/_helpers.tpl b/charts/opentelemetry-operator/templates/_helpers.tpl
@@ -41,6 +41,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{ include "opentelemetry-operator.additionalLabels" . }}
 {{- end }}
 
 {{/*
@@ -73,6 +74,12 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
+{{- define "opentelemetry-operator.additionalLabels" -}}
+{{- if .Values.additionalLabels }}
+{{- tpl (.Values.additionalLabels | toYaml) . }}
+{{- end }}
+{{- end }}
+
 {{/*
 Create an ordered name of the MutatingWebhookConfiguration
 */}}

diff --git a/charts/opentelemetry-operator/values.schema.json b/charts/opentelemetry-operator/values.schema.json
@@ -21,7 +21,8 @@
         "hostNetwork",
         "priorityClassName",
         "securityContext",
-        "testFramework"
+        "testFramework",
+        "additionalLabels"
     ],
     "properties": {
         "replicaCount": {
@@ -1660,6 +1661,14 @@
                     "tag": "latest"
                 }
             }]
+        },
+        "additionalLabels": {
+            "type": "object",
+            "default": {},
+            "title": "The additionalLabels Schema",
+            "required": [],
+            "properties": {},
+            "examples": [{}]
         }
     },
     "examples": [{

diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml
@@ -11,6 +11,9 @@ nameOverride: ""
 ## Reference one or more secrets to be used when pulling images from authenticated repositories.
 imagePullSecrets: []
 
+# Common labels to add to all otel-collector resources. Evaluated as a template.
+additionalLabels: {}
+
 ## Pod Disruption Budget configuration
 ##
 pdb: