Merge pull request #455 from davidesalerno/ocpbugs65498

OCPBUGS-65498: Add openshift-dns-operator ClusterRole to ClusterOpera…

Author: openshift-merge-bot[bot]

manifests/0000_70_dns-operator_03-cluster-operator.yaml

@@ -13,3 +13,10 @@ status:
   versions:
     - name: operator
       version: "0.0.1-snapshot"
+  relatedObjects:
+    - group:  rbac.authorization.k8s.io
+      resource: clusterroles
+      name: openshift-dns-operator
+    - group: rbac.authorization.k8s.io
+      name: dns-operator
+      resource: clusterrolebindings

pkg/operator/controller/status/controller.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	rbacv1 "k8s.io/api/rbac/v1"
 
 	configv1 "github.com/openshift/api/config/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
@@ -136,6 +137,16 @@ func (r *reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
 			Resource: "dnses",
 			Name:     "default",
 		},
+		{
+			Group:    rbacv1.GroupName,
+			Resource: "clusterroles",
+			Name:     "openshift-dns-operator",
+		},
+		{
+			Group:    rbacv1.GroupName,
+			Resource: "clusterrolebindings",
+			Name:     "openshift-dns-operator",
+		},
 	}
 	if state.haveNamespace {
 		related = append(related, configv1.ObjectReference{

test/e2e/operator_test.go

@@ -21,6 +21,7 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	ctrlruntimelog "sigs.k8s.io/controller-runtime/pkg/log"
@@ -123,6 +124,16 @@ func TestClusterOperatorStatusRelatedObjects(t *testing.T) {
 			Resource: "dnses",
 			Name:     "default",
 		},
+		{
+			Group:    rbacv1.GroupName,
+			Resource: "clusterroles",
+			Name:     "openshift-dns-operator",
+		},
+		{
+			Group:    rbacv1.GroupName,
+			Resource: "clusterrolebindings",
+			Name:     "openshift-dns-operator",
+		},
 		{
 			Resource: "namespaces",
 			Name:     "openshift-dns",