Set port for webhook in conversion webhook (#1260)

* Set port for webhook * bump v * update make * try again * try again
open-telemetry · Jul 18, 2024 · bc46902 · bc46902
1 parent 5e5e435
commit bc46902
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -86,5 +86,6 @@ define get-crd
 @sed -i "s/opentelemetry-operator-system/{{ .Release.Namespace }}/g" $(1)
 @sed -i 's/opentelemetry-operator-webhook-service/{{ template "opentelemetry-operator.fullname" . }}-webhook/g' $(1)
 @sed -i '1s/^/{{- if .Values.crds.create }}\n/' $(1)
+@sed -i 's#\(.*\)path: /convert#&\n\1port: {{ .Values.admissionWebhooks.servicePort }}#' $(1)
 @echo '{{- end }}' >> $(1)
 endef
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.64.2
+version: 0.64.3
 description: OpenTelemetry Operator Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

diff --git a/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml b/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml
@@ -18,6 +18,7 @@ spec:
           name: {{ template "opentelemetry-operator.fullname" . }}-webhook
           namespace: {{ .Release.Namespace }}
           path: /convert
+          port: {{ .Values.admissionWebhooks.servicePort }}
 {{ if .caBundle }}{{ cat "caBundle:" .caBundle | indent 8 }}{{ end }}
       conversionReviewVersions:
       - v1alpha1

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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.0"
     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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/...opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook.yaml b/...opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook.yaml
@@ -1737,6 +1737,7 @@ spec:
           name: example-opentelemetry-operator-webhook
           namespace: default
           path: /convert
+          port: 443
 
       conversionReviewVersions:
       - v1alpha1

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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.0"
     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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.0"
     app.kubernetes.io/managed-by: Helm
@@ -223,7 +223,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.0"
     app.kubernetes.io/managed-by: Helm
@@ -242,7 +242,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.0"
     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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.0"
     app.kubernetes.io/managed-by: Helm
@@ -32,7 +32,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.0"
     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.64.2
+    helm.sh/chart: opentelemetry-operator-0.64.3
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.103.0"
     app.kubernetes.io/managed-by: Helm