Add proxy support to Velero (#224)

* Add proxy support to Velero

Author: jdewinne

controllers/helm.go

@@ -204,6 +204,24 @@ func updateInfraChartsFromInstall(ctx context.Context, in *v1beta1.Installation,
 
 			charts[i].Values = newVals
 		}
+		if chart.Name == "velero" {
+			if in.Spec.Proxy != nil {
+				extraEnvVars := map[string]interface{}{
+					"extraEnvVars": map[string]string{
+						"HTTP_PROXY":  in.Spec.Proxy.HTTPProxy,
+						"HTTPS_PROXY": in.Spec.Proxy.HTTPSProxy,
+						"NO_PROXY":    in.Spec.Proxy.NoProxy,
+					},
+				}
+
+				newVals, err := setHelmValue(chart.Values, "configuration", extraEnvVars)
+				if err != nil {
+					log.Error(err, "failed to set helm values extraEnvVars", "chart", chart.Name)
+					continue
+				}
+				charts[i].Values = newVals
+			}
+		}
 	}
 	return charts
 }

controllers/helm_test.go

@@ -1425,6 +1425,36 @@ func Test_updateInfraChartsFromInstall(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "velero with proxy",
+			args: args{
+				in: &v1beta1.Installation{
+					Spec: v1beta1.InstallationSpec{
+						ClusterID:        "testid",
+						BinaryName:       "testbin",
+						AirGap:           false,
+						HighAvailability: false,
+						Proxy: &v1beta1.ProxySpec{
+							HTTPProxy:  "http://proxy",
+							HTTPSProxy: "https://proxy",
+							NoProxy:    "noproxy",
+						},
+					},
+				},
+				charts: []k0sv1beta1.Chart{
+					{
+						Name:   "velero",
+						Values: "abc: xyz\nconfiguration:\n  extraEnvVars: {}\n",
+					},
+				},
+			},
+			want: []k0sv1beta1.Chart{
+				{
+					Name:   "velero",
+					Values: "abc: xyz\nconfiguration:\n  extraEnvVars:\n    HTTP_PROXY: http://proxy\n    HTTPS_PROXY: https://proxy\n    NO_PROXY: noproxy\n",
+				},
+			},
+		},
 		{
 			name: "docker-registry",
 			args: args{