Bug 1898045: redeploy CSI Controller Deployment when secret changes

go.mod

@@ -1,17 +1,16 @@
 module github.com/openshift/aws-ebs-csi-driver-operator
 
-go 1.14
+go 1.15
 
 require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/openshift/api v0.0.0-20201214114959-164a2fb63b5f
 	github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
 	github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49
-	github.com/openshift/library-go v0.0.0-20210106214821-c4d0b9c8d55f
+	github.com/openshift/library-go v0.0.0-20210113192829-cfbb3f4c80c2
 	github.com/prometheus/client_golang v1.7.1
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
-	github.com/ugorji/go v1.1.4 // indirect
 	k8s.io/api v0.20.0
 	k8s.io/apimachinery v0.20.0
 	k8s.io/client-go v0.20.0

pkg/operator/starter.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/openshift/library-go/pkg/controller/factory"
 	"github.com/openshift/library-go/pkg/operator/events"
-	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubeclient "k8s.io/client-go/kubernetes"
@@ -21,8 +20,8 @@ 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"
 	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"
 
@@ -46,6 +45,7 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
 	// Create core clientset and informer
 	kubeClient := kubeclient.NewForConfigOrDie(rest.AddUserAgent(controllerConfig.KubeConfig, operatorName))
 	kubeInformersForNamespaces := v1helpers.NewKubeInformersForNamespaces(kubeClient, defaultNamespace, cloudConfigNamespace, "")
+	secretInformer := kubeInformersForNamespaces.InformersFor(defaultNamespace).Core().V1().Secrets()
 
 	// Create config clientset and informer. This is used to get the cluster ID
 	configClient := configclient.NewForConfigOrDie(rest.AddUserAgent(controllerConfig.KubeConfig, operatorName))
@@ -93,14 +93,14 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
 		kubeClient,
 		kubeInformersForNamespaces.InformersFor(defaultNamespace),
 		configInformers,
-		withSecretHashAnnotation(kubeInformersForNamespaces, defaultNamespace, secretName),
+		csidrivercontrollerservicecontroller.WithSecretHashAnnotationHook(defaultNamespace, secretName, secretInformer),
 	).WithCSIDriverNodeService(
 		"AWSEBSDriverNodeServiceController",
 		generated.MustAsset,
 		"node.yaml",
 		kubeClient,
 		kubeInformersForNamespaces.InformersFor(defaultNamespace),
-	)
+	).WithExtraInformers(secretInformer.Informer())
 
 	if err != nil {
 		return err
@@ -200,28 +200,3 @@ func isCustomCABundleUsed(kubeClient kubeclient.Interface) (bool, error) {
 	_, exists := cloudConfigCM.Data[caBundleKey]
 	return exists, nil
 }
-
-func withSecretHashAnnotation(kubeInformersForNamespaces v1helpers.KubeInformersForNamespaces, namespace, secret string) func(*appsv1.Deployment) error {
-	return func(deployment *appsv1.Deployment) error {
-		inputHashes, err := resourcehash.MultipleObjectHashStringMapForObjectReferenceFromLister(
-			kubeInformersForNamespaces.InformersFor(namespace).Core().V1().ConfigMaps().Lister(),
-			kubeInformersForNamespaces.InformersFor(namespace).Core().V1().Secrets().Lister(),
-			resourcehash.NewObjectRef().ForSecret().InNamespace(namespace).Named(secret),
-		)
-		if err != nil {
-			return fmt.Errorf("invalid dependency reference: %w", err)
-		}
-		if deployment.Annotations == nil {
-			deployment.Annotations = map[string]string{}
-		}
-		if deployment.Spec.Template.Annotations == nil {
-			deployment.Spec.Template.Annotations = map[string]string{}
-		}
-		for k, v := range inputHashes {
-			annotationKey := fmt.Sprintf("operator.openshift.io/dep-%s", k)
-			deployment.Annotations[annotationKey] = v
-			deployment.Spec.Template.Annotations[annotationKey] = v
-		}
-		return nil
-	}
-}