Merge pull request #17 from sparkfabrik/task/gke_version

Adjust provider versions - set kubernetes version default as the latest version in stable channel

Author: Syphon83

README.md

@@ -73,9 +73,9 @@ Then perform the following commands on the root folder:
 | gitlab\_schedule\_cron\_backup | Setup Cron Job for Gitlab Scheduled Backup using unix-cron string format. Default to '0 1 \* \* \*' (Everyday at 1 AM). | `string` | `"0 1 * * *"` | no |
 | gitlab\_smtp\_user | Setup email sender address for Gitlab smtp server to send emails. | `string` | `"user@example.com"` | no |
 | gitlab\_time\_zone | Setup timezone for gitlab containers | `string` | `"Europe/Rome"` | no |
-| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
 | gke\_datapath | The desired datapath provider for this cluster. By default, DATAPATH\_PROVIDER\_UNSPECIFIED enables the IPTables-based kube-proxy implementation. ADVANCED\_DATAPATH enables Dataplane-V2 feature. | `string` | `"DATAPATH_PROVIDER_UNSPECIFIED"` | no |
 | gke\_disk\_replication | Setup replication type for disk persistent volune. Possible values none or regional-pd. Default to none. | `string` | `"none"` | no |
+| gke\_enable\_backup\_agent | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
 | gke\_enable\_cloudrun | Enable Google Cloudrun on GKE Cluster. Default false | `bool` | `false` | no |
 | gke\_enable\_image\_stream | Google Container File System (gcfs) has to be enabled for image streaming to be active. Needs image\_type to be set to COS\_CONTAINERD. | `bool` | `false` | no |
 | gke\_enable\_istio\_addon | Enable Istio addon | `bool` | `false` | no |
@@ -86,9 +86,11 @@ Then perform the following commands on the root folder:
 | gke\_min\_node\_count | Define the minimum number of nodes of the autoscaling cluster. Default 1 | `number` | `1` | no |
 | gke\_nodes\_subnet\_cidr | Cidr range to use for gitlab GKE nodes subnet | `string` | `"10.10.0.0/16"` | no |
 | gke\_pods\_subnet\_cidr | Cidr range to use for gitlab GKE pods subnet | `string` | `"10.30.0.0/16"` | no |
+| gke\_sc\_gitlab\_backup\_disk | Storage class for Perstistent Volume used for extra space in Backup Cron Job . Default pd-sdd. | `string` | `"pd-ssd"` | no |
+| gke\_sc\_gitlab\_restore\_disk | Storage class for Perstistent Volume used for extra space in Backup Restore Job. Default pd-sdd. | `string` | `"pd-ssd"` | no |
 | gke\_services\_subnet\_cidr | Cidr range to use for gitlab GKE services subnet | `string` | `"10.20.0.0/16"` | no |
 | gke\_storage\_class | Default storage class for GKE Cluster. Default pd-sdd. | `string` | `"pd-ssd"` | no |
-| gke\_version | Version of GKE to use for the GitLab cluster | `string` | `"1.21.10-gke.2000"` | no |
+| gke\_version | Version of GKE to use for the GitLab cluster | `string` | `"latest"` | no |
 | helm\_chart\_version | Helm chart version to install during deployment - Default Gitlab 14.9.3 | `string` | `"5.9.3"` | no |
 | postgresql\_availability\_type | The availability type of the Cloud SQL instance, high availability (REGIONAL) or single zone (ZONAL). | `string` | `"REGIONAL"` | no |
 | postgresql\_backup\_retained\_count | Numeber of postgres backup to be retained. Default 30. | `number` | `"30"` | no |

main.tf

@@ -569,7 +569,9 @@ data "template_file" "helm_values" {
     BACKUP_PV_SIZE        = var.gitlab_backup_pv_size
     ENABLE_RESTORE_PV     = var.gitlab_enable_restore_pv
     RESTORE_PV_SIZE       = var.gitlab_restore_pv_size
-    
+    BACKUP_PV_SC          = var.gke_sc_gitlab_backup_disk
+    RESTORE_PV_SC         = var.gke_sc_gitlab_restore_disk
+
     #Bucket Names
     LFS_BCKT              = local.git_lfs_bucket_name
     ARTIFACTS_BCKT        = local.gitlab_artifacts_bucket_name

modules/secret_manager/outputs.tf

@@ -15,7 +15,7 @@ output "region" {
 
 output "secret_id" {
   description = "Id of secret"
-  value       = var.secret_id
+  value       = local.secret_id
 }
 
 output "secret_value" {

modules/secret_manager/versions.tf

@@ -213,6 +213,7 @@ gitlab:
         extraArgs: ${BACKUP_EXTRA}
         persistence:
           enabled: ${ENABLE_BACKUP_PV}
+          storageClass: ${BACKUP_PV_SC}
           size: "${BACKUP_PV_SIZE}Gi"
       objectStorage:
         backend: gcs
@@ -222,6 +223,7 @@ gitlab:
           gcpProject: ${PROJECT_ID}
     persistence:
       enabled: ${ENABLE_RESTORE_PV}
+      storageClass: ${RESTORE_PV_SC}
       size: "${RESTORE_PV_SIZE}Gi"
   ## https://docs.gitlab.com/charts/charts/gitlab/gitaly
   gitaly:

values.yaml

@@ -174,7 +174,7 @@ variable "gke_disk_replication" {
 variable "gke_version" {
   type        = string
   description = "Version of GKE to use for the GitLab cluster"
-  default     = "1.21.10-gke.2000"
+  default     = "latest"
 }
 
 variable "gke_nodes_subnet_cidr" {
@@ -237,6 +237,18 @@ variable "gke_istio_auth" {
   default     = "AUTH_MUTUAL_TLS"
 }
 
+variable "gke_sc_gitlab_backup_disk" {
+  type        = string
+  description = "Storage class for Perstistent Volume used for extra space in Backup Cron Job . Default pd-sdd."
+  default     = "pd-ssd"
+}
+
+variable "gke_sc_gitlab_restore_disk" {
+  type        = string
+  description = "Storage class for Perstistent Volume used for extra space in Backup Restore Job. Default pd-sdd."
+  default     = "pd-ssd"
+}
+
 ##################
 # GITLAB SECTION #
 ##################

variables.tf

@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.35"
+      version = ">= 4.37.0, < 5.0.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 4.35"
+      version = ">= 4.37.0, < 5.0.0"
     }
     helm = {
       source  = "hashicorp/helm"
@@ -42,12 +42,4 @@ terraform {
       version = "~> 2.2"
     }
   }
-
-  provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-gke-gitlab/v0.5.2"
-  }
-
-  provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-gke-gitlab/v0.5.2"
-  }
 }