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

[operator] Bump default version to v0.111.0 #1405

Merged
merged 5 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ check-operator-crds:
$(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetryinstrumentation.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/community/manifests/opentelemetry.io_instrumentations.yaml)
$(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetry.io_opampbridges.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/community/manifests/opentelemetry.io_opampbridges.yaml)

@sed -i '/{{- if \.Values\.admissionWebhooks\.create }}/d' "./charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml"
@sed -i '0,/{{- end }}/{/{{- end }}/d}' "./charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml"

if diff ${TMP_DIRECTORY}/crds ./charts/opentelemetry-operator/conf/crds > /dev/null; then \
echo "Passed"; \
rm -rf ${TMP_DIRECTORY}; \
Expand All @@ -91,5 +88,7 @@ define get-crd
@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)
@echo '{{- end }}' >> $(1)
endef
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-operator
version: 0.71.3
version: 0.72.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.110.0
appVersion: 0.111.0
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,19 @@ spec:
properties:
endpoint:
type: string
tls:
properties:
ca_file:
type: string
cert_file:
type: string
configMapName:
type: string
key_file:
type: string
secretName:
type: string
type: object
type: object
go:
properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down Expand Up @@ -91,9 +91,9 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11417,6 +11417,19 @@ spec:
properties:
endpoint:
type: string
tls:
properties:
ca_file:
type: string
cert_file:
type: string
configMapName:
type: string
key_file:
type: string
secretName:
type: string
type: object
type: object
go:
properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand All @@ -30,9 +30,9 @@ apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down Expand Up @@ -223,9 +223,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand All @@ -242,9 +242,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand All @@ -26,9 +26,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down Expand Up @@ -34,13 +34,13 @@ spec:
- --enable-leader-election
- --health-probe-addr=:8081
- --webhook-port=9443
- --collector-image=otel/opentelemetry-collector-k8s:0.110.0
- --collector-image=otel/opentelemetry-collector-k8s:0.111.0
command:
- /manager
env:
- name: ENABLE_WEBHOOKS
value: "true"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.110.0"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.111.0"
name: manager
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand All @@ -32,9 +32,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: opentelemetry-operator
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: "example-opentelemetry-operator-cert-manager"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: "example-opentelemetry-operator-metrics"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down Expand Up @@ -44,9 +44,9 @@ metadata:
name: "example-opentelemetry-operator-webhook"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.71.3
helm.sh/chart: opentelemetry-operator-0.72.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/version: "0.111.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ manager:
tag: ""
collectorImage:
repository: ""
tag: 0.110.0
tag: 0.111.0
opampBridgeImage:
repository: ""
tag: ""
Expand Down
Loading