✨ Add upgrade e2e tests #299
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| apiVersion: v1 | ||
| kind: Pod | ||
| metadata: | ||
| name: catalogd-compare | ||
| namespace: catalogd-e2e | ||
| spec: | ||
| containers: | ||
| - image: radial/busyboxplus:curl | ||
| imagePullPolicy: IfNotPresent | ||
| command: ["sh", "-c", "curl -k https://catalogd-catalogserver.olmv1-system.svc.cluster.local/catalogs/test-catalog/all.json | diff build-contents/expected_all.json -"] | ||
|
There was a problem hiding this comment. Would be good to get rid of hardcoded |
||
| name: compare-catalog-contents | ||
| volumeMounts: | ||
| - mountPath: /build-contents | ||
| name: build-contents | ||
| readOnly: true | ||
| restartPolicy: Never | ||
| volumes: | ||
| - configMap: | ||
| name: catalogd-e2e.build-contents | ||
| name: build-contents | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -e | ||
|
|
||
| # compare-catalog.sh compares the contents of the clusterCatalog created by registry.sh | ||
| # matches the expected contents in testdata/catalogs/test-catalog/expected_all.json. | ||
|
|
||
| # delete any pods persisting from earlier tests | ||
| kubectl delete --ignore-not-found --wait -f test/tools/imageregistry/compare-catalog.pod.yaml | ||
| kubectl create -f test/tools/imageregistry/compare-catalog.pod.yaml | ||
| # wait till pod terminates | ||
| kubectl wait -f test/tools/imageregistry/compare-catalog.pod.yaml --for=jsonpath='{.status.containerStatuses[0].state.terminated}' | ||
| kubectl logs --all-containers=true -f -n catalogd-e2e catalogd-compare | ||
|
Comment on lines
+8
to
+13
There was a problem hiding this comment. Should we consider using |
||
| if [ "$(kubectl get -f test/tools/imageregistry/compare-catalog.pod.yaml -o jsonpath={.status.containerStatuses[0].state.terminated.exitCode})" -ne 0 ]; then | ||
| exit 1 | ||
| fi | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| TEST_CATALOG_NAME=${TEST_CATALOG_NAME:-"test-catalog"} | ||
| TEST_CATALOG_IMAGE=${TEST_CATALOG_IMAGE:-"docker-registry.catalogd-e2e.svc:5000/test-catalog:e2e"} | ||
|
|
||
| kubectl apply -f - << EOF | ||
| apiVersion: catalogd.operatorframework.io/v1alpha1 | ||
| kind: ClusterCatalog | ||
| metadata: | ||
| name: ${TEST_CATALOG_NAME} | ||
| spec: | ||
| source: | ||
| type: image | ||
| image: | ||
| ref: ${TEST_CATALOG_IMAGE} | ||
| insecureSkipTLSVerify: true | ||
| EOF | ||
|
|
||
| kubectl wait --for=condition=Unpacked --timeout=60s ClusterCatalog $TEST_CATALOG_NAME |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could the actual upgrade comparisons be written in a separate Go test suite instead of using a shell script?
I think this would make it easier to communicate with the catalogd HTTP server and be easier to extend the test suite in the future.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ankitathomas In operator-framework/operator-controller#1003 I started with simple bash, but we ended up extending checks there so I replacing
post-upgrade-checkswithgo test.You might want to take a similar approach.
We run
go testfrom outside of the cluster. Instead ofkubectl port-forward&curlwhich I suggested earlier we will have to proxy somehow with client-go. We cam probably take some inspiration fromkubectl port-forward