Merge pull request #101 from serlo/upgrade-redis

feat(redis): upgrade chart and refactor
serlo · Jul 17, 2024 · a4bfffb · a4bfffb
2 parents e0cd264 + fc27bbb
commit a4bfffb
Show file tree

Hide file tree

Showing 11 changed files with 445 additions and 99 deletions.
diff --git a/envs/production/api.tf b/envs/production/api.tf
@@ -10,10 +10,8 @@ locals {
 module "api_redis" {
   source = "../../modules/redis"
 
-  namespace     = kubernetes_namespace.api_namespace.metadata.0.name
-  chart_version = "12.6.2"
-  image_tag     = "6.0.10"
-  node_pool     = module.cluster.node_pools.non-preemptible
+  namespace = kubernetes_namespace.api_namespace.metadata.0.name
+  node_pool = module.cluster.node_pools.non-preemptible
 }
 
 module "api" {

diff --git a/envs/production/main.tf b/envs/production/main.tf
@@ -1,6 +1,3 @@
-#####################################################################
-# settings for production
-#####################################################################
 locals {
   domain  = "serlo.org"
   project = "serlo-production"
@@ -17,9 +14,6 @@ locals {
   kpi_database_instance_name   = "${local.project}-postgres-2020-01-26"
 }
 
-#####################################################################
-# modules
-#####################################################################
 module "cluster" {
   source   = "../../modules/gcloud/cluster"
   name     = "${local.project}-cluster"

diff --git a/envs/staging/api.tf b/envs/staging/api.tf
@@ -10,10 +10,8 @@ locals {
 module "api_redis" {
   source = "../../modules/redis"
 
-  namespace     = kubernetes_namespace.api_namespace.metadata.0.name
-  chart_version = "12.6.2"
-  image_tag     = "6.0.10"
-  node_pool     = module.cluster.node_pools.non-preemptible
+  namespace = kubernetes_namespace.api_namespace.metadata.0.name
+  node_pool = module.cluster.node_pools.non-preemptible
 }
 
 module "api" {

diff --git a/envs/terraform.mk b/envs/terraform.mk
@@ -19,7 +19,10 @@ terraform_plan: terraform_download_secrets
 	terraform plan -var-file secrets/terraform-$(env_name).tfvars
 
 .PHONY: terraform_apply
-terraform_apply: terraform_download_secrets
+terraform_apply: terraform_download_secrets terraform_apply_without_downloading_secrets
+
+.PHONY: terraform_apply_without_downloading_secrets
+terraform_apply_without_downloading_secrets:
 	# just make sure we know what we are doing
 	terraform fmt -recursive
 	terraform apply -var-file secrets/terraform-$(env_name).tfvars

diff --git a/modules/api/db-migration/main.tf b/modules/api/db-migration/main.tf
@@ -1,7 +1,7 @@
 locals {
   name         = "db-migration"
   name_cronjob = "${local.name}-cronjob"
-  image        = "eu.gcr.io/serlo-shared/api-db-migration:${var.image_tag}"
+  image        = "ghcr.io/serlo/api.serlo.org/db-migration:${var.image_tag}"
 }
 
 variable "namespace" {

diff --git a/modules/redis/.terraform.lock.hcl b/modules/redis/.terraform.lock.hcl