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

Jump to bottom

Backport of NET-10871 Remove unnecessary resource permissions in connect-inject ClusterRole into release/1.4.x #4310

Merged
merged 1 commit into from
Sep 9, 2024
Merged

Backport of NET-10871 Remove unnecessary resource permissions in connect-inject ClusterRole into release/1.4.x #4310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .changelog/4307.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
connect-inject: remove unnecessary resource permissions from connect-inject ClusterRole
```
14 changes: 10 additions & 4 deletions charts/consul/templates/connect-inject-clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,21 @@ rules:
- update
- watch
{{- end }}
- apiGroups: [""]
resources: ["secrets", "serviceaccounts", "services"]
verbs:
- get
- list
- watch
- delete
- create
- update
- apiGroups: [ "" ]
resources: [ "secrets", "serviceaccounts", "endpoints", "services", "namespaces", "nodes" ]
resources: ["endpoints", "namespaces", "nodes"]
verbs:
- create
- get
- list
- watch
- delete
- update
- apiGroups: [ "rbac.authorization.k8s.io" ]
resources: [ "roles", "rolebindings" ]
verbs:
Expand Down
52 changes: 45 additions & 7 deletions charts/consul/test/unit/connect-inject-clusterrole.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ load _helpers
#--------------------------------------------------------------------
# rules

@test "connectInject/ClusterRole: sets get, list, and watch access to endpoints, services, namespaces and nodes in all api groups" {
@test "connectInject/ClusterRole: sets get, list, watch, delete, create, and update access to secrets, serviceaccounts and services in core api group" {
cd `chart_dir`
local object=$(helm template \
-s templates/connect-inject-clusterrole.yaml \
Expand All @@ -44,12 +44,50 @@ load _helpers
. | tee /dev/stderr |
yq -r '.rules[2]' | tee /dev/stderr)

local actual=$(echo $object | yq -r '.resources[| index("endpoints")' | tee /dev/stderr)
local actual=$(echo $object | yq -r '.resources[| index("secrets")' | tee /dev/stderr)
[ "${actual}" != null ]

local actual=$(echo $object | yq -r '.resources[| index("serviceaccounts")' | tee /dev/stderr)
[ "${actual}" != null ]

local actual=$(echo $object | yq -r '.resources[| index("services")' | tee /dev/stderr)
[ "${actual}" != null ]

local actual=$(echo $object | yq -r '.apiGroups[0]' | tee /dev/stderr)
[ "${actual}" = "" ]

local actual=$(echo $object | yq -r '.verbs | index("get")' | tee /dev/stderr)
[ "${actual}" != null ]

local actual=$(echo $object | yq -r '.verbs | index("list")' | tee /dev/stderr)
[ "${actual}" != null ]

local actual=$(echo $object | yq -r '.verbs | index("watch")' | tee /dev/stderr)
[ "${actual}" != null ]

local actual=$(echo $object | yq -r '.verbs | index("delete")' | tee /dev/stderr)
[ "${actual}" != null ]

local actual=$(echo $object | yq -r '.verbs | index("create")' | tee /dev/stderr)
[ "${actual}" != null ]

local actual=$(echo $object | yq -r '.verbs | index("update")' | tee /dev/stderr)
[ "${actual}" != null ]
}

@test "connectInject/ClusterRole: sets get, list, and watch access to endpoints, namespaces and nodes in core api group" {
cd `chart_dir`
local object=$(helm template \
-s templates/connect-inject-clusterrole.yaml \
--set 'global.enabled=false' \
--set 'client.enabled=true' \
--set 'connectInject.enabled=true' \
. | tee /dev/stderr |
yq -r '.rules[3]' | tee /dev/stderr)

local actual=$(echo $object | yq -r '.resources[| index("endpoints")' | tee /dev/stderr)
[ "${actual}" != null ]

local actual=$(echo $object | yq -r '.resources[| index("namespaces")' | tee /dev/stderr)
[ "${actual}" != null ]

Expand Down Expand Up @@ -77,7 +115,7 @@ load _helpers
--set 'client.enabled=true' \
--set 'connectInject.enabled=true' \
. | tee /dev/stderr |
yq -r '.rules[4]' | tee /dev/stderr)
yq -r '.rules[5]' | tee /dev/stderr)

local actual=$(echo $object | yq -r '.resources[| index("pods")' | tee /dev/stderr)
[ "${actual}" != null ]
Expand Down Expand Up @@ -106,7 +144,7 @@ load _helpers
--set 'client.enabled=true' \
--set 'connectInject.enabled=true' \
. | tee /dev/stderr |
yq -r '.rules[5]' | tee /dev/stderr)
yq -r '.rules[6]' | tee /dev/stderr)

local actual=$(echo $object | yq -r '.resources[| index("leases")' | tee /dev/stderr)
[ "${actual}" != null ]
Expand Down Expand Up @@ -197,7 +235,7 @@ load _helpers
--set 'global.secretsBackend.vault.consulServerRole=bar' \
--set 'global.secretsBackend.vault.consulCARole=test2' \
. | tee /dev/stderr |
yq -r '.rules[6]' | tee /dev/stderr)
yq -r '.rules[7]' | tee /dev/stderr)

local actual=$(echo $object | yq -r '.resources[0]' | tee /dev/stderr)
[ "${actual}" = "mutatingwebhookconfigurations" ]
Expand Down Expand Up @@ -227,7 +265,7 @@ load _helpers
-s templates/connect-inject-clusterrole.yaml \
--set 'global.openshift.enabled=true' \
. | tee /dev/stderr |
yq '.rules[13].resourceNames | index("restricted-v2")' | tee /dev/stderr)
yq '.rules[14].resourceNames | index("restricted-v2")' | tee /dev/stderr)
[ "${object}" == 0 ]
}

Expand All @@ -238,7 +276,7 @@ load _helpers
--set 'global.openshift.enabled=true' \
--set 'connectInject.apiGateway.managedGatewayClass.openshiftSCCName=fakescc' \
. | tee /dev/stderr |
yq '.rules[13].resourceNames | index("fakescc")' | tee /dev/stderr)
yq '.rules[14].resourceNames | index("fakescc")' | tee /dev/stderr)
[ "${object}" == 0 ]
}

Expand Down
Loading