Skip to content

Commit ca7825f

Browse files
author
yoobinshin
committed
remove service account check in vap
1 parent d7d6ab8 commit ca7825f

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

charts/member-agent-arc/templates/serviceaccount.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
apiVersion: v1
22
kind: ServiceAccount
33
metadata:
4-
# the name is also used in the managed resource validating admission webhook.
5-
# please make the change accordingly when you change the name.
64
name: fleet-member-agent-sa
75
namespace: fleet-system
86
labels:

pkg/webhook/managedresource/validatingadmissionpolicy.go

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,9 @@ func mutateValidatingAdmissionPolicy(vap *admv1.ValidatingAdmissionPolicy) {
5454
Validations: []admv1.Validation{
5555
{
5656
Expression: `
57-
(
58-
(
59-
request.userInfo.username == "aksService" ||
60-
request.userInfo.username == "acsService" ||
61-
request.userInfo.username == "fleet-member-agent-sa"
62-
)
63-
&&
64-
(
65-
"system:masters" in request.userInfo.groups ||
66-
"system:serviceaccounts:kube-system" in request.userInfo.groups ||
67-
"system:serviceaccounts:fleet-system" in request.userInfo.groups
68-
)
69-
)
70-
||
71-
(
72-
"system:serviceaccounts:openshift-infra" in request.userInfo.groups
73-
)`,
57+
"system:masters" in request.userInfo.groups || "system:serviceaccounts:kube-system" in request.userInfo.groups ||
58+
"system:serviceaccounts:fleet-system" in request.userInfo.groups ||
59+
"system:serviceaccounts:openshift-infra" in request.userInfo.groups`,
7460
Message: "Create, Update, or Delete operations on ARM managed resources is forbidden",
7561
Reason: &forbidden,
7662
},

0 commit comments

Comments
 (0)