From 87f04373eda314ba9d3e8d5f06e10dc532563fdd Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Mon, 4 Dec 2023 12:20:02 -0500 Subject: [PATCH] Make the service port for the webhook configurable (#976) * make the service port for the webhook configurable * service port * version bump * version bump the examples --- charts/opentelemetry-operator/Chart.yaml | 2 +- .../operator-webhook-with-cert-manager.yaml | 4 ++-- .../examples/default/rendered/certmanager.yaml | 4 ++-- .../examples/default/rendered/clusterrole.yaml | 6 +++--- .../examples/default/rendered/clusterrolebinding.yaml | 4 ++-- .../examples/default/rendered/deployment.yaml | 2 +- .../examples/default/rendered/role.yaml | 2 +- .../examples/default/rendered/rolebinding.yaml | 2 +- .../examples/default/rendered/service.yaml | 4 ++-- .../examples/default/rendered/serviceaccount.yaml | 2 +- .../rendered/tests/test-certmanager-connection.yaml | 2 +- .../default/rendered/tests/test-service-connection.yaml | 4 ++-- charts/opentelemetry-operator/templates/service.yaml | 2 +- .../templates/tests/test-service-connection.yaml | 3 +-- charts/opentelemetry-operator/values.schema.json | 8 ++++++++ charts/opentelemetry-operator/values.yaml | 1 + 16 files changed, 30 insertions(+), 22 deletions(-) diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml index c1ec0eead..c302e8b4a 100644 --- 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/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml index 04fcd065a..aeb6ea9a3 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml +++ b/charts/opentelemetry-operator/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 index c4b147bef..7bb8114ac 100644 --- 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 index 273fb7f09..32871087d 100644 --- 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 index 36f03bbb8..55afffd87 100644 --- 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 index 28e5f5a6c..6c620f46c 100644 --- 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 index 0705842e5..551877ce4 100644 --- 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 index a0e1584d7..b5e343988 100644 --- 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 index ad52dae71..4fda3547d 100644 --- 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 index 9b9b0ce7d..2ab4b00fb 100644 --- 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/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml index c62700654..f03f5aaf7 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml +++ b/charts/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 index cfb9b7e3c..32d349d9d 100644 --- 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 index e3b08c82f..b523c35fe 100644 --- 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 index 203eb4321..fcceefa59 100644 --- 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 index 591d46923..69992cb1c 100644 --- 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 index 0524229ac..96d939446 100644 --- 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: ""