Skip to content

Commit

Permalink
Add openshift overrides (#549)
Browse files Browse the repository at this point in the history
Adds default overrides for OpenShift (values.openshift.yaml) and uses
them in the chart-verifier tests.
  • Loading branch information
tvoran authored Jun 16, 2021
1 parent 3a6e097 commit 0f832e0
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ jobs:
- image: docker.mirror.hashicorp.services/cimg/go:1.16
environment:
BATS_VERSION: "1.3.0"
# Note: the commit SHA is used here since the repo doesn't use release tags
CHART_VERIFIER_VERSION: "e2c03bd1a4aea20deb0a4a03ebfde254b1672050"
CHART_VERIFIER_VERSION: "1.0.0"
steps:
- checkout
- run:
Expand Down
12 changes: 6 additions & 6 deletions test/chart/verifier.bats
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ setup_file() {
$run_cmd verify $chart_src \
--output json \
--openshift-version $OPENSHIFT_VERSION \
--disable $DISABLED_TESTS 2>&1 | tee $VERIFY_OUTPUT
--disable $DISABLED_TESTS \
--chart-values values.openshift.yaml 2>&1 | tee $VERIFY_OUTPUT
}

teardown_file() {
Expand Down Expand Up @@ -75,12 +76,11 @@ teardown_file() {
check_result contains-test
}

@test "images-are-certified" {
check_result images-are-certified
}

@test "chart-testing" {
skip "Skipping since this test requires a kubernetes/openshift cluster"
check_result chart-testing
}

@test "images-are-certified" {
skip "Skipping until this has been addressed"
check_result images-are-certified
}
18 changes: 18 additions & 0 deletions values.openshift.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# These overrides are appropriate defaults for deploying this chart on OpenShift

global:
openshift: true

injector:
image:
repository: "registry.connect.redhat.com/hashicorp/vault-k8s"
tag: "0.10.1-ubi"

agentImage:
repository: "registry.connect.redhat.com/hashicorp/vault"
tag: "1.7.2-ubi"

server:
image:
repository: "registry.connect.redhat.com/hashicorp/vault"
tag: "1.7.2-ubi"

0 comments on commit 0f832e0

Please sign in to comment.