From 3375eb3af20227560aa79a2748eaeb21db8b58f9 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Tue, 21 Jun 2022 16:45:42 -0400 Subject: [PATCH] FIXME: clone consul-k8s repo and install Consul Helm chart from custom branch --- .github/workflows/conformance.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 98289bab7..5b1dc849f 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -43,11 +43,9 @@ jobs: - name: "consul@v1.11.5 + consul-k8s@v0.45.0" consul-image: "hashicorp/consul:1.11" envoy-image: "envoyproxy/envoy:v1.20-latest" - consul-k8s-version: "0.45.0" - name: "consul@v1.12.2 + consul-k8s@v0.45.0" consul-image: "hashicorp/consul:1.12" envoy-image: "envoyproxy/envoy:v1.22-latest" - consul-k8s-version: "0.45.0" fail-fast: true name: "${{ matrix.cluster-type }} - ${{ matrix.config.name }}" concurrency: @@ -56,12 +54,20 @@ jobs: # Clone repos side-by-side: # GITHUB_WORKSPACE/ # consul-api-gateway/ + # consul-k8s/ # gateway-api/ - name: Checkout consul-api-gateway uses: actions/checkout@v2 with: path: "consul-api-gateway" + - name: Clone consul-k8s + uses: actions/checkout@v2 + with: + repository: "hashicorp/consul-k8s" + ref: "charts/capigw-controller-clusterrole-referencegrants" + path: "consul-k8s" + - name: Clone gateway-api uses: actions/checkout@v2 with: @@ -105,8 +111,7 @@ jobs: - name: Install Consul working-directory: "consul-api-gateway/internal/testing/conformance" run: | - helm repo add hashicorp https://helm.releases.hashicorp.com - helm install --values ./consul-config.yaml consul hashicorp/consul --version "${{ matrix.config.consul-k8s-version }}" --set global.image=${{ matrix.config.consul-image }} --set global.imageEnvoy=${{ matrix.config.envoy-image }} --create-namespace --namespace=consul + helm install --values ./consul-config.yaml consul $GITHUB_WORKSPACE/consul-k8s/charts/consul --set global.image=${{ matrix.config.consul-image }} --set global.imageEnvoy=${{ matrix.config.envoy-image }} --create-namespace --namespace=consul kubectl wait --for=condition=Ready --timeout=120s --namespace=consul pods --all - name: Patch testing resources