Merge pull request #925 from flavianmissi/OCPBUGS-18969

OCPBUGS-18969: move pruner role creation from openshift-apiserver

Author: openshift-ci[bot]

pkg/resource/generatorimagepruner.go

@@ -26,6 +26,7 @@ type ImagePrunerGenerator struct {
 
 func (g *ImagePrunerGenerator) List(cr *imageregistryv1.ImagePruner) ([]Mutator, error) {
 	var mutators []Mutator
+	mutators = append(mutators, newGeneratorPrunerClusterRole(g.listers.ClusterRoles, g.clients.RBAC))
 	mutators = append(mutators, newGeneratorPrunerClusterRoleBinding(g.listers.ClusterRoleBindings, g.clients.RBAC))
 	mutators = append(mutators, newGeneratorPrunerServiceAccount(g.listers.ServiceAccounts, g.clients.Core))
 	mutators = append(mutators, newGeneratorServiceCA(g.listers.ConfigMaps, g.clients.Core))

pkg/resource/prunerclusterrole.go

@@ -0,0 +1,150 @@
+package resource
+
+import (
+	"context"
+
+	rbacapi "k8s.io/api/rbac/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	rbacset "k8s.io/client-go/kubernetes/typed/rbac/v1"
+	rbaclisters "k8s.io/client-go/listers/rbac/v1"
+)
+
+var _ Mutator = &generatorPrunerClusterRole{}
+
+type generatorPrunerClusterRole struct {
+	lister rbaclisters.ClusterRoleLister
+	client rbacset.RbacV1Interface
+}
+
+func newGeneratorPrunerClusterRole(lister rbaclisters.ClusterRoleLister, client rbacset.RbacV1Interface) *generatorPrunerClusterRole {
+	return &generatorPrunerClusterRole{
+		lister: lister,
+		client: client,
+	}
+}
+
+func (gcr *generatorPrunerClusterRole) Type() runtime.Object {
+	return &rbacapi.ClusterRole{}
+}
+
+func (gcr *generatorPrunerClusterRole) GetNamespace() string {
+	return ""
+}
+
+func (gcr *generatorPrunerClusterRole) GetName() string {
+	return "system:image-pruner"
+}
+
+func (gcr *generatorPrunerClusterRole) expected() (runtime.Object, error) {
+	role := &rbacapi.ClusterRole{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      gcr.GetName(),
+			Namespace: gcr.GetNamespace(),
+		},
+		Rules: []rbacapi.PolicyRule{
+			{
+				Verbs:     []string{"get", "list"},
+				APIGroups: []string{""},
+				Resources: []string{
+					"pods",
+					"replicationcontrollers",
+				},
+			},
+			{
+				Verbs:     []string{"list"},
+				APIGroups: []string{""},
+				Resources: []string{
+					"limitranges",
+				},
+			},
+			{
+				Verbs:     []string{"get", "list"},
+				APIGroups: []string{"build.openshift.io", ""},
+				Resources: []string{
+					"buildconfigs",
+					"builds",
+				},
+			},
+			{
+				Verbs:     []string{"get", "list"},
+				APIGroups: []string{"apps.openshift.io", ""},
+				Resources: []string{
+					"deploymentconfigs",
+				},
+			},
+			{
+				Verbs:     []string{"get", "list"},
+				APIGroups: []string{"batch"},
+				Resources: []string{
+					"jobs",
+					"cronjobs",
+				},
+			},
+			{
+				Verbs:     []string{"get", "list"},
+				APIGroups: []string{"apps"},
+				Resources: []string{
+					"daemonsets",
+					"deployments",
+					"replicasets",
+					"statefulsets",
+				},
+			},
+			{
+				Verbs:     []string{"delete"},
+				APIGroups: []string{"image.openshift.io", ""},
+				Resources: []string{
+					"images",
+				},
+			},
+			{
+				Verbs:     []string{"get", "list", "watch"},
+				APIGroups: []string{"image.openshift.io", ""},
+				Resources: []string{
+					"images",
+					"imagestreams",
+				},
+			},
+			{
+				Verbs:     []string{"update"},
+				APIGroups: []string{"image.openshift.io", ""},
+				Resources: []string{
+					"imagestreams/status",
+				},
+			},
+		},
+	}
+
+	return role, nil
+}
+
+func (gcr *generatorPrunerClusterRole) Get() (runtime.Object, error) {
+	return gcr.lister.Get(gcr.GetName())
+}
+
+func (gcr *generatorPrunerClusterRole) Create() (runtime.Object, error) {
+	return commonCreate(gcr, func(obj runtime.Object) (runtime.Object, error) {
+		return gcr.client.ClusterRoles().Create(
+			context.TODO(), obj.(*rbacapi.ClusterRole), metav1.CreateOptions{},
+		)
+	})
+}
+
+func (gcr *generatorPrunerClusterRole) Update(o runtime.Object) (runtime.Object, bool, error) {
+	return commonUpdate(gcr, o, func(obj runtime.Object) (runtime.Object, error) {
+		return gcr.client.ClusterRoles().Update(
+			context.TODO(), obj.(*rbacapi.ClusterRole), metav1.UpdateOptions{},
+		)
+	})
+}
+
+func (gcr *generatorPrunerClusterRole) Delete(opts metav1.DeleteOptions) error {
+	return gcr.client.ClusterRoles().Delete(
+		context.TODO(), gcr.GetName(), opts,
+	)
+}
+
+func (g *generatorPrunerClusterRole) Owned() bool {
+	return true
+}

pkg/resource/prunerclusterrole_test.go

@@ -0,0 +1,36 @@
+package resource
+
+import (
+	"reflect"
+	"testing"
+
+	rbacapi "k8s.io/api/rbac/v1"
+)
+
+func TestImagePrunerRules(t *testing.T) {
+	generator := newGeneratorPrunerClusterRole(nil, nil)
+	expected := rbacapi.PolicyRule{
+		Verbs:     []string{"delete"},
+		APIGroups: []string{"image.openshift.io"},
+		Resources: []string{"images"},
+	}
+	r, err := generator.expected()
+	if err != nil {
+		t.Fatalf("error getting desired cluster role: %#v", err)
+	}
+	role, ok := r.(*rbacapi.ClusterRole)
+	if !ok {
+		t.Fatal("failed to cast object to ClusterRole")
+	}
+
+	for _, rule := range role.Rules {
+		if !reflect.DeepEqual(rule.Resources, expected.Resources) {
+			continue
+		}
+		if !reflect.DeepEqual(rule.Verbs, expected.Verbs) {
+			t.Error("images rule.Verbs differ")
+			t.Errorf("want %#v", expected.Verbs)
+			t.Errorf("got  %#v", rule.Verbs)
+		}
+	}
+}