Skip to content

Commit

Permalink
tests: label RBAC as needed
Browse files Browse the repository at this point in the history 
Signed-off-by: Steve Kuznetsov <[email protected]>
  • Loading branch information
@stevekuznetsov
stevekuznetsov committed Sep 21, 2023
1 parent 67c392b commit c7f21a3
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
24 changes: 24 additions & 0 deletions pkg/controller/operators/olm/operator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4587,6 +4587,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.admin-8rdAjL0E35JMMAkOqYmoorzjpIIihfnj3DcgDU",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4597,6 +4598,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.edit-9lBEUxqAYE7CX7wZfFEPYutTfQTo43WarB08od",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4607,6 +4609,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.view-1l6ymczPK5SceF4d0DCtAnWZuvmKn6s8oBUxHr",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand Down Expand Up @@ -4648,6 +4651,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "operator-group-1-admin",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4658,6 +4662,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "operator-group-1-view",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4668,6 +4673,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "operator-group-1-edit",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4686,6 +4692,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.admin-8rdAjL0E35JMMAkOqYmoorzjpIIihfnj3DcgDU",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4696,6 +4703,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.edit-9lBEUxqAYE7CX7wZfFEPYutTfQTo43WarB08od",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4706,6 +4714,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.view-1l6ymczPK5SceF4d0DCtAnWZuvmKn6s8oBUxHr",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4716,6 +4725,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "operator-group-1-admin",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4726,6 +4736,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "operator-group-1-view",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4736,6 +4747,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "operator-group-1-edit",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand Down Expand Up @@ -4777,6 +4789,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.admin-8rdAjL0E35JMMAkOqYmoorzjpIIihfnj3DcgDU",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns-bob",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4788,6 +4801,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.view-1l6ymczPK5SceF4d0DCtAnWZuvmKn6s8oBUxHr",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-5",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4800,6 +4814,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.edit-9lBEUxqAYE7CX7wZfFEPYutTfQTo43WarB08od",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroupKind",
Expand All @@ -4818,6 +4833,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.admin-8rdAjL0E35JMMAkOqYmoorzjpIIihfnj3DcgDU",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4829,6 +4845,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.edit-9lBEUxqAYE7CX7wZfFEPYutTfQTo43WarB08od",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4839,6 +4856,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.view-1l6ymczPK5SceF4d0DCtAnWZuvmKn6s8oBUxHr",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand Down Expand Up @@ -4882,6 +4900,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.admin-8rdAjL0E35JMMAkOqYmoorzjpIIihfnj3DcgDU",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4892,6 +4911,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.edit-9lBEUxqAYE7CX7wZfFEPYutTfQTo43WarB08od",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4902,6 +4922,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.view-1l6ymczPK5SceF4d0DCtAnWZuvmKn6s8oBUxHr",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4919,6 +4940,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.admin-8rdAjL0E35JMMAkOqYmoorzjpIIihfnj3DcgDU",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4929,6 +4951,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.edit-9lBEUxqAYE7CX7wZfFEPYutTfQTo43WarB08od",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand All @@ -4939,6 +4962,7 @@ func TestSyncOperatorGroups(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "olm.og.operator-group-1.view-1l6ymczPK5SceF4d0DCtAnWZuvmKn6s8oBUxHr",
Labels: map[string]string{
"olm.managed": "true",
"olm.owner": "operator-group-1",
"olm.owner.namespace": "operator-ns",
"olm.owner.kind": "OperatorGroup",
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/operators/olm/operatorgroup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1052,6 +1052,7 @@ func (a *Operator) ensureOpGroupClusterRole(op *operatorsv1.OperatorGroup, suffi
if err := ownerutil.AddOwnerLabels(clusterRole, op); err != nil {
return err
}
clusterRole.Labels[install.OLMManagedLabelKey] = install.OLMManagedLabelValue

a.logger.Infof("creating cluster role: %s owned by operator group: %s/%s", clusterRole.GetName(), op.GetNamespace(), op.GetName())
_, err = a.opClient.KubernetesInterface().RbacV1().ClusterRoles().Create(context.TODO(), clusterRole, metav1.CreateOptions{})
Expand Down

0 comments on commit c7f21a3

Please sign in to comment.