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

Jump to bottom

Upgrade operator version to 112 #1406

Closed
wants to merge 1 commit into from
Closed

Upgrade operator version to 112 #1406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,19 @@ define get-crd
@sed -i 's#\(.*\)- v1beta1#&\n{{- end }}#' $(1)
@echo '{{- end }}' >> $(1)
endef

# get-crd doesn't work on macos because of sed incompatibility
# when upgrading the CRDs on MacOS, swap usage of get-crd to this macro
define get-crd-macos
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I needed to do this because sed for linux is incompatible with sed on macos 😭

Copy link
Member

@TylerHelmuth TylerHelmuth Nov 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Every time I bump the operator version I accidentally commit my gsed changes lol

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah oop :( so this one is for us!

@curl -s -o $(1) $(2)
@sed -i '' 's#opentelemetry-operator-system/opentelemetry-operator-serving-cert#{{ include "opentelemetry-operator.webhookCertAnnotation" . }}#g' $(1)
@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)
@sed -i '' 's#\(.*\)conversion:#{{- if .Values.admissionWebhooks.create }}\n&#' $(1)
@sed -i '' 's#\(.*\)- v1beta1#&\n{{- end }}#' $(1)
@printf '{{ if .caBundle }}{{ cat "caBundle:" .caBundle | indent 8 }}{{ end }}\n' | \
sed -i '' '/path: \/convert/ r /dev/stdin' $(1)
@echo '{{- end }}' >> $(1)
endef
4 changes: 2 additions & 2 deletions 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.72.0
version: 0.73.0
description: OpenTelemetry Operator Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -12,4 +12,4 @@ maintainers:
- name: jaronoff97
- name: TylerHelmuth
icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
appVersion: 0.111.0
appVersion: 0.112.0
9 changes: 8 additions & 1 deletion charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ spec:
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
namespace: {{ .Release.Namespace }}
path: /convert
port: {{ .Values.admissionWebhooks.servicePort }}
{{ if .caBundle }}{{ cat "caBundle:" .caBundle | indent 8 }}{{ end }}
port: {{ .Values.admissionWebhooks.servicePort }}
conversionReviewVersions:
- v1alpha1
- v1beta1
Expand Down Expand Up @@ -6968,6 +6968,13 @@ spec:
type: boolean
type: object
type: object
persistentVolumeClaimRetentionPolicy:
properties:
whenDeleted:
type: string
whenScaled:
type: string
type: object
podAnnotations:
additionalProperties:
type: string
Expand Down
Loading
Loading