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.

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 webhook in conversion webhook #1260

Merged

Conversation

jaronoff97
Copy link
Contributor

closes #1259

This matches the port for the conversion webhook with the port for webhook service

@jaronoff97 jaronoff97 requested review from Allex1 and a team as code owners July 16, 2024 16:23
@dosubot dosubot bot added size:XS This PR changes 0-9 lines, ignoring generated files. chart:operator Issue related to opentelemetry-operator helm chart labels Jul 16, 2024
@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. and removed size:XS This PR changes 0-9 lines, ignoring generated files. labels Jul 16, 2024
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jul 17, 2024
@JaredTan95
Copy link
Member

CI errors

@jaronoff97
Copy link
Contributor Author

Yeah macOS and the sed in the makefile are not happy together. Going to try some more on a VM tomorrow.

Makefile Outdated
@@ -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 '\#path: /convert#a \nport: {{ .Values.admissionWebhooks.servicePort }}' $(1)
Copy link
Contributor

Choose a reason for hiding this comment

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

The following works on Linux:

sed -i 's#\(.*\)path: /convert#&\n\1port: {{ .Values.admissionWebhooks.servicePort }}#' $(1)

@TylerHelmuth TylerHelmuth merged commit bc46902 into open-telemetry:main Jul 18, 2024
4 checks passed
@jaronoff97 jaronoff97 deleted the fix-port-conversion-webhook branch July 18, 2024 14:26
12ushan pushed a commit to giffgaff/opentelemetry-helm-charts that referenced this pull request Jul 22, 2024
* Set port for webhook

* bump v

* update make

* try again

* try again
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chart:operator Issue related to opentelemetry-operator helm chart lgtm This PR has been approved by a maintainer size:M This PR changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

port should be configurable for conversion webhook
4 participants