make the service port for the webhook configurable

open-telemetry · Dec 4, 2023 · 16f306f · 16f306f
1 parent edae1f7
commit 16f306f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
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
@@ -92,7 +92,7 @@ manager:
     # add annotations on the ServiceMonitor
     annotations: {}
     metricsEndpoints:
-    - port: metrics
+      - port: metrics
 
   podAnnotations: {}
   podLabels: {}
@@ -108,7 +108,6 @@ manager:
     # add annotations on the PrometheusRule
     annotations: {}
 
-
   ## List of additional cli arguments to configure the manager
   ## for example: --labels, etc.
   extraArgs: []
@@ -145,7 +144,8 @@ manager:
 
   ## Container specific securityContext
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
-  securityContext: {}
+  securityContext:
+    {}
     # allowPrivilegeEscalation: false
     # capabilities:
     #   drop:
@@ -174,7 +174,8 @@ kubeRBACProxy:
 
   ## Container specific securityContext
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
-  securityContext: {}
+  securityContext:
+    {}
     # allowPrivilegeEscalation: false
     # capabilities:
     #   drop:
@@ -184,6 +185,7 @@ kubeRBACProxy:
 ## They also enable the sidecar injection for OpenTelemetryCollector and Instrumentation CR's
 admissionWebhooks:
   create: true
+  servicePort: 443
   failurePolicy: Fail
   secretName: ""
 
@@ -211,7 +213,8 @@ admissionWebhooks:
     enabled: true
     ## Provide the issuer kind and name to do the cert auth job.
     ## By default, OpenTelemetry Operator will use self-signer issuer.
-    issuerRef: {}
+    issuerRef:
+      {}
       # kind:
       # name:
     ## Annotations for the cert and issuer if cert-manager is enabled.