Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Grant namespace list to global operators #764

Merged
merged 3 commits into from
Mar 19, 2019
Merged

Grant namespace list to global operators #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44a7ea9
test(e2e): add failing e2e test for operators in global operatorgroups
ecordell Mar 18, 2019
8f79e2e
feat(operatorgroup): operators in operatorgroups that select all
ecordell Mar 19, 2019
aca9bfb
fix(build): add some minor support for building locally with kind
ecordell Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ container:
clean-e2e:
kubectl delete crds --all
kubectl delete apiservices.apiregistration.k8s.io v1alpha1.packages.apps.redhat.com || true
for i in {1..40}; do kubectl delete namespace "ns-$i" || true; done
kubectl delete -f test/e2e/resources/0000_50_olm_00-namespace.yaml

clean:
Expand Down
12 changes: 10 additions & 2 deletions pkg/controller/operators/olm/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3362,7 +3362,11 @@ func TestSyncOperatorGroups(t *testing.T) {
"olm.owner.kind": "ClusterServiceVersion",
},
},
Rules: permissions[0].Rules,
Rules: append(permissions[0].Rules, rbacv1.PolicyRule{
Verbs: ViewVerbs,
APIGroups: []string{corev1.GroupName},
Resources: []string{"namespaces"},
}),
},
&rbacv1.ClusterRoleBinding{
TypeMeta: metav1.TypeMeta{
Expand Down Expand Up @@ -3475,7 +3479,11 @@ func TestSyncOperatorGroups(t *testing.T) {
"olm.owner.kind": "ClusterServiceVersion",
},
},
Rules: permissions[0].Rules,
Rules: append(permissions[0].Rules, rbacv1.PolicyRule{
Verbs: ViewVerbs,
APIGroups: []string{corev1.GroupName},
Resources: []string{"namespaces"},
}),
},
&rbacv1.ClusterRoleBinding{
TypeMeta: metav1.TypeMeta{
Expand Down
6 changes: 5 additions & 1 deletion pkg/controller/operators/olm/operatorgroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,11 @@ func (a *Operator) ensureSingletonRBAC(operatorNamespace string, csv *v1alpha1.C
Name: r.GetName(),
Labels: r.GetLabels(),
},
Rules: r.Rules,
Rules: append(r.Rules, rbacv1.PolicyRule{
Verbs: ViewVerbs,
APIGroups: []string{corev1.GroupName},
Resources: []string{"namespaces"},
}),
}
if _, err := a.OpClient.CreateClusterRole(clusterRole); err != nil {
return err
Expand Down
8 changes: 4 additions & 4 deletions scripts/build_local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ docker build -f upstream.Dockerfile .
docker tag $(docker images --filter 'label=stage=olm' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/operator-framework/olm:local
docker tag $(docker images --filter 'label=stage=builder' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/operator-framework/olm-e2e:local

for i in {1..40}
do
kubectl create namespace "ns-$i" || true
done
if [ -x "$(command -v kind)" ]; then
kind load docker-image quay.io/operator-framework/olm:local
kind load docker-image quay.io/operator-framework/olm-e2e:local
fi
22 changes: 21 additions & 1 deletion test/e2e/operator_groups_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil"
"github.com/stretchr/testify/require"
appsv1 "k8s.io/api/apps/v1"
"k8s.io/api/authorization/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
Expand Down Expand Up @@ -1262,7 +1263,11 @@ func TestCSVCopyWatchingAllNamespaces(t *testing.T) {
}
return true, nil
})
require.EqualValues(t, role.Rules, fetchedRole.Rules)
require.EqualValues(t, append(role.Rules, rbacv1.PolicyRule{
Verbs: []string{"get", "list", "watch"},
APIGroups: []string{""},
Resources: []string{"namespaces"},
}), fetchedRole.Rules)
var fetchedRoleBinding *rbacv1.ClusterRoleBinding
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
fetchedRoleBinding, err = c.GetClusterRoleBinding(roleBinding.GetName())
Expand All @@ -1279,6 +1284,21 @@ func TestCSVCopyWatchingAllNamespaces(t *testing.T) {
require.EqualValues(t, "rbac.authorization.k8s.io", fetchedRoleBinding.RoleRef.APIGroup)
require.EqualValues(t, "ClusterRole", fetchedRoleBinding.RoleRef.Kind)

t.Log("ensure operator was granted namespace list permission")
res, err := c.KubernetesInterface().AuthorizationV1().SubjectAccessReviews().Create(&v1.SubjectAccessReview{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool!

Spec: v1.SubjectAccessReviewSpec{
User: "system:serviceaccount:" + opGroupNamespace + ":" + serviceAccountName,
ResourceAttributes: &v1.ResourceAttributes{
Group: corev1.GroupName,
Version: "v1",
Resource: "namespaces",
Verb: "list",
},
},
})
require.NoError(t, err)
require.True(t, res.Status.Allowed, "got %#v", res.Status)

t.Log("Waiting for operator namespace csv to have annotations")
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
fetchedCSV, fetchErr := crc.OperatorsV1alpha1().ClusterServiceVersions(opGroupNamespace).Get(csvName, metav1.GetOptions{})
Expand Down