public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Resolve some FIXME

This commit is contained in:
Tomasz Sęk 2021-01-27 11:29:38 +01:00
parent 363b9e0fc0
commit 34ffdde054
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/configuration/base/rbac.go
View File

@ -6,8 +6,10 @@ import (
"strings" "strings"
"github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources"
stackerr "github.com/pkg/errors" stackerr "github.com/pkg/errors"
rbacv1 "k8s.io/api/rbac/v1" rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
) )
@ -43,7 +45,10 @@ func (r *JenkinsBaseConfigurationReconciler) ensureExtraRBAC(meta metav1.ObjectM
for _, roleRef := range r.Configuration.Jenkins.Spec.Roles { for _, roleRef := range r.Configuration.Jenkins.Spec.Roles {
name = getExtraRoleBindingName(meta.Name, roleRef) name = getExtraRoleBindingName(meta.Name, roleRef)
roleBinding := resources.NewRoleBinding(name, meta.Namespace, meta.Name, roleRef) roleBinding := resources.NewRoleBinding(name, meta.Namespace, meta.Name, roleRef)
err = r.CreateOrUpdateResource(roleBinding) err := r.Client.Create(context.TODO(), roleBinding)
if err != nil && errors.IsAlreadyExists(err) {
continue
}
if err != nil { if err != nil {
return stackerr.WithStack(err) return stackerr.WithStack(err)
} }

5
pkg/configuration/base/reconcile_test.go
View File

@ -743,7 +743,6 @@ func TestEnsureExtraRBAC(t *testing.T) {
assert.Equal(t, jenkins.Spec.Roles[1], roleBindings.Items[2].RoleRef) assert.Equal(t, jenkins.Spec.Roles[1], roleBindings.Items[2].RoleRef)
}) })
t.Run("delete one extra", func(t *testing.T) { t.Run("delete one extra", func(t *testing.T) {
t.Skip() //FIXME
// given // given
fakeClient := fake.NewClientBuilder().Build() fakeClient := fake.NewClientBuilder().Build()
err := v1alpha2.SchemeBuilder.AddToScheme(scheme.Scheme) err := v1alpha2.SchemeBuilder.AddToScheme(scheme.Scheme)
@ -803,8 +802,8 @@ func TestEnsureExtraRBAC(t *testing.T) {
roleBindings, err := fetchAllRoleBindings(fakeClient) roleBindings, err := fetchAllRoleBindings(fakeClient)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 3, len(roleBindings.Items)) assert.Equal(t, 3, len(roleBindings.Items))
assert.Equal(t, metaObject.Name, roleBindings.Items[1].Name) assert.Equal(t, metaObject.Name, roleBindings.Items[0].Name)
assert.Equal(t, jenkins.Spec.Roles[0], roleBindings.Items[2].RoleRef) assert.Equal(t, jenkins.Spec.Roles[0], roleBindings.Items[1].RoleRef)
}) })
} }