-
Notifications
You must be signed in to change notification settings - Fork 192
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Run rbac createresources for namespaces concurrently to avoid slowness
- Loading branch information
Showing
6 changed files
with
293 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| package tektonconfig | ||
|
|
||
| import ( | ||
| "context" | ||
| "os" | ||
| "testing" | ||
|
|
||
| "github.com/google/go-cmp/cmp" | ||
| v1 "github.com/openshift/api/security/v1" | ||
| fakesecurity "github.com/openshift/client-go/security/clientset/versioned/fake" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/tektoncd/operator/pkg/apis/operator/v1alpha1" | ||
|
|
||
| //fakeoperator "github.com/tektoncd/operator/pkg/client/injection/client/fake" | ||
| fakeoperator "github.com/tektoncd/operator/pkg/client/clientset/versioned/fake" | ||
| "github.com/tektoncd/operator/pkg/reconciler/common" | ||
| "github.com/tektoncd/pipeline/test/diff" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/client-go/informers" | ||
| fakek8s "k8s.io/client-go/kubernetes/fake" | ||
| duckv1 "knative.dev/pkg/apis/duck/v1" | ||
| ts "knative.dev/pkg/reconciler/testing" | ||
| ) | ||
|
|
||
| func TestGetNamespacesToBeReconciled(t *testing.T) { | ||
| var deletionTime = metav1.Now() | ||
| for _, c := range []struct { | ||
| desc string | ||
| wantNamespaces []corev1.Namespace | ||
| objs []runtime.Object | ||
| ctx context.Context | ||
| }{ | ||
| { | ||
| desc: "ignore system namespaces", | ||
| objs: []runtime.Object{ | ||
| &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "openshift-test"}}, | ||
| }, | ||
| wantNamespaces: nil, | ||
| ctx: context.Background(), | ||
| }, | ||
| { | ||
| desc: "ignore namespaces with deletion timestamp", | ||
| objs: []runtime.Object{ | ||
| &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "openshift-test", DeletionTimestamp: &deletionTime}}, | ||
| }, | ||
| wantNamespaces: nil, | ||
| ctx: context.Background(), | ||
| }, | ||
| { | ||
| desc: "add namespace to reconcile list if it has openshift scc operator.tekton.dev/scc annotation set ", | ||
| objs: []runtime.Object{ | ||
| &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "test", Annotations: map[string]string{"operator.tekton.dev/scc": "restricted"}}}, | ||
| }, | ||
| wantNamespaces: []corev1.Namespace{ | ||
| { | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "test", | ||
| Annotations: map[string]string{"operator.tekton.dev/scc": "restricted"}, | ||
| }, | ||
| }, | ||
| }, | ||
| ctx: context.Background(), | ||
| }, | ||
| { | ||
| desc: "add namespace to reconcile list if it has bad label openshift-pipelines.tekton.dev/namespace-reconcile-version", | ||
| objs: []runtime.Object{ | ||
| &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "test", Labels: map[string]string{"openshift-pipelines.tekton.dev/namespace-reconcile-version": ""}}}, | ||
| }, | ||
| wantNamespaces: []corev1.Namespace{ | ||
| { | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "test", | ||
| Labels: map[string]string{"openshift-pipelines.tekton.dev/namespace-reconcile-version": ""}, | ||
| }, | ||
| }, | ||
| }, | ||
| ctx: context.Background(), | ||
| }, | ||
| } { | ||
| t.Run(c.desc, func(t *testing.T) { | ||
| kubeclient := fakek8s.NewSimpleClientset(c.objs...) | ||
| r := rbac{ | ||
| kubeClientSet: kubeclient, | ||
| version: "devel", | ||
| } | ||
| namespaces, err := r.getNamespacesToBeReconciled(c.ctx) | ||
| if err != nil { | ||
| t.Fatalf("getNamespacesToBeReconciled: %v", err) | ||
| } | ||
| if d := cmp.Diff(c.wantNamespaces, namespaces); d != "" { | ||
| t.Fatalf("Diff %s", diff.PrintWantGot(d)) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestCreateResources(t *testing.T) { | ||
| ctx, _, _ := ts.SetupFakeContextWithCancel(t) | ||
| os.Setenv(common.KoEnvKey, "testdata") | ||
| scc := &v1.SecurityContextConstraints{ObjectMeta: metav1.ObjectMeta{Name: "PipelinesSCC"}} | ||
| tc := &v1alpha1.TektonConfig{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: v1alpha1.ConfigResourceName, | ||
| Labels: map[string]string{}, | ||
| }, | ||
| Spec: v1alpha1.TektonConfigSpec{ | ||
| CommonSpec: v1alpha1.CommonSpec{ | ||
| TargetNamespace: "foo", | ||
| }, | ||
| Platforms: v1alpha1.Platforms{ | ||
| OpenShift: v1alpha1.OpenShift{ | ||
| SCC: &v1alpha1.SCC{ | ||
| Default: scc.Name, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| Status: v1alpha1.TektonConfigStatus{ | ||
| Status: duckv1.Status{}, | ||
| TektonInstallerSet: map[string]string{}, | ||
| }, | ||
| } | ||
| for _, c := range []struct { | ||
| desc string | ||
| objs []runtime.Object | ||
| iSet *v1alpha1.TektonInstallerSet | ||
| err error | ||
| }{ | ||
| { | ||
| desc: "No existing installer set", | ||
| objs: []runtime.Object{ | ||
| &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "test", Labels: map[string]string{"openshift-pipelines.tekton.dev/namespace-reconcile-version": ""}}}, | ||
| }, | ||
| err: v1alpha1.RECONCILE_AGAIN_ERR, | ||
| }, | ||
| { | ||
| desc: "existing installer set", | ||
| objs: []runtime.Object{ | ||
| &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "test", Labels: map[string]string{"openshift-pipelines.tekton.dev/namespace-reconcile-version": ""}}}, | ||
| }, | ||
| iSet: &v1alpha1.TektonInstallerSet{ObjectMeta: metav1.ObjectMeta{Name: "rhosp-rbac-001", Labels: map[string]string{v1alpha1.CreatedByKey: createdByValue, v1alpha1.InstallerSetType: componentNameRBAC}, Annotations: map[string]string{ | ||
| v1alpha1.ReleaseVersionKey: "devel", v1alpha1.TargetNamespaceKey: tc.Spec.TargetNamespace}}, Spec: v1alpha1.TektonInstallerSetSpec{}}, | ||
| err: nil, | ||
| }, | ||
| } { | ||
| t.Run(c.desc, func(t *testing.T) { | ||
| kubeclient := fakek8s.NewSimpleClientset(c.objs...) | ||
| fakeoperatorclient := fakeoperator.NewSimpleClientset() | ||
| fakesecurityclient := fakesecurity.NewSimpleClientset() | ||
| _, err := fakesecurityclient.SecurityV1().SecurityContextConstraints().Create(ctx, scc, metav1.CreateOptions{}) | ||
| if err != nil { | ||
| t.Logf("Could not create fake scc %v", err) | ||
| } | ||
| if c.iSet != nil { | ||
| _, err := fakeoperatorclient.OperatorV1alpha1().TektonInstallerSets().Create(ctx, c.iSet, metav1.CreateOptions{}) | ||
| if err != nil { | ||
| t.Logf("Could not create fake installerSet %v", err) | ||
| } | ||
| } | ||
| informers := informers.NewSharedInformerFactory(kubeclient, 0) | ||
| nsInformer := informers.Core().V1().Namespaces() | ||
| rbacinformer := informers.Rbac().V1().ClusterRoleBindings() | ||
|
|
||
| r := rbac{ | ||
| kubeClientSet: kubeclient, | ||
| operatorClientSet: fakeoperatorclient, | ||
| securityClientSet: fakesecurityclient, | ||
| rbacInformer: rbacinformer, | ||
| nsInformer: nsInformer, | ||
| version: "devel", | ||
| tektonConfig: tc, | ||
| } | ||
| err = r.createResources(ctx) | ||
| require.ErrorIs(t, err, c.err) | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.