-
Notifications
You must be signed in to change notification settings - Fork 460
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
TylerHelmuth
merged 5 commits into
open-telemetry:main
from
jaronoff97:fix-port-conversion-webhook
Jul 18, 2024
Merged
Set port for webhook in conversion webhook #1260
TylerHelmuth
merged 5 commits into
open-telemetry:main
from
jaronoff97:fix-port-conversion-webhook
Jul 18, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
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
JaredTan95
approved these changes
Jul 17, 2024
CI errors |
Yeah macOS and the sed in the makefile are not happy together. Going to try some more on a VM tomorrow. |
swiatekm
reviewed
Jul 18, 2024
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) |
There was a problem hiding this comment.
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)
swiatekm
approved these changes
Jul 18, 2024
TylerHelmuth
approved these changes
Jul 18, 2024
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #1259
This matches the port for the conversion webhook with the port for webhook service