Update istio-csr controller with rebased bindata assets

* modify constants.go with new paths
* fix rbacs.go to use generateName for clusterrole and clusterrolebinding

Co-authored-by: Bharath B <[email protected]>
Signed-off-by: Swarup Ghosh <[email protected]>

Author: swghosh

pkg/controller/istiocsr/constants.go

@@ -102,16 +102,16 @@ var (
 // asset names are the files present in the root bindata/ dir. Which are then loaded
 // and made available by the pkg/operator/assets package.
 const (
-	certificateAssetName        = "istio-csr/certificate.yaml"
-	clusterRoleAssetName        = "istio-csr/clusterrole.yaml"
-	clusterRoleBindingAssetName = "istio-csr/clusterrolebinding.yaml"
-	deploymentAssetName         = "istio-csr/deployment.yaml"
-	roleAssetName               = "istio-csr/role.yaml"
-	roleLeasesAssetName         = "istio-csr/role_leases.yaml"
-	roleBindingAssetName        = "istio-csr/rolebinding.yaml"
-	roleBindingLeasesAssetName  = "istio-csr/rolebinding_leases.yaml"
-	serviceAssetName            = "istio-csr/service.yaml"
-	serviceAccountAssetName     = "istio-csr/serviceaccount.yaml"
+	certificateAssetName        = "istio-csr/istiod-certificate.yaml"
+	clusterRoleAssetName        = "istio-csr/cert-manager-istio-csr-clusterrole.yaml"
+	clusterRoleBindingAssetName = "istio-csr/cert-manager-istio-csr-clusterrolebinding.yaml"
+	deploymentAssetName         = "istio-csr/cert-manager-istio-csr-deployment.yaml"
+	roleAssetName               = "istio-csr/cert-manager-istio-csr-role.yaml"
+	roleLeasesAssetName         = "istio-csr/cert-manager-istio-csr-leases-role.yaml"
+	roleBindingAssetName        = "istio-csr/cert-manager-istio-csr-rolebinding.yaml"
+	roleBindingLeasesAssetName  = "istio-csr/cert-manager-istio-csr-leases-rolebinding.yaml"
+	serviceAssetName            = "istio-csr/cert-manager-istio-csr-service.yaml"
+	serviceAccountAssetName     = "istio-csr/cert-manager-istio-csr-serviceaccount.yaml"
 )
 
 const (

pkg/controller/istiocsr/rbacs.go

@@ -124,10 +124,16 @@ func (r *Reconciler) createOrApplyClusterRoles(istiocsr *v1alpha1.IstioCSR, reso
 
 func (r *Reconciler) getClusterRoleObject(istioCSRNamespace string, resourceLabels map[string]string) *rbacv1.ClusterRole {
 	clusterRole := decodeClusterRoleObjBytes(assets.MustAsset(clusterRoleAssetName))
+	updateToUseGenerateName(clusterRole)
 	updateResourceLabelsWithIstioMapperLabels(clusterRole, istioCSRNamespace, resourceLabels)
 	return clusterRole
 }
 
+func updateToUseGenerateName(obj client.Object) {
+	obj.SetName("")
+	obj.SetGenerateName("cert-manager-istio-csr-")
+}
+
 func (r *Reconciler) updateClusterRoleNameInStatus(istiocsr *v1alpha1.IstioCSR, new, existing *rbacv1.ClusterRole) (string, error) {
 	name := new.GetName()
 	if name == "" {
@@ -212,6 +218,7 @@ func (r *Reconciler) createOrApplyClusterRoleBindings(istiocsr *v1alpha1.IstioCS
 func (r *Reconciler) getClusterRoleBindingObject(clusterRoleName, serviceAccount, istiocsrNamespace string, resourceLabels map[string]string) *rbacv1.ClusterRoleBinding {
 	clusterRoleBinding := decodeClusterRoleBindingObjBytes(assets.MustAsset(clusterRoleBindingAssetName))
 	clusterRoleBinding.RoleRef.Name = clusterRoleName
+	updateToUseGenerateName(clusterRoleBinding)
 	updateResourceLabelsWithIstioMapperLabels(clusterRoleBinding, istiocsrNamespace, resourceLabels)
 	updateServiceAccountNamespaceInRBACBindingObject[*rbacv1.ClusterRoleBinding](clusterRoleBinding, serviceAccount, istiocsrNamespace)
 	return clusterRoleBinding

pkg/controller/istiocsr/test_utils.go

@@ -157,13 +157,15 @@ func testClusterRole() *rbacv1.ClusterRole {
 func testClusterRoleBinding() *rbacv1.ClusterRoleBinding {
 	roleBinding := decodeClusterRoleBindingObjBytes(assets.MustAsset(clusterRoleBindingAssetName))
 	roleBinding.SetName("cert-manager-istio-csr-dfkhk")
+	roleBinding.SetGenerateName("cert-manager-istio-csr-")
 	roleBinding.SetLabels(controllerDefaultResourceLabels)
 	return roleBinding
 }
 
 func testClusterRoleBindingExtra() *rbacv1.ClusterRoleBinding {
 	roleBinding := decodeClusterRoleBindingObjBytes(assets.MustAsset(clusterRoleBindingAssetName))
 	roleBinding.SetName("cert-manager-istio-csr-dfmfj")
+	roleBinding.SetGenerateName("cert-manager-istio-csr-")
 	roleBinding.SetLabels(controllerDefaultResourceLabels)
 	return roleBinding
 }