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.

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

Update kubernetes to 1.28.x #3138

Merged
merged 2 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 3 additions & 0 deletions .changelog/3138.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
helm: Kubernetes v1.28 is now supported. Minimum tested version of Kubernetes is now v1.26.
```
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
with:
workflow: test.yml
repo: hashicorp/consul-k8s-workflows
ref: mw/1-18-parallel-tproxy
ref: main
token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'
2 changes: 1 addition & 1 deletion acceptance/ci-inputs/kind-inputs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# SPDX-License-Identifier: MPL-2.0

kindVersion: v0.19.0
kindNodeImage: kindest/node:v1.27.1
kindNodeImage: kindest/node:v1.28.0@sha256:dad5a6238c5e41d7cac405fae3b5eda2ad1de6f1190fa8bfc64ff5bb86173213
kubectlVersion: v1.27.1
2 changes: 1 addition & 1 deletion charts/consul/test/terraform/aks/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ variable "location" {
}

variable "kubernetes_version" {
default = "1.25"
default = "1.26"
description = "Kubernetes version supported on AKS"
}

Expand Down
2 changes: 1 addition & 1 deletion charts/consul/test/terraform/eks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ module "eks" {
kubeconfig_api_version = "client.authentication.k8s.io/v1beta1"

cluster_name = "consul-k8s-${random_id.suffix[count.index].dec}"
cluster_version = "1.26"
cluster_version = "1.27"
subnets = module.vpc[count.index].private_subnets
enable_irsa = true

Expand Down
17 changes: 13 additions & 4 deletions charts/consul/test/terraform/gke/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
terraform {
required_providers {
google = {
version = "~> 4.58.0"
version = "~> 5.3.0"
}
}
}
Expand All @@ -21,7 +21,7 @@ resource "random_id" "suffix" {

data "google_container_engine_versions" "main" {
location = var.zone
version_prefix = "1.25.9"
version_prefix = "1.28."
}

# We assume that the subnets are already created to save time.
Expand All @@ -37,14 +37,23 @@ resource "google_container_cluster" "cluster" {
project = var.project
initial_node_count = 3
location = var.zone
min_master_version = data.google_container_engine_versions.main.latest_master_version
node_version = data.google_container_engine_versions.main.latest_master_version
# 2023-10-30 - There is a bug with the terraform provider where lastest_master_version is not being returned by the
# api. Hardcode GKE version for now.
#min_master_version = data.google_container_engine_versions.main.latest_master_version
#node_version = data.google_container_engine_versions.main.latest_master_version
min_master_version = "1.28.2-gke.1157000"
node_version = "1.28.2-gke.1157000"
node_config {
tags = ["consul-k8s-${random_id.suffix[count.index].dec}"]
machine_type = "e2-standard-8"
}
subnetwork = data.google_compute_subnetwork.subnet.name
resource_labels = var.labels

release_channel {
channel = "RAPID"
david-yu marked this conversation as resolved.
Show resolved Hide resolved
}
deletion_protection = false
}

resource "google_compute_firewall" "firewall-rules" {
Expand Down
4 changes: 4 additions & 0 deletions charts/consul/test/terraform/gke/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ output "cluster_names" {
output "kubeconfigs" {
value = [for cl in google_container_cluster.cluster : format("$HOME/.kube/%s", cl.name)]
}

output "versions" {
value = data.google_container_engine_versions.main
}
Loading