THREESCALE-11156 add tls env var to zync and system deployments

3scale · Oct 15, 2024 · 5417862 · 5417862
1 parent 4ee60f7
commit 5417862
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/pkg/3scale/amp/component/system.go b/pkg/3scale/amp/component/system.go
@@ -23,6 +23,10 @@ const (
 	SystemSecretSystemDatabaseUserFieldName         = "DB_USER"
 	SystemSecretSystemDatabasePasswordFieldName     = "DB_PASSWORD"
 	SystemSecretSystemDatabaseRootPasswordFieldName = "DB_ROOT_PASSWORD"
+	SystemSecretDatabaseSslCa                       = "DATABASE_SSL_CA"
+	SystemSecretDatabaseSslCert                     = "DATABASE_SSL_CERT"
+	SystemSecretDatabaseSslKey                      = "DATABASE_SSL_KEY"
+	SystemSecretDatabaseSslMode                     = "DATABASE_SSL_MODE"
 )
 
 const (
@@ -183,6 +187,10 @@ func (system *System) buildSystemBaseEnv() []v1.EnvVar {
 
 	result = append(result,
 		helper.EnvVarFromSecret("DATABASE_URL", SystemSecretSystemDatabaseSecretName, SystemSecretSystemDatabaseURLFieldName),
+		helper.EnvVarFromSecret("DATABASE_SSL_CA", SystemSecretSystemDatabaseSecretName, "ca.crt"),
+		helper.EnvVarFromSecret("DATABASE_SSL_CERT", SystemSecretSystemDatabaseSecretName, "tls.crt"),
+		helper.EnvVarFromSecret("DATABASE_SSL_KEY", SystemSecretSystemDatabaseSecretName, "tls.key"),
+		helper.EnvVarFromSecret("DATABASE_SSL_MODE", SystemSecretSystemDatabaseSecretName, "ssl_mode"),
 
 		helper.EnvVarFromSecret("MASTER_DOMAIN", SystemSecretSystemSeedSecretName, SystemSecretSystemSeedMasterDomainFieldName),
 		helper.EnvVarFromSecret("MASTER_USER", SystemSecretSystemSeedSecretName, SystemSecretSystemSeedMasterUserFieldName),

diff --git a/pkg/3scale/amp/component/zync.go b/pkg/3scale/amp/component/zync.go
@@ -25,6 +25,10 @@ const (
 	ZyncSecretDatabaseURLFieldName         = "DATABASE_URL"
 	ZyncSecretDatabasePasswordFieldName    = "ZYNC_DATABASE_PASSWORD"
 	ZyncSecretAuthenticationTokenFieldName = "ZYNC_AUTHENTICATION_TOKEN"
+	ZyncSecretDatabaseSslCa                = "DATABASE_SSL_CA"
+	ZyncSecretDatabaseSslCert              = "DATABASE_SSL_CERT"
+	ZyncSecretDatabaseSslKey               = "DATABASE_SSL_KEY"
+	ZyncSecretDatabaseSslMode              = "DATABASE_SSL_MODE"
 )
 
 const (
@@ -267,6 +271,10 @@ func (zync *Zync) commonZyncEnvVars() []v1.EnvVar {
 		helper.EnvVarFromSecret("DATABASE_URL", "zync", "DATABASE_URL"),
 		helper.EnvVarFromSecret("SECRET_KEY_BASE", "zync", "SECRET_KEY_BASE"),
 		helper.EnvVarFromSecret("ZYNC_AUTHENTICATION_TOKEN", "zync", "ZYNC_AUTHENTICATION_TOKEN"),
+		helper.EnvVarFromSecret("DATABASE_SSL_CA", ZyncSecretName, "ca.crt"),
+		helper.EnvVarFromSecret("DATABASE_SSL_CERT", ZyncSecretName, "tls.crt"),
+		helper.EnvVarFromSecret("DATABASE_SSL_KEY", ZyncSecretName, "tls.key"),
+		helper.EnvVarFromSecret("DATABASE_SSL_MODE", ZyncSecretName, "ssl_mode"),
 		{
 			Name: "POD_NAME",
 			ValueFrom: &v1.EnvVarSource{