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

Bump k8s versions #950

Merged
merged 1 commit into from
Jan 6, 2022
Merged

Bump k8s versions #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 11 additions & 24 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ jobs:
- checkout
- install-prereqs
- create-kind-clusters:
version: "v1.21.2"
version: "v1.22.4"
- restore_cache:
keys:
- consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
Expand Down Expand Up @@ -520,7 +520,7 @@ jobs:
- checkout
- install-prereqs
- create-kind-clusters:
version: "v1.21.2"
version: "v1.22.4"
- restore_cache:
keys:
- consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
Expand Down Expand Up @@ -600,7 +600,7 @@ jobs:
########################
# ACCEPTANCE TESTS
########################
acceptance-gke-1-19:
acceptance-gke-1-20:
environment:
- TEST_RESULTS: /tmp/test-results
docker:
Expand Down Expand Up @@ -666,7 +666,7 @@ jobs:
fail_only: true
failure_message: "GKE acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"

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

acceptance-eks-1-18:
acceptance-eks-1-19:
environment:
- TEST_RESULTS: /tmp/test-results
docker:
Expand Down Expand Up @@ -835,7 +835,7 @@ jobs:
fail_only: true
failure_message: "OpenShift acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"

acceptance-kind-1-22:
acceptance-kind-1-23:
environment:
- TEST_RESULTS: /tmp/test-results
machine:
Expand All @@ -845,7 +845,7 @@ jobs:
- checkout
- install-prereqs
- create-kind-clusters:
version: "v1.22.1"
version: "v1.23.0"
- restore_cache:
keys:
- consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
Expand Down Expand Up @@ -985,26 +985,13 @@ workflows:
# - acceptance-openshift:
# requires:
# - cleanup-azure-resources
- acceptance-gke-1-19:
- acceptance-gke-1-20:
requires:
- cleanup-gcp-resources
- acceptance-eks-1-18:
- acceptance-eks-1-19:
requires:
- cleanup-eks-resources
- acceptance-aks-1-20:
- acceptance-aks-1-21:
requires:
- cleanup-azure-resources
- acceptance-kind-1-22
# update-helm-charts-index: <-- Disable until we can figure out a release workflow. We currently don't want it to trigger on a tag because the tag is pushed by the eco-releases pipeline.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we can remove this now?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yup I think so

# jobs:
# - helm-chart-pipeline-approval:
# type: approval
# - update-helm-charts-index:
# requires:
# - helm-chart-pipeline-approval
# context: helm-charts-trigger-consul
# filters:
# tags:
# only: /^v.*/
# branches:
# ignore: /.*/
- acceptance-kind-1-23
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ use Consul with Kubernetes, please see the

### Prerequisites
* **Helm 3.2+** (Helm 2 is not supported)
* **Kubernetes 1.18+** - This is the earliest version of Kubernetes tested.
It is possible that this chart works with earlier versions but it is
* **Kubernetes 1.19+** - This is the earliest version of Kubernetes tested.
It is possible that this chart works with earlier versions, but it is
untested.

### Usage
Expand Down
2 changes: 1 addition & 1 deletion charts/consul/test/terraform/aks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ resource "azurerm_kubernetes_cluster" "default" {
location = azurerm_resource_group.default[count.index].location
resource_group_name = azurerm_resource_group.default[count.index].name
dns_prefix = "consul-k8s-${random_id.suffix[count.index].dec}"
kubernetes_version = "1.20.9"
kubernetes_version = "1.21.7"

default_node_pool {
name = "default"
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 @@ -54,7 +54,7 @@ module "eks" {
version = "17.20.0"

cluster_name = "consul-k8s-${random_id.suffix[count.index].dec}"
cluster_version = "1.18"
cluster_version = "1.19"
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.19."
version_prefix = "1.20."
}

resource "google_container_cluster" "cluster" {
Expand Down