Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set Port for the webhook #982

Merged
merged 2 commits into from
Dec 13, 2023
Merged

Set Port for the webhook #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fe0d3d
Set webhook port correctly
jaronoff97 Dec 13, 2023
5c7c03c
whoops
jaronoff97 Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-operator
version: 0.44.0
version: 0.44.1
description: OpenTelemetry Operator Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
11 changes: 9 additions & 2 deletions ...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -21,6 +21,7 @@ webhooks:
name: example-opentelemetry-operator-webhook
namespace: default
path: /mutate-opentelemetry-io-v1alpha1-instrumentation
port: 443
failurePolicy: Fail
name: minstrumentation.kb.io
rules:
Expand All @@ -43,6 +44,7 @@ webhooks:
name: example-opentelemetry-operator-webhook
namespace: default
path: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector
port: 443
failurePolicy: Fail
name: mopentelemetrycollector.kb.io
rules:
Expand All @@ -65,6 +67,7 @@ webhooks:
name: example-opentelemetry-operator-webhook
namespace: default
path: /mutate-v1-pod
port: 443
failurePolicy: Ignore
name: mpod.kb.io
rules:
Expand All @@ -88,7 +91,7 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -103,6 +106,7 @@ webhooks:
name: example-opentelemetry-operator-webhook
namespace: default
path: /validate-opentelemetry-io-v1alpha1-instrumentation
port: 443
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

per the docs, 443 is the default so setting it does nothing

failurePolicy: Fail
name: vinstrumentationcreateupdate.kb.io
rules:
Expand All @@ -125,6 +129,7 @@ webhooks:
name: example-opentelemetry-operator-webhook
namespace: default
path: /validate-opentelemetry-io-v1alpha1-instrumentation
port: 443
failurePolicy: Ignore
name: vinstrumentationdelete.kb.io
rules:
Expand All @@ -146,6 +151,7 @@ webhooks:
name: example-opentelemetry-operator-webhook
namespace: default
path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
port: 443
failurePolicy: Fail
name: vopentelemetrycollectorcreateupdate.kb.io
rules:
Expand All @@ -168,6 +174,7 @@ webhooks:
name: example-opentelemetry-operator-webhook
namespace: default
path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
port: 443
failurePolicy: Ignore
name: vopentelemetrycollectordelete.kb.io
rules:
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -29,7 +29,7 @@ apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down
6 changes: 3 additions & 3 deletions charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -253,7 +253,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -271,7 +271,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -25,7 +25,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/examples/default/rendered/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/examples/default/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -31,7 +31,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: opentelemetry-operator
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down
2 changes: 1 addition & 1 deletion ...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: "example-opentelemetry-operator-cert-manager"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: "example-opentelemetry-operator-metrics"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -43,7 +43,7 @@ metadata:
name: "example-opentelemetry-operator-webhook"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.44.0
helm.sh/chart: opentelemetry-operator-0.44.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
Expand Down
7 changes: 7 additions & 0 deletions ...entelemetry-operator/templates/admission-webhooks/operator-webhook-with-cert-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /mutate-opentelemetry-io-v1alpha1-instrumentation
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
name: minstrumentation.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -46,6 +47,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
name: mopentelemetrycollector.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -76,6 +78,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /mutate-v1-pod
port: {{ .Values.admissionWebhooks.servicePort }}
{{- if .Values.admissionWebhooks.namespaceSelector }}
namespaceSelector:
{{- toYaml .Values.admissionWebhooks.namespaceSelector | nindent 6 }}
Expand Down Expand Up @@ -117,6 +120,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /validate-opentelemetry-io-v1alpha1-instrumentation
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
name: vinstrumentationcreateupdate.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -147,6 +151,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /validate-opentelemetry-io-v1alpha1-instrumentation
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: Ignore
name: vinstrumentationdelete.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -176,6 +181,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
name: vopentelemetrycollectorcreateupdate.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -206,6 +212,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: Ignore
name: vopentelemetrycollectordelete.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down
7 changes: 7 additions & 0 deletions charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /mutate-opentelemetry-io-v1alpha1-instrumentation
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
name: minstrumentation.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -73,6 +74,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
name: mopentelemetrycollector.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -104,6 +106,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /mutate-v1-pod
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: {{ .Values.admissionWebhooks.pods.failurePolicy }}
name: mpod.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -146,6 +149,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /validate-opentelemetry-io-v1alpha1-instrumentation
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
name: vinstrumentationcreateupdate.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -177,6 +181,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /validate-opentelemetry-io-v1alpha1-instrumentation
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: Ignore
name: vinstrumentationdelete.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -207,6 +212,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
name: vopentelemetrycollectorcreateupdate.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down Expand Up @@ -238,6 +244,7 @@ webhooks:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
port: {{ .Values.admissionWebhooks.servicePort }}
failurePolicy: Ignore
name: vopentelemetrycollectordelete.kb.io
{{- if .Values.admissionWebhooks.namespaceSelector }}
Expand Down