Make the service port for the webhook configurable (open-telemetry#976)

* make the service port for the webhook configurable * service port * version bump * version bump the examples
giffgaff · Jul 22, 2024 · 766225d · 766225d
1 parent d98be6d
commit 766225d
Show file tree

Hide file tree

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

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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
@@ -88,7 +88,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
@@ -253,7 +253,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
@@ -271,7 +271,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
@@ -31,7 +31,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.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.43.0
+    helm.sh/chart: opentelemetry-operator-0.43.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/templates/service.yaml b/charts/opentelemetry-operator/templates/service.yaml
@@ -34,7 +34,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
-    - port: 443
+    - port: {{ .Values.admissionWebhooks.servicePort }}
       protocol: TCP
       targetPort: webhook-server
   selector:

diff --git a/charts/opentelemetry-operator/templates/tests/test-service-connection.yaml b/charts/opentelemetry-operator/templates/tests/test-service-connection.yaml
@@ -60,7 +60,7 @@ spec:
         - name: WEBHOOK_SERVICE_CLUSTERIP
           value: "{{ include "opentelemetry-operator.fullname" . }}-webhook"
         - name: WEBHOOK_SERVICE_PORT
-          value: "443"
+          value: "{{ .Values.admissionWebhooks.servicePort }}"
       command:
         - sh
         - -c
@@ -82,4 +82,3 @@ spec:
   {{- with .Values.nodeSelector }}
   nodeSelector: {{ toYaml . | nindent 4 }}
   {{- end }}
-
diff --git a/charts/opentelemetry-operator/values.schema.json b/charts/opentelemetry-operator/values.schema.json
@@ -1249,6 +1249,14 @@
                         true
                     ]
                 },
+                "servicePort": {
+                    "type": "integer",
+                    "default": 443,
+                    "title": "The port for the webhook service",
+                    "examples": [
+                        9443
+                    ]
+                },
                 "failurePolicy": {
                     "type": "string",
                     "default": "",

diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml
@@ -184,6 +184,7 @@ kubeRBACProxy:
 ## They also enable the sidecar injection for OpenTelemetryCollector and Instrumentation CR's
 admissionWebhooks:
   create: true
+  servicePort: 443
   failurePolicy: Fail
   secretName: ""