Merge branch 'main' into bump-collector

open-telemetry · Apr 14, 2024 · 1158da3 · 1158da3
2 parents 69dc61e + 01182b7
commit 1158da3
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 36 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.53.2
+version: 0.54.0
 description: OpenTelemetry Operator Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

diff --git a/charts/opentelemetry-operator/UPGRADING.md b/charts/opentelemetry-operator/UPGRADING.md
@@ -1,5 +1,15 @@
 # Upgrade guidelines
 
+## <0.54.0 to 0.54.0
+[Changes to functionality, and variable names used for providing user-managed webhook certificates](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/1121)
+
+Below variables have been renamed to be consistent with the chart's naming format. v0.54.0 also has a bug fix which makes the chart now read the contents of the file paths provided by these variables, instead of just using the value of the variables.
+```
+admissionWebhooks.ca_file -> admissionWebhooks.caFile
+admissionWebhooks.cert_file -> admissionWebhooks.certFile
+admissionWebhooks.key_file -> admissionWebhooks.keyFile
+```
+
 ## <0.50.0 to 0.50.0
 
 Additional properties are not allowed anymore, so care must be taken that no old or misspelled ones are present anymore.
@@ -24,7 +34,7 @@ Some CI/CD tools might create duplicate resources when upgrading from an older v
 `fullnameOverride` can be used to keep `deployment` resource consistent with the same name during an upgrade.
 
 ## 0.16.0 to 0.17.0
- 
+
 The v0.17.0 helm chart version changes OpenTelemetry Collector image to the contrib version. If you want to use the core version, set `manager.collectorImage.repository` to `otel/opentelemetry-collector`.
 
 ## 0.15.0 to 0.16.0

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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.1"
     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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.1"
     app.kubernetes.io/managed-by: Helm
@@ -241,7 +241,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.1"
     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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.1"
     app.kubernetes.io/managed-by: Helm
@@ -32,7 +32,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.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.53.2
+    helm.sh/chart: opentelemetry-operator-0.54.0
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.97.1"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/templates/_helpers.tpl b/charts/opentelemetry-operator/templates/_helpers.tpl
@@ -117,9 +117,9 @@ a cert is loaded from an existing secret or is provided via `.Values`
 {{- $caCertEnc = b64enc $ca.Cert }}
 {{- end }}
 {{- else }}
-{{- $certCrtEnc = b64enc .Values.admissionWebhooks.cert_file }}
-{{- $certKeyEnc = b64enc .Values.admissionWebhooks.key_file }}
-{{- $caCertEnc = b64enc .Values.admissionWebhooks.ca_file }}
+{{- $certCrtEnc = .Files.Get .Values.admissionWebhooks.cert_file | b64enc }}
+{{- $certKeyEnc = .Files.Get .Values.admissionWebhooks.key_file | b64enc }}
+{{- $caCertEnc = .Files.Get .Values.admissionWebhooks.ca_file | b64enc }}
 {{- end }}
 {{- $result := dict "crt" $certCrtEnc "key" $certKeyEnc "ca" $caCertEnc }}
 {{- $result | toYaml }}

diff --git a/charts/opentelemetry-operator/values.schema.json b/charts/opentelemetry-operator/values.schema.json
@@ -1296,9 +1296,9 @@
                 "objectSelector",
                 "certManager",
                 "autoGenerateCert",
-                "cert_file",
-                "key_file",
-                "ca_file",
+                "certFile",
+                "keyFile",
+                "caFile",
                 "serviceAnnotations",
                 "secretAnnotations",
                 "secretLabels"
@@ -1475,26 +1475,26 @@
                         "recreate": true
                     }]
                 },
-                "cert_file": {
+                "certFile": {
                     "type": "string",
                     "default": "",
-                    "title": "The cert_file Schema",
+                    "title": "File path to self-managed TLS certificate.",
                     "examples": [
                         ""
                     ]
                 },
-                "key_file": {
+                "keyFile": {
                     "type": "string",
                     "default": "",
-                    "title": "The key_file Schema",
+                    "title": "File path to self-managed TLS key.",
                     "examples": [
                         ""
                     ]
                 },
-                "ca_file": {
+                "caFile": {
                     "type": "string",
                     "default": "",
-                    "title": "The ca_file Schema",
+                    "title": "File path to self-managed CA bundle.",
                     "examples": [
                         ""
                     ]

diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml
@@ -244,13 +244,16 @@ admissionWebhooks:
     recreate: true
 
   ## TLS Certificate Option 3: Use your own self-signed certificate.
-  ## certManager and autoGenerateCert must be disabled and cert_file, key_file, and ca_file must be set.
+  ## certManager and autoGenerateCert must be disabled and certFile, keyFile, and caFile must be set.
+  ## The chart reads the contents of the file paths with the helm .Files.Get function.
+  ## Refer to this doc https://helm.sh/docs/chart_template_guide/accessing_files/ to understand
+  ## limitations of file paths accessible to the chart.
   ## Path to your own PEM-encoded certificate.
-  cert_file: ""
+  certFile: ""
   ## Path to your own PEM-encoded private key.
-  key_file: ""
+  keyFile: ""
   ## Path to the CA cert.
-  ca_file: ""
+  caFile: ""
 
   # Adds additional annotations to the admissionWebhook Service
   serviceAnnotations: {}