Pass-through PROXY environment to Replicated SDK deployment

replicatedhq · Sep 4, 2024 · 1fc54f8 · 1fc54f8
1 parent 0cc081e
commit 1fc54f8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/pkg/rewrite/rewrite.go b/pkg/rewrite/rewrite.go
@@ -111,6 +111,9 @@ func Rewrite(rewriteOptions RewriteOptions) error {
 		IsAirgap:             rewriteOptions.IsAirgap,
 		KotsadmID:            k8sutil.GetKotsadmID(clientset),
 		AppID:                rewriteOptions.AppID,
+		HTTPProxyEnvValue:    rewriteOptions.HTTPProxyEnvValue,
+		HTTPSProxyEnvValue:   rewriteOptions.HTTPSProxyEnvValue,
+		NoProxyEnvValue:      rewriteOptions.NoProxyEnvValue,
 	}
 	if err = upstream.WriteUpstream(u, writeUpstreamOptions); err != nil {
 		log.FinishSpinnerWithError()

diff --git a/pkg/upstream/helm.go b/pkg/upstream/helm.go
@@ -278,6 +278,24 @@ func buildReplicatedValues(u *types.Upstream, options types.WriteOptions) (map[s
 		replicatedValues["license"] = string(MustMarshalLicense(u.License))
 	}
 
+	replicatedValues["extraEnv"] = []struct {
+		Name  string `yaml:"name"`
+		Value string `yaml:"value"`
+	}{
+		{
+			Name:  "HTTP_PROXY",
+			Value: options.HTTPProxyEnvValue,
+		},
+		{
+			Name:  "HTTPS_PROXY",
+			Value: options.HTTPSProxyEnvValue,
+		},
+		{
+			Name:  "NO_PROXY",
+			Value: options.NoProxyEnvValue,
+		},
+	}
+
 	return replicatedValues, nil
 }