deployment: add env vars from the Proxy object

The Proxy object specifies certain http-proxy related environmnent
variables that we need setting for the operand's cotainer.

Author: stlaz

pkg/operator2/deployment.go

@@ -22,6 +22,7 @@ func defaultDeployment(
 	operatorConfig *operatorv1.Authentication,
 	syncData *configSyncData,
 	routerSecret *corev1.Secret,
+	proxyConfig *configv1.Proxy,
 	operatorDeployment *appsv1.Deployment,
 	resourceVersions ...string,
 ) *appsv1.Deployment {
@@ -121,6 +122,7 @@ func defaultDeployment(
 								},
 							},
 							VolumeMounts:             mounts,
+							Env:                      proxyConfigToEnvVars(proxyConfig),
 							ReadinessProbe:           defaultProbe(),
 							LivenessProbe:            livenessProbe(),
 							TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
@@ -236,6 +238,24 @@ func getImagePullPolicy(operatorDeployment *appsv1.Deployment) corev1.PullPolicy
 	return containers[0].ImagePullPolicy
 }
 
+func proxyConfigToEnvVars(proxy *configv1.Proxy) []corev1.EnvVar {
+	envVars := []corev1.EnvVar{}
+
+	envVars = appendEnvVar(envVars, "NO_PROXY", proxy.Spec.NoProxy)
+	envVars = appendEnvVar(envVars, "HTTP_PROXY", proxy.Spec.HTTPProxy)
+	envVars = appendEnvVar(envVars, "HTTPS_PROXY", proxy.Spec.HTTPSProxy)
+
+	return envVars
+}
+
+func appendEnvVar(envVars []corev1.EnvVar, envName, envVal string) []corev1.EnvVar {
+	if len(envVal) > 0 {
+		return append(envVars, corev1.EnvVar{Name: envName, Value: envVal})
+	}
+
+	return envVars
+}
+
 type volume struct {
 	name      string
 	configmap bool

pkg/operator2/operator.go

@@ -173,6 +173,7 @@ type authOperator struct {
 	infrastructure configv1client.InfrastructureInterface
 	ingress        configv1client.IngressInterface
 	apiserver      configv1client.APIServerInterface
+	proxy          configv1client.ProxyInterface
 
 	resourceSyncer resourcesynccontroller.ResourceSyncer
 }
@@ -212,6 +213,7 @@ func NewAuthenticationOperator(
 		infrastructure: configClient.ConfigV1().Infrastructures(),
 		ingress:        configClient.ConfigV1().Ingresses(),
 		apiserver:      configClient.ConfigV1().APIServers(),
+		proxy:          configClient.ConfigV1().Proxies(),
 
 		resourceSyncer: resourceSyncer,
 	}
@@ -238,6 +240,7 @@ func NewAuthenticationOperator(
 		operator.WithInformer(configV1Informers.Infrastructures(), configNameFilter, controller.WithNoSync()),
 		operator.WithInformer(configV1Informers.Ingresses(), configNameFilter, controller.WithNoSync()),
 		operator.WithInformer(configV1Informers.APIServers(), configNameFilter, controller.WithNoSync()),
+		operator.WithInformer(configV1Informers.Proxies(), configNameFilter, controller.WithNoSync()),
 	)
 }
 
@@ -400,6 +403,9 @@ func (c *authOperator) handleSync(operatorConfig *operatorv1.Authentication) err
 		return err
 	}
 
+	proxyConfig := c.handleProxyConfig()
+	resourceVersions = append(resourceVersions, proxyConfig.ResourceVersion)
+
 	operatorDeployment, err := c.deployments.Deployments(targetNamespaceOperator).Get(targetNameOperator, metav1.GetOptions{})
 	if err != nil {
 		return err
@@ -411,6 +417,7 @@ func (c *authOperator) handleSync(operatorConfig *operatorv1.Authentication) err
 		operatorConfig,
 		syncData,
 		routerSecret,
+		proxyConfig,
 		operatorDeployment,
 		resourceVersions...,
 	)

pkg/operator2/proxy.go

@@ -0,0 +1,17 @@
+package operator2
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/klog"
+
+	configv1 "github.com/openshift/api/config/v1"
+)
+
+func (c *authOperator) handleProxyConfig() *configv1.Proxy {
+	proxyConfig, err := c.proxy.Get(globalConfigName, metav1.GetOptions{})
+	if err != nil {
+		klog.Infof("error getting proxy config: %v", err)
+		return &configv1.Proxy{}
+	}
+	return proxyConfig
+}