openshift · cssjr · May 27, 2026 · May 27, 2026 · May 27, 2026 · May 27, 2026
diff --git a/control-plane-operator/controllers/hostedcontrolplane/manifests/etcd.go b/control-plane-operator/controllers/hostedcontrolplane/manifests/etcd.go
@@ -91,6 +91,33 @@ func EtcdDefragControllerServiceAccount(ns string) *corev1.ServiceAccount {
 	}
 }
 
+func EtcdServiceAccount(ns string) *corev1.ServiceAccount {
+	return &corev1.ServiceAccount{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "etcd",
+			Namespace: ns,
+		},
+	}
+}
+
+func EtcdSelfRegisterRole(ns string) *rbacv1.Role {
+	return &rbacv1.Role{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "etcd-self-register",
+			Namespace: ns,
+		},
+	}
+}
+
+func EtcdSelfRegisterRoleBinding(ns string) *rbacv1.RoleBinding {
+	return &rbacv1.RoleBinding{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "etcd-self-register",
+			Namespace: ns,
+		},
+	}
+}
+
 func EtcdBackupServiceAccount(hcpNamespace string) *corev1.ServiceAccount {
 	return &corev1.ServiceAccount{
 		ObjectMeta: metav1.ObjectMeta{

diff --git a/...tdata/etcd/AROSwift/zz_fixture_TestControlPlaneComponents_etcd_controlplanecomponent.yaml b/...tdata/etcd/AROSwift/zz_fixture_TestControlPlaneComponents_etcd_controlplanecomponent.yaml
diff --git a/...testdata/etcd/AROSwift/zz_fixture_TestControlPlaneComponents_etcd_self_register_role.yaml b/...testdata/etcd/AROSwift/zz_fixture_TestControlPlaneComponents_etcd_self_register_role.yaml
diff --git a/...a/etcd/AROSwift/zz_fixture_TestControlPlaneComponents_etcd_self_register_rolebinding.yaml b/...a/etcd/AROSwift/zz_fixture_TestControlPlaneComponents_etcd_self_register_rolebinding.yaml
diff --git a/...ane/testdata/etcd/AROSwift/zz_fixture_TestControlPlaneComponents_etcd_serviceaccount.yaml b/...ane/testdata/etcd/AROSwift/zz_fixture_TestControlPlaneComponents_etcd_serviceaccount.yaml
diff --git a/...lplane/testdata/etcd/AROSwift/zz_fixture_TestControlPlaneComponents_etcd_statefulset.yaml b/...lplane/testdata/etcd/AROSwift/zz_fixture_TestControlPlaneComponents_etcd_statefulset.yaml
diff --git a/...e/testdata/etcd/GCP/zz_fixture_TestControlPlaneComponents_etcd_controlplanecomponent.yaml b/...e/testdata/etcd/GCP/zz_fixture_TestControlPlaneComponents_etcd_controlplanecomponent.yaml
diff --git a/...lane/testdata/etcd/GCP/zz_fixture_TestControlPlaneComponents_etcd_self_register_role.yaml b/...lane/testdata/etcd/GCP/zz_fixture_TestControlPlaneComponents_etcd_self_register_role.yaml
diff --git a/...stdata/etcd/GCP/zz_fixture_TestControlPlaneComponents_etcd_self_register_rolebinding.yaml b/...stdata/etcd/GCP/zz_fixture_TestControlPlaneComponents_etcd_self_register_rolebinding.yaml
diff --git a/...rolplane/testdata/etcd/GCP/zz_fixture_TestControlPlaneComponents_etcd_serviceaccount.yaml b/...rolplane/testdata/etcd/GCP/zz_fixture_TestControlPlaneComponents_etcd_serviceaccount.yaml
diff --git a/...ontrolplane/testdata/etcd/GCP/zz_fixture_TestControlPlaneComponents_etcd_statefulset.yaml b/...ontrolplane/testdata/etcd/GCP/zz_fixture_TestControlPlaneComponents_etcd_statefulset.yaml
diff --git a/...tdata/etcd/IBMCloud/zz_fixture_TestControlPlaneComponents_etcd_controlplanecomponent.yaml b/...tdata/etcd/IBMCloud/zz_fixture_TestControlPlaneComponents_etcd_controlplanecomponent.yaml
diff --git a/...testdata/etcd/IBMCloud/zz_fixture_TestControlPlaneComponents_etcd_self_register_role.yaml b/...testdata/etcd/IBMCloud/zz_fixture_TestControlPlaneComponents_etcd_self_register_role.yaml
diff --git a/...a/etcd/IBMCloud/zz_fixture_TestControlPlaneComponents_etcd_self_register_rolebinding.yaml b/...a/etcd/IBMCloud/zz_fixture_TestControlPlaneComponents_etcd_self_register_rolebinding.yaml
diff --git a/...ane/testdata/etcd/IBMCloud/zz_fixture_TestControlPlaneComponents_etcd_serviceaccount.yaml b/...ane/testdata/etcd/IBMCloud/zz_fixture_TestControlPlaneComponents_etcd_serviceaccount.yaml
diff --git a/...lplane/testdata/etcd/IBMCloud/zz_fixture_TestControlPlaneComponents_etcd_statefulset.yaml b/...lplane/testdata/etcd/IBMCloud/zz_fixture_TestControlPlaneComponents_etcd_statefulset.yaml
diff --git a/...echPreviewNoUpgrade/zz_fixture_TestControlPlaneComponents_etcd_controlplanecomponent.yaml b/...echPreviewNoUpgrade/zz_fixture_TestControlPlaneComponents_etcd_controlplanecomponent.yaml