Skip to content

Commit

Permalink
Merge pull request #548 from enxebre/bug-1817860
Browse files Browse the repository at this point in the history
Bug 1817860: Drop non existent object from relatedResources
  • Loading branch information
openshift-merge-robot committed Apr 7, 2020
2 parents a0dac76 + e04119f commit 550aea3
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
6 changes: 0 additions & 6 deletions pkg/operator/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,6 @@ func (optr *Operator) relatedObjects() []osconfigv1.ObjectReference {
Resource: "clusterroles",
Name: "machine-api-controllers",
},
{
Group: "rbac.authorization.k8s.io",
Resource: "roles",
Name: "cloud-provider-config-reader",
Namespace: "openshift-config",
},
}
}

Expand Down
12 changes: 0 additions & 12 deletions pkg/operator/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,12 +230,6 @@ func TestGetOrCreateClusterOperator(t *testing.T) {
Resource: "clusterroles",
Name: "machine-api-controllers",
},
{
Group: "rbac.authorization.k8s.io",
Resource: "roles",
Name: "cloud-provider-config-reader",
Namespace: "openshift-config",
},
},
},
},
Expand Down Expand Up @@ -288,12 +282,6 @@ func TestGetOrCreateClusterOperator(t *testing.T) {
Resource: "clusterroles",
Name: "machine-api-controllers",
},
{
Group: "rbac.authorization.k8s.io",
Resource: "roles",
Name: "cloud-provider-config-reader",
Namespace: "openshift-config",
},
},
Conditions: conditions,
},
Expand Down

0 comments on commit 550aea3

Please sign in to comment.