Skip to content

Commit

Permalink
[operator] Bump default version to 0.105.0 (#1297)
Browse files Browse the repository at this point in the history
* Bump default version to 0.105.0

* Bump CRDs

* Fix examples

* update CRDs

* regen examples

* update kind def
  • Loading branch information
TylerHelmuth authored Aug 7, 2024
1 parent 8973214 commit 35f4de3
Show file tree
Hide file tree
Showing 18 changed files with 75 additions and 47 deletions.
2 changes: 2 additions & 0 deletions .github/kind-1.24.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
networking:
ipFamily: dual
nodes:
- role: control-plane
image: kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@ check-examples:

.PHONY: update-operator-crds
update-operator-crds:
$(call get-crd,./charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml)
$(call get-crd,./charts/opentelemetry-operator/conf/crds/crd-opentelemetryinstrumentation.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/manifests/opentelemetry.io_instrumentations.yaml)
$(call get-crd,./charts/opentelemetry-operator/conf/crds/crd-opentelemetry.io_opampbridges.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/manifests/opentelemetry.io_opampbridges.yaml)
$(call get-crd,./charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml)
$(call get-crd,./charts/opentelemetry-operator/conf/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,./charts/opentelemetry-operator/conf/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)

.PHONY: check-operator-crds
check-operator-crds:
mkdir -p ${TMP_DIRECTORY}/crds
$(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetrycollector.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml)
$(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetryinstrumentation.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/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/manifests/opentelemetry.io_opampbridges.yaml)
$(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetrycollector.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml)
$(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)
if diff ${TMP_DIRECTORY}/crds ./charts/opentelemetry-operator/conf/crds > /dev/null; then \
echo "Passed"; \
rm -rf ${TMP_DIRECTORY}; \
Expand Down
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.65.2
version: 0.66.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.104.0
appVersion: 0.105.0
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,12 @@ spec:
type: string
imagePullPolicy:
type: string
ipFamilies:
items:
type: string
type: array
ipFamilyPolicy:
type: string
nodeSelector:
additionalProperties:
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6742,6 +6742,13 @@ spec:
- name
type: object
type: array
ipFamilies:
items:
type: string
type: array
ipFamilyPolicy:
default: SingleStack
type: string
lifecycle:
properties:
postStart:
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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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 @@ -594,6 +594,12 @@ spec:
type: string
imagePullPolicy:
type: string
ipFamilies:
items:
type: string
type: array
ipFamilyPolicy:
type: string
nodeSelector:
additionalProperties:
type: string
Expand Down Expand Up @@ -8484,6 +8490,13 @@ spec:
- name
type: object
type: array
ipFamilies:
items:
type: string
type: array
ipFamilyPolicy:
default: SingleStack
type: string
lifecycle:
properties:
postStart:
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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.104.0
- --collector-image=otel/opentelemetry-collector-k8s:0.105.0
command:
- /manager
env:
- name: ENABLE_WEBHOOKS
value: "true"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.104.0"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.65.2
helm.sh/chart: opentelemetry-operator-0.66.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.104.0"
app.kubernetes.io/version: "0.105.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.104.0
tag: 0.105.0
opampBridgeImage:
repository: ""
tag: ""
Expand Down

0 comments on commit 35f4de3

Please sign in to comment.