Skip to content

Commit 0470868

Browse files
authored
[chore] Fix CI Tests (open-telemetry#2217)
* Fix the tests * remove old one * fix applier
1 parent 94aefb2 commit 0470868

File tree

7 files changed

+8572
-2739
lines changed

7 files changed

+8572
-2739
lines changed

cmd/operator-opamp-bridge/agent/agent_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func TestAgent_onMessage(t *testing.T) {
195195
},
196196
},
197197
status: &protobufs.RemoteConfigStatus{
198-
LastRemoteConfigHash: []byte("good/testnamespace405"),
198+
LastRemoteConfigHash: []byte("good/testnamespace401"),
199199
Status: protobufs.RemoteConfigStatuses_RemoteConfigStatuses_APPLIED,
200200
},
201201
},

config/manager/kustomization.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
resources:
22
- manager.yaml
3+
apiVersion: kustomize.config.k8s.io/v1beta1
4+
kind: Kustomization
5+
images:
6+
- name: controller
7+
newName: ghcr.io/jacob.aronoff/opentelemetry-operator/opentelemetry-operator
8+
newTag: e2e

kuttl-test-upgrade.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
apiVersion: kuttl.dev/v1beta1
1313
kind: TestSuite
1414
commands:
15-
- command: kubectl apply -f ./tests/e2e-upgrade/upgrade-test/opentelemetry-operator-v0.49.0.yaml
15+
- command: kubectl apply -f ./tests/e2e-upgrade/upgrade-test/opentelemetry-operator-v0.86.0.yaml
1616
- command: go run hack/check-operator-ready.go
1717
testDirs:
1818
- ./tests/e2e-upgrade/

tests/e2e-upgrade/upgrade-test/00-assert.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ kind: Deployment
33
metadata:
44
name: simplest-collector
55
annotations:
6-
operatorVersion: "v0.49.0"
6+
operatorVersion: "v0.86.0"
77
spec:
8-
selector:
9-
matchLabels:
10-
app.kubernetes.io/version: latest
8+
template:
9+
metadata:
10+
labels:
11+
app.kubernetes.io/version: latest
1112
status:
1213
readyReplicas: 1

tests/e2e-upgrade/upgrade-test/00-install.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: OpenTelemetryCollector
33
metadata:
44
name: simplest
55
annotations:
6-
operatorVersion: "v0.49.0"
6+
operatorVersion: "v0.86.0"
77
spec:
88
replicas: 1
99
config: |

tests/e2e-upgrade/upgrade-test/opentelemetry-operator-v0.49.0.yaml

-2,732
This file was deleted.

tests/e2e-upgrade/upgrade-test/opentelemetry-operator-v0.86.0.yaml

+8,558
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)