Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade redis #102

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions envs/staging/api.tf
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
locals {
api = {
image_tags = {
database_layer = "0.3.80-staging.0"
server = "staging"
api_db_migration = "1.2.0-staging.0"
api_db_migration = "1.2.0-staging.1"
}
}
}

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" {
Expand All @@ -27,6 +24,8 @@ module "api" {

environment = "staging"

serlo_org_database_url = "mysql://serlo:${var.athene2_database_password_default}@${module.mysql.database_private_ip_address}:3306/serlo?timezone=+00:00"

google_spreadsheet_api = {
active_donors = var.api_active_donors_google_spreadsheet_id
motivation = var.api_motivation_google_spreadsheet_id
Expand All @@ -43,15 +42,6 @@ module "api" {
redis_url = "redis://redis-master:6379"
slack_token = var.slack_token

database_layer = {
image_tag = local.api.image_tags.database_layer

database_url = "mysql://serlo:${var.athene2_database_password_default}@${module.mysql.database_private_ip_address}:3306/serlo"
database_max_connections = 25
sentry_dsn = "https://[email protected]/5649015"
metadata_api_last_changes_date = "2023-06-19T12:00:00Z"
}

db_migration = {
image_tag = local.api.image_tags.api_db_migration

Expand Down
22 changes: 0 additions & 22 deletions modules/api/database-layer/.terraform.lock.hcl

This file was deleted.

189 changes: 0 additions & 189 deletions modules/api/database-layer/main.tf

This file was deleted.

9 changes: 0 additions & 9 deletions modules/api/database-layer/versions.tf

This file was deleted.

Loading
Loading