Skip to content

feat: disable automountServiceAccountToken for proxy and ratelimit #6364

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

Merged
arkodg merged 2 commits into from
Jun 23, 2025
Merged

feat: disable automountServiceAccountToken for proxy and ratelimit #6364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af87928
feat: disable automountServiceAccountToken for proxy and ratelimit
JefeDavis Jun 20, 2025
2d3c3f3
Merge branch 'main' into disable-automountServiceAccountToken
JefeDavis Jun 23, 2025
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 internal/infrastructure/kubernetes/proxy/resource_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ func (r *ResourceRender) ServiceAccount() (*corev1.ServiceAccount, error) {
Kind: "ServiceAccount",
APIVersion: "v1",
},
AutomountServiceAccountToken: ptr.To(false),
Copy link
Copy Markdown
Member

@cnvergence cnvergence Jun 23, 2025

Choose a reason for hiding this comment

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

thanks for including this in SA as well

ObjectMeta: metav1.ObjectMeta{
Namespace: r.Namespace(),
Name: r.Name(),
Expand Down Expand Up @@ -389,6 +390,7 @@ func (r *ResourceRender) Deployment() (*appsv1.Deployment, error) {
Annotations: podAnnotations,
},
Spec: corev1.PodSpec{
AutomountServiceAccountToken: ptr.To(false),
Containers: containers,
InitContainers: deploymentConfig.InitContainers,
ServiceAccountName: r.Name(),
Expand Down Expand Up @@ -627,6 +629,7 @@ func (r *ResourceRender) getPodSpec(
proxyConfig *egv1a1.EnvoyProxy,
) corev1.PodSpec {
return corev1.PodSpec{
AutomountServiceAccountToken: ptr.To(false),
Containers: containers,
InitContainers: initContainers,
ServiceAccountName: r.Name(),
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-namespace: ns1
gateway.networking.k8s.io/gateway-name: gateway-1
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster ns1/gateway-1
Expand Down
1 change: 1 addition & 0 deletions .../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ spec:
label1: value1-override
label2: value2
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions ...infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions ...rnal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-namespace: ns1
gateway.networking.k8s.io/gateway-name: gateway-1
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster ns1/gateway-1
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions ...infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ spec:
label1: value1-override
label2: value2
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
1 change: 1 addition & 0 deletions ...nfrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-name: default
gateway.envoyproxy.io/owning-gateway-namespace: default
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster default
Expand Down
2 changes: 2 additions & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-namespace: namespace-1
gateway.networking.k8s.io/gateway-name: gateway-1
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster namespace-1/gateway-1
Expand Down Expand Up @@ -457,6 +458,7 @@ spec:
gateway.envoyproxy.io/owning-gateway-namespace: namespace-2
gateway.networking.k8s.io/gateway-name: gateway-2
spec:
automountServiceAccountToken: false
containers:
- args:
- --service-cluster namespace-2/gateway-2
Expand Down
2 changes: 2 additions & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apiVersion: v1
automountServiceAccountToken: false
kind: ServiceAccount
metadata:
creationTimestamp: null
Expand All @@ -18,6 +19,7 @@ metadata:
uid: test-owner-reference-uid-for-gateway
---
apiVersion: v1
automountServiceAccountToken: false
kind: ServiceAccount
metadata:
creationTimestamp: null
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/serviceaccount/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apiVersion: v1
automountServiceAccountToken: false
kind: ServiceAccount
metadata:
creationTimestamp: null
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/serviceaccount/gateway-namespace-mode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apiVersion: v1
automountServiceAccountToken: false
kind: ServiceAccount
metadata:
creationTimestamp: null
Expand Down
1 change: 1 addition & 0 deletions internal/infrastructure/kubernetes/proxy/testdata/serviceaccount/with-annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apiVersion: v1
automountServiceAccountToken: false
kind: ServiceAccount
metadata:
annotations:
Expand Down
Loading