OpenStack: Cleanup ServiceAccount

For an unknown reason OpenStack was different in CCCMO and had its OpenStack-specific `kube-system` ServiceAccount defined in manifests/. This commit attempts to clean up this situation by moving these manifests to pkg/cloud/openstack/assets.
openshift · Apr 23, 2024 · d59800a · d59800a
1 parent f8e0afd
commit d59800a
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 57 deletions.
diff --git a/...-manager-operator_05_metrics-service.yaml → ...-manager-operator_04_metrics-service.yaml b/...-manager-operator_05_metrics-service.yaml → ...-manager-operator_04_metrics-service.yaml
diff --git a/manifests/0000_26_cloud-controller-manager-operator_04_rbac_provider_openstack.yaml b/manifests/0000_26_cloud-controller-manager-operator_04_rbac_provider_openstack.yaml
diff --git a/...r-operator_06_kube-rbac-proxy-config.yaml → ...r-operator_05_kube-rbac-proxy-config.yaml b/...r-operator_06_kube-rbac-proxy-config.yaml → ...r-operator_05_kube-rbac-proxy-config.yaml
diff --git a/pkg/cloud/cloud_test.go b/pkg/cloud/cloud_test.go
@@ -141,18 +141,22 @@ func TestGetResources(t *testing.T) {
 	}, {
 		name:                  "OpenStack resources returned as expected",
 		testPlatform:          platformsMap[string(configv1.OpenStackPlatformType)],
-		expectedResourceCount: 2,
+		expectedResourceCount: 4,
 		expectedResourcesKindName: []string{
 			"Deployment/openstack-cloud-controller-manager",
 			"PodDisruptionBudget/openstack-cloud-controller-manager",
+			"ClusterRole/openstack-cloud-controller-manager",
+			"ClusterRoleBinding/cloud-controller-manager:openstack-cloud-controller-manager",
 		},
 	}, {
 		name:                  "OpenStack resources returned as expected with signle node cluster",
 		testPlatform:          platformsMap[string(configv1.OpenStackPlatformType)],
-		expectedResourceCount: 1,
+		expectedResourceCount: 3,
 		singleReplica:         true,
 		expectedResourcesKindName: []string{
 			"Deployment/openstack-cloud-controller-manager",
+			"ClusterRole/openstack-cloud-controller-manager",
+			"ClusterRoleBinding/cloud-controller-manager:openstack-cloud-controller-manager",
 		},
 	}, {
 		name:                  "GCP resources returned as expected",

diff --git a/pkg/cloud/openstack/assets/deployment.yaml b/pkg/cloud/openstack/assets/deployment.yaml
@@ -23,7 +23,7 @@ spec:
         infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
     spec:
       hostNetwork: true
-      serviceAccount: cloud-controller-manager
+      serviceAccountName: cloud-controller-manager
       priorityClassName: system-cluster-critical
       nodeSelector:
         node-role.kubernetes.io/master: ""

diff --git a/pkg/cloud/openstack/assets/openstack-cloud-controller-manager-clusterrole.yaml b/pkg/cloud/openstack/assets/openstack-cloud-controller-manager-clusterrole.yaml
@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: openstack-cloud-controller-manager
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+rules:
+  - apiGroups:
+    - ""
+    resources:
+    - services
+    - services/status
+    verbs:
+    - patch
diff --git a/pkg/cloud/openstack/assets/openstack-cloud-controller-manager-clusterrolebinding.yaml b/pkg/cloud/openstack/assets/openstack-cloud-controller-manager-clusterrolebinding.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cloud-controller-manager:openstack-cloud-controller-manager
+roleRef:
+  kind: ClusterRole
+  name: openstack-cloud-controller-manager
+  apiGroup: rbac.authorization.k8s.io
+subjects:
+  - kind: ServiceAccount
+    namespace: kube-system
+    name: cloud-controller-manager
diff --git a/pkg/cloud/openstack/openstack.go b/pkg/cloud/openstack/openstack.go
@@ -9,6 +9,7 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	ini "gopkg.in/ini.v1"
 	appsv1 "k8s.io/api/apps/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -24,6 +25,8 @@ var (
 
 	templates = []common.TemplateSource{
 		{ReferenceObject: &appsv1.Deployment{}, EmbedFsPath: "assets/deployment.yaml"},
+		{ReferenceObject: &rbacv1.ClusterRole{}, EmbedFsPath: "assets/openstack-cloud-controller-manager-clusterrole.yaml"},
+		{ReferenceObject: &rbacv1.ClusterRoleBinding{}, EmbedFsPath: "assets/openstack-cloud-controller-manager-clusterrolebinding.yaml"},
 	}
 )
 

diff --git a/pkg/cloud/openstack/openstack_test.go b/pkg/cloud/openstack/openstack_test.go
@@ -51,7 +51,7 @@ func TestResourcesRenderingSmoke(t *testing.T) {
 			}
 
 			resources := assets.GetRenderedResources()
-			g.Expect(resources).Should(HaveLen(1))
+			g.Expect(resources).Should(HaveLen(3))
 		})
 	}
 }