Skip to content

Commit

Permalink
feat: (PSKD-816) Support K8s 1.31 (#225)
Browse files Browse the repository at this point in the history
* feat: bumping kubectl version to 1.30

Signed-off-by: chjmil <[email protected]>

* fix: Update kubectl download url

Signed-off-by: chjmil <[email protected]>

* chore: Remove extra trailing space

Signed-off-by: chjmil <[email protected]>

* fix: Update tflint module call

The module config was removed in v0.54. Replace it with
call_module_type = "all"

Signed-off-by: chjmil <[email protected]>

---------

Signed-off-by: chjmil <[email protected]>
  • Loading branch information
saschjmil authored Nov 14, 2024
1 parent 5eab7de commit dd1e889
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=""

Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/sample-input-tf-enterprise.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-byo.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-connect.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-ha.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-minimal.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion linting-configs/.tflint.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

config {
# Enables module inspection.
module = true
call_module_type = "all"
}

plugin "google" {
Expand Down

0 comments on commit dd1e889

Please sign in to comment.