Skip to content

Commit

Permalink
version bumps
Browse files Browse the repository at this point in the history
  • Loading branch information
jarpat committed Nov 28, 2023
1 parent 3255eff commit e49c4e3
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

ARG TERRAFORM_VERSION=1.6.3
ARG GCP_CLI_VERSION=454.0.0
ARG TERRAFORM_VERSION=1.6.4
ARG GCP_CLI_VERSION=455.0.0

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

Expand Down
6 changes: 3 additions & 3 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.4.5
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.26.7
- [Terraform](https://www.terraform.io/downloads.html) - v1.6.4
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.26.11
- [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) - v440.0.0
- [gcloud CLI](https://cloud.google.com/sdk/gcloud) - (optional - useful as an alternative to the Google Cloud Platform Portal) - v455.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: 4 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ module "gke" {

monitoring_enable_managed_prometheus = var.enable_managed_prometheus

deletion_protection = false

cluster_autoscaling = var.enable_cluster_autoscaling ? {
enabled : true,
max_cpu_cores : var.cluster_autoscaling_max_cpu_cores,
Expand Down Expand Up @@ -233,10 +235,10 @@ resource "local_file" "kubeconfig" {
directory_permission = "0755"
}

# Module Registry - https://registry.terraform.io/modules/GoogleCloudPlatform/sql-db/google/17.0.1/submodules/postgresql
# Module Registry - https://registry.terraform.io/modules/GoogleCloudPlatform/sql-db/google/17.1.0/submodules/postgresql
module "postgresql" {
source = "GoogleCloudPlatform/sql-db/google//modules/postgresql"
version = "17.0.1"
version = "17.1.0"
project_id = var.project

for_each = local.postgres_servers != null ? length(local.postgres_servers) != 0 ? local.postgres_servers : {} : {}
Expand Down
12 changes: 6 additions & 6 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "5.5.0"
version = "5.7.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "5.5.0"
version = "5.7.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.23.0" # Constrained by Google
version = "2.24.0" # Constrained by Google
}
local = {
source = "hashicorp/local"
Expand All @@ -27,15 +27,15 @@ terraform {
}
null = {
source = "hashicorp/null"
version = "3.2.1" # Constrained by Google
version = "3.2.2" # Constrained by Google
}
external = {
source = "hashicorp/external"
version = "2.3.1" # Constrained by Google
version = "2.3.2" # Constrained by Google
}
time = {
source = "hashicorp/time"
version = "0.9.1"
version = "0.9.2"
}
}
}

0 comments on commit e49c4e3

Please sign in to comment.