Use K8S depedent env vars instead of custom ExpandNamespace

Author: daniel-de-vera

k8s/base/driver.yaml

@@ -32,17 +32,17 @@ spec:
                   fieldPath: metadata.namespace
             - name: SIGNADOT_BASELINE_NAME
               value: "driver"
-            # service dependencies (<NAMESPACE> get replaced at runtime by the app)
+            # service dependencies
             - name: SIGNADOT_ROUTESERVER
               value: routeserver.signadot.svc:7777
             - name: ROUTE_ADDR
-              value: route.<NAMESPACE>:8083
+              value: route.$(SIGNADOT_BASELINE_NAMESPACE):8083
             - name: REDIS_ADDR
-              value: redis.<NAMESPACE>:6379
+              value: redis.$(SIGNADOT_BASELINE_NAMESPACE):6379
             - name: KAFKA_BROKER_ADDR
-              value: kafka-headless.<NAMESPACE>:9092
+              value: kafka-headless.$(SIGNADOT_BASELINE_NAMESPACE):9092
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: http://jaeger.<NAMESPACE>:4318
+              value: http://jaeger.$(SIGNADOT_BASELINE_NAMESPACE):4318
           image: signadot/hotrod:latest
           imagePullPolicy: Always
           readinessProbe:

k8s/base/frontend.yaml

@@ -32,15 +32,15 @@ spec:
                   fieldPath: metadata.namespace
             - name: SIGNADOT_BASELINE_NAME
               value: "frontend"
-            # service dependencies (<NAMESPACE> get replaced at runtime by the app)
+            # service dependencies
             - name: LOCATION_ADDR
-              value: location.<NAMESPACE>:8081
+              value: location.$(SIGNADOT_BASELINE_NAMESPACE):8081
             - name: REDIS_ADDR
-              value: redis.<NAMESPACE>:6379
+              value: redis.$(SIGNADOT_BASELINE_NAMESPACE):6379
             - name: KAFKA_BROKER_ADDR
-              value: kafka-headless.<NAMESPACE>:9092
+              value: kafka-headless.$(SIGNADOT_BASELINE_NAMESPACE):9092
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: http://jaeger.<NAMESPACE>:4318
+              value: http://jaeger.$(SIGNADOT_BASELINE_NAMESPACE):4318
           image: signadot/hotrod:latest
           imagePullPolicy: Always
           ports:

k8s/base/location.yaml

@@ -31,15 +31,15 @@ spec:
                   fieldPath: metadata.namespace
             - name: SIGNADOT_BASELINE_NAME
               value: location
-            # service dependencies (<NAMESPACE> get replaced at runtime by the app)
+            # service dependencies
             - name: MYSQL_ADDR
-              value: mysql.<NAMESPACE>:3306
+              value: mysql.$(SIGNADOT_BASELINE_NAMESPACE):3306
             - name: MYSQL_PASS
               value: abc
             - name: REDIS_ADDR
-              value: redis.<NAMESPACE>:6379
+              value: redis.$(SIGNADOT_BASELINE_NAMESPACE):6379
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: http://jaeger.<NAMESPACE>:4318
+              value: http://jaeger.$(SIGNADOT_BASELINE_NAMESPACE):4318
           image: signadot/hotrod:latest
           imagePullPolicy: Always
           ports:

k8s/base/route.yaml

@@ -33,9 +33,9 @@ spec:
               value: "route"
             # service dependencies
             - name: REDIS_ADDR
-              value: redis.<NAMESPACE>:6379
+              value: redis.$(SIGNADOT_BASELINE_NAMESPACE):6379
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: http://jaeger.<NAMESPACE>:4318
+              value: http://jaeger.$(SIGNADOT_BASELINE_NAMESPACE):4318
           image: signadot/hotrod:latest
           imagePullPolicy: Always
           ports:

pkg/config/kafka.go

@@ -1,7 +1,7 @@
 package config
 
 func GetKafkaBrokerAddr() string {
-	return ExpandNamespace(EnvDefault("KAFKA_BROKER_ADDR", "kafka-headless:9092"))
+	return EnvDefault("KAFKA_BROKER_ADDR", "kafka-headless:9092")
 }
 
 func GetKafkaBrokers() []string {

pkg/config/location.go

@@ -5,5 +5,5 @@ func GetLocationBindPort() string {
 }
 
 func GetLocationAddr() string {
-	return ExpandNamespace(EnvDefault("LOCATION_ADDR", "location:8081"))
+	return EnvDefault("LOCATION_ADDR", "location:8081")
 }

pkg/config/mysql.go

@@ -6,7 +6,7 @@ import (
 )
 
 func GetMySQLAddr() string {
-	return ExpandNamespace(EnvDefault("MYSQL_ADDR", "mysql:3306"))
+	return EnvDefault("MYSQL_ADDR", "mysql:3306")
 }
 
 func GetMySQLUser() string {

pkg/config/namespace.go

@@ -13,5 +13,5 @@ func InitOtelExporter() {
 	if addr == "" {
 		return
 	}
-	os.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", ExpandNamespace(addr))
+	os.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", addr)
 }

pkg/config/otel.go

@@ -1,7 +1,7 @@
 package config
 
 func GetRedisAddr() string {
-	return ExpandNamespace(EnvDefault("REDIS_ADDR", "redis:6379"))
+	return EnvDefault("REDIS_ADDR", "redis:6379")
 }
 
 func GetRedisPassword() string {