Apply proxy config to Deployment containers

openshift · Jan 13, 2021 · 90b2324 · 90b2324
1 parent ff52bd9
commit 90b2324
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/assets/controller.yaml b/assets/controller.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 metadata:
   name: aws-ebs-csi-driver-controller
   namespace: openshift-cluster-csi-drivers
+  annotations:
+    config.openshift.io/inject-proxy: csi-driver
 spec:
   selector:
     matchLabels:

diff --git a/assets/node.yaml b/assets/node.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 metadata:
   name: aws-ebs-csi-driver-node
   namespace: openshift-cluster-csi-drivers
+  annotations:
+    config.openshift.io/inject-proxy: csi-driver
 spec:
   selector:
     matchLabels:

diff --git a/pkg/generated/bindata.go b/pkg/generated/bindata.go
diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/openshift/library-go/pkg/controller/factory"
 	"github.com/openshift/library-go/pkg/operator/events"
+	"github.com/openshift/library-go/pkg/operator/resource/resourcehash"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -21,8 +22,9 @@ import (
 	configinformers "github.com/openshift/client-go/config/informers/externalversions"
 	"github.com/openshift/library-go/pkg/controller/controllercmd"
 	"github.com/openshift/library-go/pkg/operator/csi/csicontrollerset"
+	"github.com/openshift/library-go/pkg/operator/csi/csidrivercontrollerservicecontroller"
+	"github.com/openshift/library-go/pkg/operator/csi/csidrivernodeservicecontroller"
 	goc "github.com/openshift/library-go/pkg/operator/genericoperatorclient"
-	"github.com/openshift/library-go/pkg/operator/resource/resourcehash"
 	"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
 
@@ -86,6 +88,9 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
 			"rbac/snapshotter_role.yaml",
 			"rbac/snapshotter_binding.yaml",
 		},
+	).WithCSIConfigObserverController(
+		"AWSEBSDriverCSIConfigObserverController",
+		configInformers,
 	).WithCSIDriverControllerService(
 		"AWSEBSDriverControllerServiceController",
 		withCustomCABundle(generated.MustAsset, kubeClient),
@@ -94,12 +99,14 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
 		kubeInformersForNamespaces.InformersFor(defaultNamespace),
 		configInformers,
 		withSecretHashAnnotation(kubeInformersForNamespaces, defaultNamespace, secretName),
+		csidrivercontrollerservicecontroller.WithObservedProxyDeploymentHook(),
 	).WithCSIDriverNodeService(
 		"AWSEBSDriverNodeServiceController",
 		generated.MustAsset,
 		"node.yaml",
 		kubeClient,
 		kubeInformersForNamespaces.InformersFor(defaultNamespace),
+		csidrivernodeservicecontroller.WithObservedProxyDaemonSetHook(),
 	)
 
 	if err != nil {
@@ -201,8 +208,8 @@ func isCustomCABundleUsed(kubeClient kubeclient.Interface) (bool, error) {
 	return exists, nil
 }
 
-func withSecretHashAnnotation(kubeInformersForNamespaces v1helpers.KubeInformersForNamespaces, namespace, secret string) func(*appsv1.Deployment) error {
-	return func(deployment *appsv1.Deployment) error {
+func withSecretHashAnnotation(kubeInformersForNamespaces v1helpers.KubeInformersForNamespaces, namespace, secret string) func(*opv1.OperatorSpec, *appsv1.Deployment) error {
+	return func(opSpec *opv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		inputHashes, err := resourcehash.MultipleObjectHashStringMapForObjectReferenceFromLister(
 			kubeInformersForNamespaces.InformersFor(namespace).Core().V1().ConfigMaps().Lister(),
 			kubeInformersForNamespaces.InformersFor(namespace).Core().V1().Secrets().Lister(),

diff --git a/pkg/operator/starter_test.go b/pkg/operator/starter_test.go
@@ -16,6 +16,8 @@ apiVersion: apps/v1
 metadata:
   name: aws-ebs-csi-driver-controller
   namespace: openshift-cluster-csi-drivers
+  annotations:
+    config.openshift.io/inject-proxy: csi-driver
 spec:
   selector:
     matchLabels:
@@ -181,6 +183,8 @@ apiVersion: apps/v1
 metadata:
   name: aws-ebs-csi-driver-controller
   namespace: openshift-cluster-csi-drivers
+  annotations:
+    config.openshift.io/inject-proxy: csi-driver
 spec:
   selector:
     matchLabels: