Added new values to allow custom ports (#218)

* Added new values to allow custom ports * Bumped chart's patch version by 1 * Fixed tag position in values.yaml
open-telemetry · Jun 20, 2022 · b75a0e6 · b75a0e6
1 parent 830fa69
commit b75a0e6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 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.8.1
+version: 0.8.2
 description: OpenTelemetry Operator Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

diff --git a/charts/opentelemetry-operator/templates/deployment.yaml b/charts/opentelemetry-operator/templates/deployment.yaml
@@ -23,8 +23,10 @@ spec:
       hostNetwork: {{ .Values.hostNetwork }}
       containers:
         - args:
-            - --metrics-addr=127.0.0.1:8080
+            - --metrics-addr=127.0.0.1:{{ .Values.manager.ports.metricsPort }}
             - --enable-leader-election
+            - --health-probe-addr=:{{ .Values.manager.ports.healthzPort }}
+            - --webhook-port={{ .Values.manager.ports.webhookPort }}
             {{- if and .Values.manager.collectorImage.repository .Values.manager.collectorImage.tag }}
             - --collector-image={{ .Values.manager.collectorImage.repository }}:{{ .Values.manager.collectorImage.tag }}
             {{- end }}
@@ -40,19 +42,19 @@ spec:
           image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}"
           name: manager
           ports:
-            - containerPort: 9443
+            - containerPort: {{ .Values.manager.ports.webhookPort }}
               name: webhook-server
               protocol: TCP
           livenessProbe:
             httpGet:
               path: /healthz
-              port: 8081
+              port: {{ .Values.manager.ports.healthzPort }}
             initialDelaySeconds: 15
             periodSeconds: 20
           readinessProbe:
             httpGet:
               path: /readyz
-              port: 8081
+              port: {{ .Values.manager.ports.healthzPort }}
             initialDelaySeconds: 5
             periodSeconds: 10
           resources: {{ toYaml .Values.manager.resources | nindent 12 }}
@@ -61,14 +63,14 @@ spec:
               name: cert
               readOnly: true
         - args:
-            - --secure-listen-address=0.0.0.0:8443
-            - --upstream=http://127.0.0.1:8080/
+            - --secure-listen-address=0.0.0.0:{{ .Values.kubeRBACProxy.ports.proxyPort }}
+            - --upstream=http://127.0.0.1:{{ .Values.manager.ports.metricsPort }}/
             - --logtostderr=true
             - --v=0
           image: "{{ .Values.kubeRBACProxy.image.repository }}:{{ .Values.kubeRBACProxy.image.tag }}"
           name: kube-rbac-proxy
           ports:
-            - containerPort: 8443
+            - containerPort: {{ .Values.kubeRBACProxy.ports.proxyPort }}
               name: https
               protocol: TCP
           {{- with .Values.kubeRBACProxy.resources }}

diff --git a/charts/opentelemetry-operator/templates/service.yaml b/charts/opentelemetry-operator/templates/service.yaml
@@ -27,7 +27,7 @@ spec:
   ports:
     - port: 443
       protocol: TCP
-      targetPort: 9443
+      targetPort: webhook-server
   selector:
     app.kubernetes.io/name: opentelemetry-operator
     control-plane: controller-manager
diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml
@@ -17,6 +17,10 @@ manager:
   collectorImage:
     repository:
     tag:
+  ports:
+    metricsPort: 8080
+    webhookPort: 9443
+    healthzPort: 8081
   resources:
     limits:
       cpu: 100m
@@ -34,6 +38,8 @@ kubeRBACProxy:
   image:
     repository: gcr.io/kubebuilder/kube-rbac-proxy
     tag: v0.11.0
+  ports:
+    proxyPort: 8443
   resources:
     limits:
       cpu: 500m