Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update Kubernetes versions throughout CI #1460

Merged
merged 8 commits into from
Sep 1, 2022
Merged

update Kubernetes versions throughout CI #1460

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
332ab11
update Kube versions throughout CI and upgrade EKS kube version
kschoche Aug 26, 2022
b7e15b2
test
kschoche Aug 29, 2022
6d809d8
test
kschoche Aug 29, 2022
3b16dd7
testing eks
kschoche Aug 30, 2022
09e2bd0
lower parallelism
kschoche Aug 31, 2022
1ba9a95
swap eks and gke kube versions
kschoche Sep 1, 2022
a1e386c
more changes
kschoche Sep 1, 2022
5807ef0
fix comments
kschoche Sep 1, 2022
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
129 changes: 27 additions & 102 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ executors:
environment:
TEST_RESULTS: /tmp/test-results # path to where test results are saved

slack-channel: &slack-channel CBXF3CGAF
slack-channel: &slack-channel AAAAAAAAA
#slack-channel: &slack-channel CBXF3CGAF
kschoche marked this conversation as resolved.
Show resolved Hide resolved
control-plane-path: &control-plane-path control-plane
cli-path: &cli-path cli
acceptance-mod-path: &acceptance-mod-path acceptance
Expand Down Expand Up @@ -538,7 +539,7 @@ jobs:
- checkout
- install-prereqs
- create-kind-clusters:
version: "v1.22.4"
version: "v1.24.0"
- restore_cache:
keys:
- consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
Expand Down Expand Up @@ -570,7 +571,7 @@ jobs:
- checkout
- install-prereqs
- create-kind-clusters:
version: "v1.22.4"
version: "v1.24.0"
- restore_cache:
keys:
- consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
Expand Down Expand Up @@ -653,8 +654,8 @@ jobs:
########################
# ACCEPTANCE TESTS
########################
acceptance-gke-1-20:
parallelism: 6
acceptance-gke-1-23:
parallelism: 2
environment:
- TEST_RESULTS: /tmp/test-results
docker:
Expand Down Expand Up @@ -721,8 +722,8 @@ jobs:
fail_only: true
failure_message: "GKE acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"

acceptance-gke-cni-1-20:
parallelism: 3
acceptance-gke-cni-1-23:
parallelism: 2
environment:
- TEST_RESULTS: /tmp/test-results
docker:
Expand Down Expand Up @@ -789,8 +790,8 @@ jobs:
fail_only: true
failure_message: "GKE CNI acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"

acceptance-aks-1-21:
parallelism: 6
acceptance-aks-1-22:
parallelism: 3
environment:
- TEST_RESULTS: /tmp/test-results
docker:
Expand Down Expand Up @@ -846,7 +847,7 @@ jobs:
fail_only: true
failure_message: "AKS acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"

acceptance-aks-cni-1-21:
acceptance-aks-cni-1-22:
parallelism: 3
environment:
- TEST_RESULTS: /tmp/test-results
Expand Down Expand Up @@ -902,8 +903,8 @@ jobs:
fail_only: true
failure_message: "AKS CNI acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"

acceptance-eks-1-19:
parallelism: 6
acceptance-eks-1-21:
parallelism: 3
environment:
- TEST_RESULTS: /tmp/test-results
docker:
Expand Down Expand Up @@ -965,7 +966,7 @@ jobs:
fail_only: true
failure_message: "EKS acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"

acceptance-eks-cni-1-19:
acceptance-eks-cni-1-21:
parallelism: 3
environment:
- TEST_RESULTS: /tmp/test-results
Expand Down Expand Up @@ -1082,76 +1083,6 @@ jobs:
fail_only: true
failure_message: "OpenShift acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"

acceptance-kind-1-23:
parallelism: 6
environment:
- TEST_RESULTS: /tmp/test-results
machine:
image: ubuntu-2004:202010-01
resource_class: xlarge
steps:
- checkout
- install-prereqs
- create-kind-clusters:
version: "v1.23.0"
- restore_cache:
keys:
- consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
- run:
name: go mod download
working_directory: *acceptance-mod-path
command: go mod download
- save_cache:
key: consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
paths:
- ~/.go_workspace/pkg/mod
- run: mkdir -p $TEST_RESULTS
- run-acceptance-tests:
additional-flags: -use-kind -kubecontext="kind-dc1" -secondary-kubecontext="kind-dc2" -enable-transparent-proxy
- store_test_results:
path: /tmp/test-results
- store_artifacts:
path: /tmp/test-results
- slack/status:
channel: *slack-channel
fail_only: true
failure_message: "Acceptance tests against Kind with Kubernetes v1.23 failed. Check the logs at: ${CIRCLE_BUILD_URL}"

acceptance-kind-cni-1-23:
parallelism: 3
environment:
- TEST_RESULTS: /tmp/test-results
machine:
image: ubuntu-2004:202010-01
resource_class: xlarge
steps:
- checkout
- install-prereqs
- create-kind-cni-clusters:
version: "v1.23.0"
- restore_cache:
keys:
- consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
- run:
name: go mod download
working_directory: *acceptance-mod-path
command: go mod download
- save_cache:
key: consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
paths:
- ~/.go_workspace/pkg/mod
- run: mkdir -p $TEST_RESULTS
- run-acceptance-tests:
additional-flags: -use-kind -kubecontext="kind-dc1" -secondary-kubecontext="kind-dc2" -enable-transparent-proxy -enable-cni
- store_test_results:
path: /tmp/test-results
- store_artifacts:
path: /tmp/test-results
- slack/status:
channel: *slack-channel
fail_only: true
failure_message: "Acceptance tests for CNI against Kind with Kubernetes v1.23 failed. Check the logs at: ${CIRCLE_BUILD_URL}"

acceptance-kind-1-23-consul-nightly-1-11:
environment:
- TEST_RESULTS: /tmp/test-results
Expand Down Expand Up @@ -1296,13 +1227,13 @@ workflows:
requires:
- dev-upload-docker
nightly-acceptance-tests:
triggers:
- schedule:
cron: "0 0 * * *"
filters:
branches:
only:
- main
#triggers:
# - schedule:
# cron: "0 0 * * *"
# filters:
# branches:
# only:
# - main
kschoche marked this conversation as resolved.
Show resolved Hide resolved
jobs:
- build-distro:
OS: "linux"
Expand All @@ -1318,36 +1249,30 @@ workflows:
# - acceptance-openshift:
# requires:
# - cleanup-azure-resources
- acceptance-gke-1-20:
- acceptance-gke-1-23:
requires:
- cleanup-gcp-resources
- dev-upload-docker
- acceptance-gke-cni-1-20:
- acceptance-gke-cni-1-23:
requires:
- cleanup-gcp-resources
- dev-upload-docker
- acceptance-eks-1-19:
- acceptance-eks-1-21:
requires:
- cleanup-eks-resources
- dev-upload-docker
- acceptance-eks-cni-1-19:
- acceptance-eks-cni-1-21:
requires:
- cleanup-eks-resources
- dev-upload-docker
- acceptance-aks-1-21:
- acceptance-aks-1-22:
requires:
- cleanup-azure-resources
- dev-upload-docker
- acceptance-aks-cni-1-21:
- acceptance-aks-cni-1-22:
requires:
- cleanup-azure-resources
- dev-upload-docker
- acceptance-kind-1-23:
requires:
- dev-upload-docker
- acceptance-kind-cni-1-23:
requires:
- dev-upload-docker

nightly-acceptance-tests-consul:
triggers:
Expand Down
2 changes: 1 addition & 1 deletion charts/consul/test/terraform/eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ module "eks" {
version = "17.20.0"

cluster_name = "consul-k8s-${random_id.suffix[count.index].dec}"
cluster_version = "1.20"
cluster_version = "1.21"
subnets = module.vpc[count.index].private_subnets

vpc_id = module.vpc[count.index].vpc_id
Expand Down
2 changes: 1 addition & 1 deletion charts/consul/test/terraform/gke/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "random_id" "suffix" {

data "google_container_engine_versions" "main" {
location = var.zone
version_prefix = "1.21."
version_prefix = "1.23."
}

resource "google_container_cluster" "cluster" {
Expand Down