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

[operator] Bump operator to 0.94.0 #1053

Merged
merged 3 commits into from
Feb 26, 2024
Merged

[operator] Bump operator to 0.94.0 #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f727dd5
Bump operator to 0.94.0
swiatekm Feb 26, 2024
69c3c14
Update operator CONTRIBUTING.md
swiatekm Feb 26, 2024
33718cf
Use chainsaw for operator E2E tests
swiatekm Feb 26, 2024
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
20 changes: 3 additions & 17 deletions .github/workflows/operator-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,8 @@ jobs:
appVersion=$(cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p')
git clone -b v"$appVersion" --single-branch https://github.com/open-telemetry/opentelemetry-operator.git ./opentelemetry-operator

- name: Use public target-allocator image in tests
run: |
appVersion=$(cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p')
LOCAL_TARGET_ALLOCATOR_IMG="local\/opentelemetry-operator-targetallocator:e2e"
PUBLIC_TARGET_ALLOCATOR_IMG="ghcr.io\/open-telemetry\/opentelemetry-operator\/target-allocator:$appVersion"

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
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/targetallocator-prometheuscr/00-install.yaml

- name: Install kuttl
run: |
sudo curl -Lo /usr/local/bin/kubectl-kuttl https://github.com/kudobuilder/kuttl/releases/download/v0.12.1/kubectl-kuttl_0.12.1_linux_x86_64
sudo chmod +x /usr/local/bin/kubectl-kuttl
export PATH=$PATH:/usr/local/bin
- name: Install chainsaw
uses: kyverno/[email protected]

- name: Install metrics-server
run: |
Expand All @@ -75,4 +61,4 @@ jobs:

- name: Run e2e tests
working-directory: ./opentelemetry-operator
run: kubectl kuttl test ./tests/e2e --config ../charts/opentelemetry-operator/kuttl-test.yaml --crd-dir ../charts/opentelemetry-operator/crds
run: chainsaw test --test-dir ./tests/e2e
11 changes: 5 additions & 6 deletions charts/opentelemetry-operator/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
## Bumping Default Operator Version

1. Increase the minor version of the chart by one and set the patch version to zero.
2. Update the chart's `appVersion` to match the new operator version.
3. In the values.yaml, update `manager.image.tag` to match the new operator release.
4. In the values.yaml, update `manager.collectorImage.tag` to match the version of the collector managed by default by the operator.
5. Run `make generate-examples CHARTS=opentelemetry-operator`.
6. Run `make update-operator-crds` to update the CRDs in this chart to match the operator's.
7. Review the [Operator release notes](https://github.com/open-telemetry/opentelemetry-operator/releases). If any changes affect the helm chart, adjust the helm chart accordingly.
1. Update the chart's `appVersion` to match the new operator version.
1. In the values.yaml, update `manager.collectorImage.tag` to match the version of the collector managed by default by the operator.
1. Run `make generate-examples CHARTS=opentelemetry-operator`.
1. Run `make update-operator-crds` to update the CRDs in this chart to match the operator's.
1. Review the [Operator release notes](https://github.com/open-telemetry/opentelemetry-operator/releases). If any changes affect the helm chart, adjust the helm chart accordingly.
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.47.1
version: 0.48.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.93.0
appVersion: 0.94.0
5 changes: 3 additions & 2 deletions charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5064,11 +5064,12 @@ spec:
default: consistent-hashing
description: AllocationStrategy determines which strategy the
target allocator should use for allocation. The current options
are least-weighted and consistent-hashing. The default option
is consistent-hashing
are least-weighted, consistent-hashing and per-node. The default
is consistent-hashing.
enum:
- least-weighted
- consistent-hashing
- per-node
type: string
enabled:
description: Enabled indicates whether to use a target allocation
Expand Down
8 changes: 4 additions & 4 deletions ...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down
8 changes: 4 additions & 4 deletions charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down
12 changes: 6 additions & 6 deletions charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down Expand Up @@ -253,9 +253,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -271,9 +271,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
8 changes: 4 additions & 4 deletions charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
8 changes: 4 additions & 4 deletions charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.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.93.0
- --collector-image=otel/opentelemetry-collector-contrib:0.94.0
command:
- /manager
env:
- name: ENABLE_WEBHOOKS
value: "true"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.93.0"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.94.0"
name: manager
ports:
- containerPort: 8080
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/examples/default/rendered/role.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.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/examples/default/rendered/rolebinding.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
8 changes: 4 additions & 4 deletions charts/opentelemetry-operator/examples/default/rendered/service.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.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/examples/default/rendered/serviceaccount.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
4 changes: 2 additions & 2 deletions ...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down
8 changes: 4 additions & 4 deletions charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml
View file
Open in desktop
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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.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.47.1
helm.sh/chart: opentelemetry-operator-0.48.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/version: "0.94.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
4 changes: 0 additions & 4 deletions charts/opentelemetry-operator/kuttl-test.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ manager:
tag: ""
collectorImage:
repository: otel/opentelemetry-collector-contrib
tag: 0.93.0
tag: 0.94.0
Copy link
Contributor

Choose a reason for hiding this comment

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

can we bump this image to v.0.95.0 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We keep operator releases in lockstep with collector releases, so the version should be the same. In all honestly, we should probably remove this tag from the values file and just use the operator default. I don't want to do so in this PR though.

opampBridgeImage:
repository: ""
tag: ""
Expand Down
Loading