Merge pull request kubevirt#10187 from lyarwood/remove-flavor-rbac

virt-operator: Remove flavor.kubevirt.io RBAC
zyjj1 · Aug 4, 2023 · bf40f86 · bf40f86
2 parents 5d0c33e + afb7065
commit bf40f86
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 47 deletions.
diff --git a/manifests/generated/operator-csv.yaml.in b/manifests/generated/operator-csv.yaml.in
@@ -330,22 +330,6 @@ spec:
           - list
           - watch
           - patch
-        - apiGroups:
-          - flavor.kubevirt.io
-          resources:
-          - virtualmachineflavors
-          - virtualmachineclusterflavors
-          - virtualmachinepreferences
-          - virtualmachineclusterpreferences
-          verbs:
-          - get
-          - delete
-          - create
-          - update
-          - patch
-          - list
-          - watch
-          - deletecollection
         - apiGroups:
           - ""
           resources:

diff --git a/manifests/generated/rbac-operator.authorization.k8s.yaml.in b/manifests/generated/rbac-operator.authorization.k8s.yaml.in
@@ -270,22 +270,6 @@ rules:
   - list
   - watch
   - patch
-- apiGroups:
-  - flavor.kubevirt.io
-  resources:
-  - virtualmachineflavors
-  - virtualmachineclusterflavors
-  - virtualmachinepreferences
-  - virtualmachineclusterpreferences
-  verbs:
-  - get
-  - delete
-  - create
-  - update
-  - patch
-  - list
-  - watch
-  - deletecollection
 - apiGroups:
   - ""
   resources:

diff --git a/pkg/virt-operator/resource/generate/rbac/operator.go b/pkg/virt-operator/resource/generate/rbac/operator.go
@@ -313,21 +313,6 @@ func NewOperatorClusterRole() *rbacv1.ClusterRole {
 					"patch",
 				},
 			},
-			// FIXME - Keep the flavor (now renamed instancetype) permissions around until v0.56 to allow the operator to update from v0.54.
-			{
-				APIGroups: []string{
-					"flavor.kubevirt.io",
-				},
-				Resources: []string{
-					"virtualmachineflavors",
-					"virtualmachineclusterflavors",
-					"virtualmachinepreferences",
-					"virtualmachineclusterpreferences",
-				},
-				Verbs: []string{
-					"get", "delete", "create", "update", "patch", "list", "watch", "deletecollection",
-				},
-			},
 		},
 	}