THREESCALE-11020 Redis TLS update - review

3scale · Jan 15, 2025 · 3aea74e · 3aea74e
1 parent a686c2f
commit 3aea74e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/pkg/3scale/amp/component/backend.go b/pkg/3scale/amp/component/backend.go
@@ -437,9 +437,6 @@ func (backend *Backend) buildBackendWorkerEnv() []v1.EnvVar {
 		)
 	}
 
-	if backend.Options.RedisTLSEnabled {
-		result = append(result, backend.BackendRedisTLSEnvVars()...)
-	}
 	return result
 }
 
@@ -464,9 +461,7 @@ func (backend *Backend) buildBackendListenerEnv() []v1.EnvVar {
 			v1.EnvVar{Name: "CONFIG_LISTENER_PROMETHEUS_METRICS_ENABLED", Value: "true"},
 		)
 	}
-	if backend.Options.RedisTLSEnabled {
-		result = append(result, backend.BackendRedisTLSEnvVars()...)
-	}
+
 	return result
 }
 

diff --git a/pkg/3scale/amp/component/redis_options.go b/pkg/3scale/amp/component/redis_options.go
@@ -134,5 +134,5 @@ func DefaultBackendQueuesSentinelRole() string {
 }
 
 func DefaultRedisSslSecretValue() string {
-	return "replaceme"
+	return ""
 }
diff --git a/pkg/3scale/amp/operator/redis_options_provider.go b/pkg/3scale/amp/operator/redis_options_provider.go
@@ -70,7 +70,6 @@ func (r *RedisOptionsProvider) GetRedisOptions() (*component.RedisOptions, error
 	r.setPersistentVolumeClaimOptions()
 	r.setPriorityClassNames()
 	r.setTopologySpreadConstraints()
-	//r.setTLSEnabled()
 
 	// Should the operator be reading redis secrets?
 	// When HA is disabled, do we support external redis?
@@ -377,10 +376,3 @@ func (r *RedisOptionsProvider) systemRedisSecretLabels() map[string]string {
 	labels["apimanager.apps.3scale.net/watched-by"] = "system"
 	return labels
 }
-
-//func (s *RedisOptionsProvider) setTLSEnabled() {
-//	s.options.RedisTLSEnabled = false
-//	if s.apimanager.Spec.RedisTLSEnabled != nil {
-//		s.options.RedisTLSEnabled = *s.apimanager.Spec.RedisTLSEnabled
-//	}
-//}