Set version label with image tag if provided

open-telemetry · Dec 11, 2024 · c9cff89 · c9cff89
1 parent ef0e1ac
commit c9cff89
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 29 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.60.0
+version: 0.61.0
 description: OpenTelemetry Operator Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

diff --git a/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml b/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml
@@ -1,9 +1,8 @@
-{{- if .Values.crds.create }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: {{ include "opentelemetry-operator.webhookCertAnnotation" . }}
+    cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:
@@ -15,10 +14,9 @@ spec:
     webhook:
       clientConfig:
         service:
-          name: {{ template "opentelemetry-operator.fullname" . }}-webhook
-          namespace: {{ .Release.Namespace }}
+          name: opentelemetry-operator-webhook-service
+          namespace: opentelemetry-operator-system
           path: /convert
-{{ if .caBundle }}{{ cat "caBundle:" .caBundle | indent 8 }}{{ end }}
       conversionReviewVersions:
       - v1alpha1
       - v1beta1
@@ -8643,4 +8641,3 @@ status:
     plural: ""
   conditions: null
   storedVersions: null
-{{- end }}
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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     app.kubernetes.io/managed-by: Helm
@@ -91,7 +91,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     app.kubernetes.io/managed-by: Helm
@@ -30,7 +30,7 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     app.kubernetes.io/managed-by: Helm
@@ -223,7 +223,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     app.kubernetes.io/managed-by: Helm
@@ -242,7 +242,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     app.kubernetes.io/managed-by: Helm
@@ -26,7 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     app.kubernetes.io/managed-by: Helm
@@ -34,7 +34,7 @@ spec:
             - --enable-leader-election
             - --health-probe-addr=:8081
             - --webhook-port=9443
-            - --collector-image=otel/opentelemetry-collector-k8s:0.100.0
+            - --collector-image=otel/opentelemetry-collector-k8s:0.100.1
           command:
             - /manager
           env:

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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     app.kubernetes.io/managed-by: Helm
@@ -32,7 +32,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     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.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     app.kubernetes.io/managed-by: Helm
@@ -44,7 +44,7 @@ metadata:
   name: "example-opentelemetry-operator-webhook"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.60.0
+    helm.sh/chart: opentelemetry-operator-0.61.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.100.1"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/templates/_helpers.tpl b/charts/opentelemetry-operator/templates/_helpers.tpl
@@ -36,8 +36,8 @@ Common labels
 {{- define "opentelemetry-operator.labels" -}}
 helm.sh/chart: {{ include "opentelemetry-operator.chart" . }}
 {{ include "opentelemetry-operator.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- if or .Chart.AppVersion .Values.manager.image.tag }}
+app.kubernetes.io/version: {{ (default .Chart.AppVersion .Values.manager.image.tag) | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml
@@ -42,7 +42,7 @@ manager:
     tag: ""
   collectorImage:
     repository: ""
-    tag: 0.100.0
+    tag: 0.100.1
   opampBridgeImage:
     repository: ""
     tag: ""