Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:
- 1.11.8+ent
- 1.12.4
- 1.12.4+ent
- 1.13.1
- 1.13.1+ent
runs-on: ubuntu-latest
env:
TEST_RESULTS_DIR: /tmp/test-results/consul@${{ matrix.consul-version }}
Expand Down Expand Up @@ -96,6 +98,11 @@ jobs:
- 'hashicorp/consul-enterprise:1.11.8-ent'
- 'hashicorp/consul:1.12.4'
- 'hashicorp/consul-enterprise:1.12.4-ent'
- 'hashicorp/consul:1.13.1'
- 'hashicorp/consul-enterprise:1.13.1-ent'
- 'hashicorppreview/consul:1.14-dev'
# Currently no preview builds for consul-enterprise
# - 'hashicorppreview/consul-enterprise:1.14-ent'
runs-on: ubuntu-latest
env:
TEST_RESULTS_DIR: /tmp/test-results/e2e@${{ matrix.consul-image }}
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/conformance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ jobs:
consul-image: "hashicorp/consul:1.12"
envoy-image: "envoyproxy/envoy:v1.22-latest"
consul-k8s-version: "v0.47.1"
- name: "consul@v1.13 + consul-k8s@v0.47.1"
api-gateway-image: "hashicorppreview/consul-api-gateway:0.4-dev"
consul-image: "hashicorp/consul:1.13"
envoy-image: "envoyproxy/envoy:v1.22-latest"
consul-k8s-version: "v0.47.1"
- name: "consul@v1.14-dev + consul-k8s@v0.47.1"
api-gateway-image: "hashicorppreview/consul-api-gateway:0.4-dev"
consul-image: "hashicorppreview/consul:1.14-dev"
envoy-image: "envoyproxy/envoy:v1.22-latest"
consul-k8s-version: "v0.47.1"
Comment on lines +47 to +51
Copy link
Copy Markdown
Member

@nathancoleman nathancoleman Aug 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's helpful to add these, but I imagine we're going to reach a point where 1.14 depends on some not-yet-released change in consul-k8s. At that point we'll just need to consume consul-k8s-version: "main"

fail-fast: true
name: "${{ matrix.cluster-type }} - ${{ matrix.config.name }}"
concurrency:
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/conformance_with_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ jobs:
consul-image: "hashicorp/consul:1.12"
envoy-image: "envoyproxy/envoy:v1.22-latest"
consul-k8s-version: "v0.47.1"
- name: "consul@v1.13 + consul-k8s@v0.47.1"
api-gateway-image: "hashicorppreview/consul-api-gateway:0.4-dev"
consul-image: "hashicorp/consul:1.13"
envoy-image: "envoyproxy/envoy:v1.22-latest"
consul-k8s-version: "v0.47.1"
- name: "consul@v1.14-dev + consul-k8s@v0.47.1"
api-gateway-image: "hashicorppreview/consul-api-gateway:0.4-dev"
consul-image: "hashicorppreview/consul:1.14-dev"
envoy-image: "envoyproxy/envoy:v1.22-latest"
consul-k8s-version: "v0.47.1"
fail-fast: true
name: "${{ matrix.config.name }}"

Expand Down