Skip to content

Commit

Permalink
feat: (PSKD-327) Dependency Version Update (#223)
Browse files Browse the repository at this point in the history
* feat: Dependency version update

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

* feat: Change kubectl version to 1.29.8

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

---------

Signed-off-by: chjmil <[email protected]>
  • Loading branch information
saschjmil authored Nov 6, 2024
1 parent 5aa3e66 commit 5eab7de
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

ARG TERRAFORM_VERSION=1.8.5
ARG GCP_CLI_VERSION=479.0.0
ARG TERRAFORM_VERSION=1.9.6
ARG GCP_CLI_VERSION=496.0.0

FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform
FROM hashicorp/terraform:$TERRAFORM_VERSION AS terraform
FROM google/cloud-sdk:$GCP_CLI_VERSION-alpine
ARG KUBECTL_VERSION=1.29.7
ARG KUBECTL_VERSION=1.29.8
ARG ENABLE_GKE_GCLOUD_AUTH_PLUGIN=True
ARG INSTALL_COMPONENTS=""

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ Operational knowledge of

- Terraform or Docker
- #### Terraform
- [Terraform](https://www.terraform.io/downloads.html) - v1.8.5
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.29.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) - v479.0.0
- [Terraform](https://www.terraform.io/downloads.html) - v1.9.6
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.29.8
- [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
- #### Docker
- [Docker](https://docs.docker.com/get-docker/)
Expand Down
6 changes: 3 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ data "google_container_engine_versions" "gke-version" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
version = "~> 31.0.0"
version = "~> 33.1.0"
project_id = var.project
name = "${var.prefix}-gke"
region = local.region
Expand Down Expand Up @@ -241,7 +241,7 @@ resource "local_file" "kubeconfig" {
# Module Registry - https://registry.terraform.io/modules/GoogleCloudPlatform/sql-db/google/12.0.0/submodules/postgresql
module "postgresql" {
source = "GoogleCloudPlatform/sql-db/google//modules/postgresql"
version = "~> 20.1.0"
version = "~> 22.1.0"
project_id = var.project

for_each = local.postgres_servers != null ? length(local.postgres_servers) != 0 ? local.postgres_servers : {} : {}
Expand Down Expand Up @@ -293,7 +293,7 @@ module "postgresql" {

module "sql_proxy_sa" {
source = "terraform-google-modules/service-accounts/google"
version = "~> 4.2.2"
version = "~> 4.4.0"
count = var.postgres_servers != null ? length(var.postgres_servers) != 0 ? 1 : 0 : 0
project_id = var.project
prefix = var.prefix
Expand Down
2 changes: 1 addition & 1 deletion modules/google_vm/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

module "address" {
source = "terraform-google-modules/address/google"
version = "~> 4.0.0"
version = "~> 4.1.0"
project_id = var.project
region = var.region
address_type = "EXTERNAL"
Expand Down
4 changes: 2 additions & 2 deletions network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data "google_compute_address" "nat_address" {
module "nat_address" {
count = length(var.nat_address_name) == 0 ? 1 : 0
source = "terraform-google-modules/address/google"
version = "~> 4.0.0"
version = "~> 4.1.0"
project_id = var.project
region = local.region
address_type = "EXTERNAL"
Expand All @@ -23,7 +23,7 @@ module "nat_address" {
module "cloud_nat" {
count = length(var.nat_address_name) == 0 ? 1 : 0
source = "terraform-google-modules/cloud-nat/google"
version = "~> 5.1.0"
version = "~> 5.3.0"
project_id = var.project
name = "${var.prefix}-cloud-nat"
region = local.region
Expand Down
10 changes: 5 additions & 5 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "5.31.0"
version = "6.6.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "5.31.0"
version = "6.6.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 2.25" # Constrained by Google
version = "~> 2.32" # Constrained by Google
}
local = {
source = "hashicorp/local"
version = "~> 2.4"
version = "~> 2.5"
}
random = {
source = "hashicorp/random"
Expand All @@ -35,7 +35,7 @@ terraform {
}
time = {
source = "hashicorp/time"
version = "~> 0.10"
version = "~> 0.12"
}
}
}

0 comments on commit 5eab7de

Please sign in to comment.