Skip to content

Commit

Permalink
[chore] Fix CI Tests (#2217)
Browse files Browse the repository at this point in the history
* Fix the tests

* remove old one

* fix applier
  • Loading branch information
jaronoff97 authored Oct 12, 2023
1 parent 888948f commit 039e176
Show file tree
Hide file tree
Showing 7 changed files with 8,572 additions and 2,739 deletions.
2 changes: 1 addition & 1 deletion cmd/operator-opamp-bridge/agent/agent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func TestAgent_onMessage(t *testing.T) {
},
},
status: &protobufs.RemoteConfigStatus{
LastRemoteConfigHash: []byte("good/testnamespace405"),
LastRemoteConfigHash: []byte("good/testnamespace401"),
Status: protobufs.RemoteConfigStatuses_RemoteConfigStatuses_APPLIED,
},
},
Expand Down
6 changes: 6 additions & 0 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
resources:
- manager.yaml
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: ghcr.io/jacob.aronoff/opentelemetry-operator/opentelemetry-operator
newTag: e2e
2 changes: 1 addition & 1 deletion kuttl-test-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
apiVersion: kuttl.dev/v1beta1
kind: TestSuite
commands:
- command: kubectl apply -f ./tests/e2e-upgrade/upgrade-test/opentelemetry-operator-v0.49.0.yaml
- command: kubectl apply -f ./tests/e2e-upgrade/upgrade-test/opentelemetry-operator-v0.86.0.yaml
- command: go run hack/check-operator-ready.go
testDirs:
- ./tests/e2e-upgrade/
Expand Down
9 changes: 5 additions & 4 deletions tests/e2e-upgrade/upgrade-test/00-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ kind: Deployment
metadata:
name: simplest-collector
annotations:
operatorVersion: "v0.49.0"
operatorVersion: "v0.86.0"
spec:
selector:
matchLabels:
app.kubernetes.io/version: latest
template:
metadata:
labels:
app.kubernetes.io/version: latest
status:
readyReplicas: 1
2 changes: 1 addition & 1 deletion tests/e2e-upgrade/upgrade-test/00-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: OpenTelemetryCollector
metadata:
name: simplest
annotations:
operatorVersion: "v0.49.0"
operatorVersion: "v0.86.0"
spec:
replicas: 1
config: |
Expand Down
2,732 changes: 0 additions & 2,732 deletions tests/e2e-upgrade/upgrade-test/opentelemetry-operator-v0.49.0.yaml

This file was deleted.

8,558 changes: 8,558 additions & 0 deletions tests/e2e-upgrade/upgrade-test/opentelemetry-operator-v0.86.0.yaml

Large diffs are not rendered by default.

0 comments on commit 039e176

Please sign in to comment.