From dd1e889c3495dc8fb70de80eaff34556058cd5c2 Mon Sep 17 00:00:00 2001 From: Chris Miller <53184971+saschjmil@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:39:57 -0500 Subject: [PATCH] feat: (PSKD-816) Support K8s 1.31 (#225) * feat: bumping kubectl version to 1.30 Signed-off-by: chjmil * fix: Update kubectl download url Signed-off-by: chjmil * chore: Remove extra trailing space Signed-off-by: chjmil * fix: Update tflint module call The module config was removed in v0.54. Replace it with call_module_type = "all" Signed-off-by: chjmil --------- Signed-off-by: chjmil --- Dockerfile | 4 ++-- README.md | 2 +- config/sample-input-tf-enterprise.tfvars | 2 +- examples/sample-input-byo.tfvars | 2 +- examples/sample-input-connect.tfvars | 2 +- examples/sample-input-ha.tfvars | 2 +- examples/sample-input-minimal.tfvars | 2 +- examples/sample-input.tfvars | 2 +- linting-configs/.tflint.hcl | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 25e5424..2ccc198 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG GCP_CLI_VERSION=496.0.0 FROM hashicorp/terraform:$TERRAFORM_VERSION AS terraform FROM google/cloud-sdk:$GCP_CLI_VERSION-alpine -ARG KUBECTL_VERSION=1.29.8 +ARG KUBECTL_VERSION=1.30.6 ARG ENABLE_GKE_GCLOUD_AUTH_PLUGIN=True ARG INSTALL_COMPONENTS="" @@ -18,7 +18,7 @@ COPY . . RUN apk update \ && apk upgrade --no-cache \ && apk add --no-cache jq \ - && curl -sLO https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl \ + && curl -sLO https://dl.k8s.io/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl \ && chmod 755 ./kubectl /viya4-iac-gcp/docker-entrypoint.sh \ && mv ./kubectl /usr/local/bin/kubectl \ && chmod g=u -R /etc/passwd /etc/group /viya4-iac-gcp \ diff --git a/README.md b/README.md index 6f4af8c..25bce1e 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Operational knowledge of - Terraform or Docker - #### Terraform - [Terraform](https://www.terraform.io/downloads.html) - v1.9.6 - - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.29.8 + - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.30.6 - [jq](https://stedolan.github.io/jq/) - v1.7 - [gcloud CLI](https://cloud.google.com/sdk/gcloud) - (optional - useful as an alternative to the Google Cloud Platform Portal) - v496.0.0 - [gke-gcloud-auth-plugin](https://cloud.google.com/kubernetes-engine/docs/how-to/cluster-access-for-kubectl#install_plugin) - (optional - only for provider based Kubernetes configuration files) - >= v1.26 diff --git a/config/sample-input-tf-enterprise.tfvars b/config/sample-input-tf-enterprise.tfvars index 7ec4e52..599afd2 100644 --- a/config/sample-input-tf-enterprise.tfvars +++ b/config/sample-input-tf-enterprise.tfvars @@ -38,7 +38,7 @@ create_static_kubeconfig = true # tags = {} # e.g., { "key1" = "value1", "key2" = "value2" } # GKE config -kubernetes_version = "1.29" +kubernetes_version = "1.30" default_nodepool_min_nodes = 1 default_nodepool_vm_type = "n2-highmem-8" diff --git a/examples/sample-input-byo.tfvars b/examples/sample-input-byo.tfvars index efb1fad..b17b7a1 100644 --- a/examples/sample-input-byo.tfvars +++ b/examples/sample-input-byo.tfvars @@ -37,7 +37,7 @@ postgres_servers = { } # GKE config -kubernetes_version = "1.29" +kubernetes_version = "1.30" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "n2-highmem-8" diff --git a/examples/sample-input-connect.tfvars b/examples/sample-input-connect.tfvars index 32fb390..897c65f 100644 --- a/examples/sample-input-connect.tfvars +++ b/examples/sample-input-connect.tfvars @@ -27,7 +27,7 @@ postgres_servers = { } # GKE config -kubernetes_version = "1.29" +kubernetes_version = "1.30" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "n2-highmem-8" diff --git a/examples/sample-input-ha.tfvars b/examples/sample-input-ha.tfvars index 7c3f57a..8a8d14b 100644 --- a/examples/sample-input-ha.tfvars +++ b/examples/sample-input-ha.tfvars @@ -27,7 +27,7 @@ postgres_servers = { } # GKE config -kubernetes_version = "1.29" +kubernetes_version = "1.30" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "n2-highmem-8" diff --git a/examples/sample-input-minimal.tfvars b/examples/sample-input-minimal.tfvars index e19de38..24f8898 100644 --- a/examples/sample-input-minimal.tfvars +++ b/examples/sample-input-minimal.tfvars @@ -27,7 +27,7 @@ tags = {} # e.g., { "key1" = "value1", "key2" = "value2" } # } # GKE config -kubernetes_version = "1.29" +kubernetes_version = "1.30" default_nodepool_min_nodes = 1 default_nodepool_vm_type = "n2-highmem-8" diff --git a/examples/sample-input.tfvars b/examples/sample-input.tfvars index 0b4c587..9e3d089 100644 --- a/examples/sample-input.tfvars +++ b/examples/sample-input.tfvars @@ -27,7 +27,7 @@ postgres_servers = { } # GKE config -kubernetes_version = "1.29" +kubernetes_version = "1.30" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "n2-highmem-8" diff --git a/linting-configs/.tflint.hcl b/linting-configs/.tflint.hcl index 2fa8567..ffac0eb 100644 --- a/linting-configs/.tflint.hcl +++ b/linting-configs/.tflint.hcl @@ -8,7 +8,7 @@ config { # Enables module inspection. - module = true + call_module_type = "all" } plugin "google" {