Skip to content

Commit 4900691

Browse files
authored
chore: upgrade opentelemetry-operator (#3985)
* upgrade opentelemetry-operator to v0.93.0 * add targetallocators CRD * don't apply yaml linting to CRDs * Revert "fix: Downgrade helm version in CI (#3984)" This PR upgrades opentelemetry-operator to v0.93.0. This resolves an incompatibility with helm versions > 3.18.4. The TargetAllocator type has been moved into its own CRD, so it has been added as well. As a result of upgrading to opentelemetry-operator v0.93.0, we can revert the workaround we had to add in CI that downgrades helm. Signed-off-by: Eric Chlebek <[email protected]>
1 parent 05f7a59 commit 4900691

File tree

7 files changed

+3425
-42
lines changed

7 files changed

+3425
-42
lines changed

.changelog/3985.fixed.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chore: upgrade opentelemetry-operator to v0.93.0, resolving breakage with helm >= 3.18.5

.github/workflows/pull_requests.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,6 @@ jobs:
105105
needs: [chart-changed]
106106
steps:
107107
- uses: actions/checkout@v4
108-
- name: Setup Helm
109-
run: |
110-
sudo rm -f /usr/local/bin/helm
111-
sudo rm -rf ~/.cache/helm ~/.config/helm
112-
curl -fsSL https://get.helm.sh/helm-v3.18.4-linux-amd64.tar.gz -o helm.tar.gz
113-
tar -zxvf helm.tar.gz
114-
sudo mv linux-amd64/helm /usr/local/bin/helm
115-
helm version
116108
- name: Lint helm chart
117109
if: needs.chart-changed.outputs.any_changed == 'true'
118110
run: |
@@ -187,14 +179,6 @@ jobs:
187179
with:
188180
go-version: "1.22"
189181
cache-dependency-path: "**/go.sum"
190-
- name: Setup Helm
191-
run: |
192-
sudo rm -f /usr/local/bin/helm
193-
sudo rm -rf ~/.cache/helm ~/.config/helm
194-
curl -fsSL https://get.helm.sh/helm-v3.18.4-linux-amd64.tar.gz -o helm.tar.gz
195-
tar -zxvf helm.tar.gz
196-
sudo mv linux-amd64/helm /usr/local/bin/helm
197-
helm version
198182
- name: test
199183
if: needs.chart-changed.outputs.any_changed == 'true'
200184
run: make test-templates

.github/workflows/workflow-integration-tests.yaml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ jobs:
2525
run: |
2626
echo "kind_images=$(jq -cM '.supported' kind_images.json)" >> $GITHUB_OUTPUT
2727
echo "default_kind_image=$(jq -cM '.default' kind_images.json)" >> $GITHUB_OUTPUT
28-
- name: Setup Helm
29-
run: |
30-
sudo rm -f /usr/local/bin/helm
31-
sudo rm -rf ~/.cache/helm ~/.config/helm
32-
curl -fsSL https://get.helm.sh/helm-v3.18.4-linux-amd64.tar.gz -o helm.tar.gz
33-
tar -zxvf helm.tar.gz
34-
sudo mv linux-amd64/helm /usr/local/bin/helm
35-
helm version
3628
- name: Print kind images
3729
run: echo "Kind images ${{ steps.set_kind_images.outputs.kind_images }}"
3830
- id: set_test_names
@@ -85,14 +77,6 @@ jobs:
8577
curl --retry 10 --retry-max-time 120 --retry-delay 5 -Lo ./kind https://kind.sigs.k8s.io/dl/v${{env.KIND_VERSION}}/kind-linux-amd64
8678
chmod +x ./kind
8779
sudo mv ./kind /usr/local/bin/kind
88-
- name: Setup Helm
89-
run: |
90-
sudo rm -f /usr/local/bin/helm
91-
sudo rm -rf ~/.cache/helm ~/.config/helm
92-
curl -fsSL https://get.helm.sh/helm-v3.18.4-linux-amd64.tar.gz -o helm.tar.gz
93-
tar -zxvf helm.tar.gz
94-
sudo mv linux-amd64/helm /usr/local/bin/helm
95-
helm version
9680
- name: Run integration test - ${{ matrix.test_name }}
9781
working-directory: ./tests/integration/
9882
run: make test TEST_NAME=^${{matrix.test_name}}$ KIND_NODE_IMAGE=${{matrix.kind_image}}
@@ -118,14 +102,6 @@ jobs:
118102
curl --retry 10 --retry-max-time 120 --retry-delay 5 -Lo ./kind https://kind.sigs.k8s.io/dl/v${{env.KIND_VERSION}}/kind-linux-amd64
119103
chmod +x ./kind
120104
sudo mv ./kind /usr/local/bin/kind
121-
- name: Setup Helm
122-
run: |
123-
sudo rm -f /usr/local/bin/helm
124-
sudo rm -rf ~/.cache/helm ~/.config/helm
125-
curl -fsSL https://get.helm.sh/helm-v3.18.4-linux-amd64.tar.gz -o helm.tar.gz
126-
tar -zxvf helm.tar.gz
127-
sudo mv linux-amd64/helm /usr/local/bin/helm
128-
helm version
129105
- name: Run integration test - ${{ matrix.test_name }}
130106
working-directory: ./tests/integration/
131107
run: make test TEST_NAME=^${{matrix.test_name}}$ KIND_NODE_IMAGE=${{matrix.kind_image}}

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
# Ignore telm templates
1+
# Ignore helm templates and CRDs
22
deploy/helm/sumologic/conf
33
deploy/helm/sumologic/templates
4+
deploy/helm/sumologic/crds

.yamllint.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
extends: relaxed
22

3+
ignore: |
4+
deploy/helm/sumologic/crds/
5+
36
rules:
47
comments:
58
min-spaces-from-content: 1

deploy/helm/sumologic/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies:
3333
repository: https://sumologic.github.io/tailing-sidecar
3434
condition: tailing-sidecar-operator.enabled
3535
- name: opentelemetry-operator
36-
version: 0.86.4
36+
version: 0.93.0
3737
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
3838
condition: opentelemetry-operator.enabled,sumologic.metrics.collector.otelcol.enabled
3939
- name: prometheus-windows-exporter

0 commit comments

Comments
 (0)