Skip to content

Commit

Permalink
Upgrade operator to v0.82.0 (open-telemetry#854)
Browse files Browse the repository at this point in the history
* Upgrade operator to v0.82.0

* ci: fix operator E2E tests
  • Loading branch information
swiatekm authored Aug 10, 2023
1 parent cf53841 commit 3cb40c3
Show file tree
Hide file tree
Showing 15 changed files with 554 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/operator-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
LOCAL_TARGET_ALLOCATOR_IMG="local\/opentelemetry-operator-targetallocator:e2e"
PUBLIC_TARGET_ALLOCATOR_IMG="ghcr.io\/open-telemetry\/opentelemetry-operator\/target-allocator:0.1.0"
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/smoke-targetallocator/00-install.yaml
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/smoke-targetallocator/*.yaml
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/targetallocator-features/00-install.yaml
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/prometheus-config-validation/*.yaml
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.34.1
version: 0.35.0
description: OpenTelemetry Operator Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -11,4 +11,4 @@ maintainers:
- name: dmitryax
- name: TylerHelmuth
icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
appVersion: 0.81.0
appVersion: 0.82.0
511 changes: 511 additions & 0 deletions charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml

Large diffs are not rendered by default.

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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down Expand Up @@ -85,9 +85,9 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand All @@ -29,9 +29,9 @@ apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down Expand Up @@ -201,9 +201,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -219,9 +219,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -25,9 +25,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -33,13 +33,13 @@ spec:
- --enable-leader-election
- --health-probe-addr=:8081
- --webhook-port=9443
- --collector-image=otel/opentelemetry-collector-contrib:0.81.0
- --collector-image=otel/opentelemetry-collector-contrib:0.82.0
command:
- /manager
env:
- name: ENABLE_WEBHOOKS
value: "true"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.81.0"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.82.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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -31,9 +31,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
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.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down Expand Up @@ -43,9 +43,9 @@ metadata:
name: "example-opentelemetry-operator-webhook"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.34.1
helm.sh/chart: opentelemetry-operator-0.35.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.82.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ pdb:
manager:
image:
repository: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
tag: v0.81.0
tag: v0.82.0
collectorImage:
repository: otel/opentelemetry-collector-contrib
tag: 0.81.0
tag: 0.82.0
targetAllocatorImage:
repository: ""
tag: ""
Expand Down

0 comments on commit 3cb40c3

Please sign in to comment.