Merge pull request #86 from bertinatto/dont-create-cc

Bug 1868339: Don't create CredentialsRequest in aws-ebs-csi-driver-operator
openshift · Sep 2, 2020 · 06d21c0 · 06d21c0
2 parents 3a5ffeb + 0825498
commit 06d21c0
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 65 deletions.
diff --git a/assets/controller.yaml b/assets/controller.yaml
@@ -38,12 +38,12 @@ spec:
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
-                  name: aws-cloud-credentials
+                  name: ebs-cloud-credentials
                   key: aws_access_key_id
             - name: AWS_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
-                  name: aws-cloud-credentials
+                  name: ebs-cloud-credentials
                   key: aws_secret_access_key
           ports:
             - name: healthz

diff --git a/assets/credentials.yaml → manifests/02_credentials_request.yaml b/assets/credentials.yaml → manifests/02_credentials_request.yaml
@@ -1,11 +1,11 @@
 apiVersion: cloudcredential.openshift.io/v1
 kind: CredentialsRequest
 metadata:
-  name: openshift-cluster-csi-drivers
+  name: aws-ebs-csi-driver-operator
   namespace: openshift-cloud-credential-operator
 spec:
   secretRef:
-    name: aws-cloud-credentials
+    name: ebs-cloud-credentials
     namespace: openshift-cluster-csi-drivers
   providerSpec:
     apiVersion: cloudcredential.openshift.io/v1

diff --git a/manifests/02_sa.yaml → manifests/03_sa.yaml b/manifests/02_sa.yaml → manifests/03_sa.yaml
diff --git a/manifests/03_role.yaml → manifests/04_role.yaml b/manifests/03_role.yaml → manifests/04_role.yaml
diff --git a/manifests/04_rolebinding.yaml → manifests/05_rolebinding.yaml b/manifests/04_rolebinding.yaml → manifests/05_rolebinding.yaml
diff --git a/manifests/05_clusterrole.yaml → manifests/06_clusterrole.yaml b/manifests/05_clusterrole.yaml → manifests/06_clusterrole.yaml
diff --git a/manifests/06_clusterrolebinding.yaml → manifests/07_clusterrolebinding.yaml b/manifests/06_clusterrolebinding.yaml → manifests/07_clusterrolebinding.yaml
diff --git a/manifests/07_deployment.yaml → manifests/08_deployment.yaml b/manifests/07_deployment.yaml → manifests/08_deployment.yaml
diff --git a/manifests/08_cr.yaml → manifests/09_cr.yaml b/manifests/08_cr.yaml → manifests/09_cr.yaml
diff --git a/pkg/generated/bindata.go b/pkg/generated/bindata.go
diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	dynamicclient "k8s.io/client-go/dynamic"
 	kubeclient "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
@@ -29,7 +28,6 @@ const (
 func RunOperator(ctx context.Context, controllerConfig *controllercmd.ControllerContext) error {
 	// Create clientsets and informers
 	kubeClient := kubeclient.NewForConfigOrDie(rest.AddUserAgent(controllerConfig.KubeConfig, operatorName))
-	dynamicClient := dynamicclient.NewForConfigOrDie(rest.AddUserAgent(controllerConfig.KubeConfig, operatorName))
 	kubeInformersForNamespaces := v1helpers.NewKubeInformersForNamespaces(kubeClient, defaultNamespace, "")
 
 	// Create GenericOperatorclient. This is used by the library-go controllers created down below
@@ -67,12 +65,6 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
 			"rbac/snapshotter_role.yaml",
 			"rbac/snapshotter_binding.yaml",
 		},
-	).WithCredentialsRequestController(
-		"AWSEBSDriverCredentialsRequestController",
-		defaultNamespace,
-		generated.MustAsset,
-		"credentials.yaml",
-		dynamicClient,
 	).WithCSIDriverControllerService(
 		"AWSEBSDriverControllerServiceController",
 		generated.MustAsset,