fix installer

Author: mustard-mh

install/installer/pkg/components/proxy/deployment.go

@@ -119,17 +119,16 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		return nil
 	})
 
-	env := []corev1.EnvVar{{
-		Name: "IP",
-		ValueFrom: &corev1.EnvVarSource{
-			FieldRef: &corev1.ObjectFieldSelector{
-				APIVersion: "v1",
-				FieldPath:  "status.podIP",
-			},
-		},
-	}}
+	env := common.CustomizeEnvvar(ctx, Component, common.MergeEnv(
+		common.DefaultEnv(&ctx.Config),
+		[]corev1.EnvVar{{
+			Name:  "PROXY_DOMAIN",
+			Value: ctx.Config.Domain,
+		}},
+	))
+
 	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
-		if cfg.WebApp != nil && cfg.WebApp.ProxyConfig != nil {
+		if cfg.WebApp != nil {
 			env = append(env, corev1.EnvVar{
 				Name:  "CONFIGCAT_SDK_KEY",
 				Value: cfg.WebApp.ConfigcatKey,
@@ -206,7 +205,15 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 								fmt.Sprintf("--insecure-listen-address=[$(IP)]:%d", baseserver.BuiltinMetricsPort),
 								"--upstream=http://127.0.0.1:9545/",
 							},
-							Env: env,
+							Env: []corev1.EnvVar{{
+								Name: "IP",
+								ValueFrom: &corev1.EnvVarSource{
+									FieldRef: &corev1.ObjectFieldSelector{
+										APIVersion: "v1",
+										FieldPath:  "status.podIP",
+									},
+								},
+							}},
 							Ports: []corev1.ContainerPort{{
 								ContainerPort: baseserver.BuiltinMetricsPort,
 								Name:          baseserver.BuiltinMetricsPortName,
@@ -261,13 +268,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 								FailureThreshold:    3,
 							},
 							VolumeMounts: volumeMounts,
-							Env: common.CustomizeEnvvar(ctx, Component, common.MergeEnv(
-								common.DefaultEnv(&ctx.Config),
-								[]corev1.EnvVar{{
-									Name:  "PROXY_DOMAIN",
-									Value: ctx.Config.Domain,
-								}},
-							)),
+							Env:          env,
 						}},
 					},
 				},