From 70fadc773a5f24952d5d1e49676ddb6f1f49bfcd Mon Sep 17 00:00:00 2001 From: Jay Patel <78554593+jarpat@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:29:31 -0400 Subject: [PATCH 1/3] feat: (IAC-1378) Add Support for K8s 1.29 (#210) --- Dockerfile | 2 +- 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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index c273de5..362bc8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG GCP_CLI_VERSION=464.0.0 FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform FROM google/cloud-sdk:$GCP_CLI_VERSION-alpine -ARG KUBECTL_VERSION=1.27.10 +ARG KUBECTL_VERSION=1.28.7 ARG ENABLE_GKE_GCLOUD_AUTH_PLUGIN=True ARG INSTALL_COMPONENTS="" diff --git a/README.md b/README.md index 09c7c4d..2c400e6 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.7.3 - - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.27.10 + - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.28.7 - [jq](https://stedolan.github.io/jq/) - v1.6 - [gcloud CLI](https://cloud.google.com/sdk/gcloud) - (optional - useful as an alternative to the Google Cloud Platform Portal) - v464.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 c5bb620..da3e9e6 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.27" +kubernetes_version = "1.28" default_nodepool_min_nodes = 1 default_nodepool_vm_type = "n2-standard-2" diff --git a/examples/sample-input-byo.tfvars b/examples/sample-input-byo.tfvars index aadcd2e..1b91482 100644 --- a/examples/sample-input-byo.tfvars +++ b/examples/sample-input-byo.tfvars @@ -37,7 +37,7 @@ postgres_servers = { } # GKE config -kubernetes_version = "1.27" +kubernetes_version = "1.28" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "e2-standard-8" diff --git a/examples/sample-input-connect.tfvars b/examples/sample-input-connect.tfvars index b70ff6f..83db3a5 100644 --- a/examples/sample-input-connect.tfvars +++ b/examples/sample-input-connect.tfvars @@ -27,7 +27,7 @@ postgres_servers = { } # GKE config -kubernetes_version = "1.27" +kubernetes_version = "1.28" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "e2-standard-8" diff --git a/examples/sample-input-ha.tfvars b/examples/sample-input-ha.tfvars index a62219b..bd7d2c2 100644 --- a/examples/sample-input-ha.tfvars +++ b/examples/sample-input-ha.tfvars @@ -27,7 +27,7 @@ postgres_servers = { } # GKE config -kubernetes_version = "1.27" +kubernetes_version = "1.28" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "e2-standard-8" diff --git a/examples/sample-input-minimal.tfvars b/examples/sample-input-minimal.tfvars index 2a1318d..6f98c37 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.27" +kubernetes_version = "1.28" default_nodepool_min_nodes = 1 default_nodepool_vm_type = "n2-standard-2" diff --git a/examples/sample-input.tfvars b/examples/sample-input.tfvars index 3a080c6..cedbdfb 100644 --- a/examples/sample-input.tfvars +++ b/examples/sample-input.tfvars @@ -27,7 +27,7 @@ postgres_servers = { } # GKE config -kubernetes_version = "1.27" +kubernetes_version = "1.28" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "e2-standard-8" From 1e6aea99978722e958bee18c3b1d8eab5682ca6a Mon Sep 17 00:00:00 2001 From: Jay Patel <78554593+jarpat@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:54:54 -0400 Subject: [PATCH 2/3] docs: (IAC-1413) Update Copyright Information (#211) --- Dockerfile | 2 +- docker-entrypoint.sh | 2 +- files/tools/iac_git_info.sh | 2 +- files/tools/iac_tooling_version.sh | 2 +- locals.tf | 2 +- main.tf | 2 +- modules/google_vm/main.tf | 2 +- modules/google_vm/outputs.tf | 2 +- modules/google_vm/variables.tf | 2 +- modules/kubeconfig/locals.tf | 2 +- modules/kubeconfig/main.tf | 2 +- modules/kubeconfig/outputs.tf | 2 +- modules/kubeconfig/variables.tf | 2 +- modules/network/main.tf | 2 +- modules/network/outputs.tf | 2 +- modules/network/variables.tf | 2 +- network.tf | 2 +- outputs.tf | 2 +- variables.tf | 2 +- versions.tf | 2 +- vms.tf | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 362bc8e..709c96b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 ARG TERRAFORM_VERSION=1.7.3 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b2d8d21..9f40cc7 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 set -e diff --git a/files/tools/iac_git_info.sh b/files/tools/iac_git_info.sh index c863c79..1c7d09f 100755 --- a/files/tools/iac_git_info.sh +++ b/files/tools/iac_git_info.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 # We need to return an error if things don't work diff --git a/files/tools/iac_tooling_version.sh b/files/tools/iac_tooling_version.sh index 5110b7d..2b836d0 100755 --- a/files/tools/iac_tooling_version.sh +++ b/files/tools/iac_tooling_version.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 # We need to return an error if things don't work diff --git a/locals.tf b/locals.tf index c446f1b..763bb18 100644 --- a/locals.tf +++ b/locals.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 locals { diff --git a/main.tf b/main.tf index a2e6d4a..d31e57f 100644 --- a/main.tf +++ b/main.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 ## GCP-GKE diff --git a/modules/google_vm/main.tf b/modules/google_vm/main.tf index 0117063..b525218 100755 --- a/modules/google_vm/main.tf +++ b/modules/google_vm/main.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 module "address" { diff --git a/modules/google_vm/outputs.tf b/modules/google_vm/outputs.tf index da5fa1d..2dc63c7 100755 --- a/modules/google_vm/outputs.tf +++ b/modules/google_vm/outputs.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 output "private_ip" { diff --git a/modules/google_vm/variables.tf b/modules/google_vm/variables.tf index 2939f5a..51dc307 100755 --- a/modules/google_vm/variables.tf +++ b/modules/google_vm/variables.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 variable "name" { diff --git a/modules/kubeconfig/locals.tf b/modules/kubeconfig/locals.tf index a1dc910..ae37ef4 100644 --- a/modules/kubeconfig/locals.tf +++ b/modules/kubeconfig/locals.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 # Local variables diff --git a/modules/kubeconfig/main.tf b/modules/kubeconfig/main.tf index 5253141..9d275df 100644 --- a/modules/kubeconfig/main.tf +++ b/modules/kubeconfig/main.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 # Create service account secret diff --git a/modules/kubeconfig/outputs.tf b/modules/kubeconfig/outputs.tf index dd35718..a080d21 100644 --- a/modules/kubeconfig/outputs.tf +++ b/modules/kubeconfig/outputs.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 output "kube_config" { diff --git a/modules/kubeconfig/variables.tf b/modules/kubeconfig/variables.tf index 42275f6..f0f99bb 100644 --- a/modules/kubeconfig/variables.tf +++ b/modules/kubeconfig/variables.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 variable "prefix" { diff --git a/modules/network/main.tf b/modules/network/main.tf index af8389a..bab7da4 100644 --- a/modules/network/main.tf +++ b/modules/network/main.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 data "google_compute_network" "vpc" { diff --git a/modules/network/outputs.tf b/modules/network/outputs.tf index 83658d8..58572ed 100755 --- a/modules/network/outputs.tf +++ b/modules/network/outputs.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 output "network_name" { diff --git a/modules/network/variables.tf b/modules/network/variables.tf index b03ee9d..b7fa33f 100644 --- a/modules/network/variables.tf +++ b/modules/network/variables.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 variable "prefix" { diff --git a/network.tf b/network.tf index 86319dc..03c10ff 100644 --- a/network.tf +++ b/network.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 data "google_compute_address" "nat_address" { diff --git a/outputs.tf b/outputs.tf index 65b945c..aa95b10 100644 --- a/outputs.tf +++ b/outputs.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 output "cluster_name" { diff --git a/variables.tf b/variables.tf index 4efabb3..cc7d119 100644 --- a/variables.tf +++ b/variables.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 variable "prefix" { diff --git a/versions.tf b/versions.tf index c2aba61..f473e75 100644 --- a/versions.tf +++ b/versions.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 terraform { diff --git a/vms.tf b/vms.tf index 05bc25a..3b1fcfa 100644 --- a/vms.tf +++ b/vms.tf @@ -1,4 +1,4 @@ -# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. +# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 locals { From a67e26f9eec83a6a6f1d87005a1e3c962359ae82 Mon Sep 17 00:00:00 2001 From: Jay Patel <78554593+jarpat@users.noreply.github.com> Date: Wed, 10 Apr 2024 12:49:48 -0400 Subject: [PATCH 3/3] feat: (IAC-1402) Update Dependencies to Resolve Security Warnings (#212) --- Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 709c96b..d03f6c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 ARG TERRAFORM_VERSION=1.7.3 -ARG GCP_CLI_VERSION=464.0.0 +ARG GCP_CLI_VERSION=471.0.0 FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform FROM google/cloud-sdk:$GCP_CLI_VERSION-alpine diff --git a/README.md b/README.md index 2c400e6..8641e4c 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Operational knowledge of - [Terraform](https://www.terraform.io/downloads.html) - v1.7.3 - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.28.7 - [jq](https://stedolan.github.io/jq/) - v1.6 - - [gcloud CLI](https://cloud.google.com/sdk/gcloud) - (optional - useful as an alternative to the Google Cloud Platform Portal) - v464.0.0 + - [gcloud CLI](https://cloud.google.com/sdk/gcloud) - (optional - useful as an alternative to the Google Cloud Platform Portal) - v471.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 - #### Docker - [Docker](https://docs.docker.com/get-docker/)