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

Automated cherry pick of #14913: Run pods needing control-plane instance credentials on #14977

Merged
merged 2 commits into from
Jan 11, 2023
Merged

Automated cherry pick of #14913: Run pods needing control-plane instance credentials on #14977

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
d81a8c0
Run pods needing control-plane instance credentials on hostNetwork
johngmyers Dec 30, 2022
77b38c3
hack/update-expected.sh
johngmyers Dec 30, 2022
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 pkg/wellknownports/wellknownports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ const (
// VxlanUDP is the port used by VXLAN tunneling over UDP
VxlanUDP = 8472

// AWSLBCMetricsPort is reserved for the AWS Load Balancer Controller's metrics.
AWSLBCMetricsPort = 9442

// KubeletAPI is the port where kubelet listens
KubeletAPI = 10250
)
Expand Down
1 change: 1 addition & 0 deletions ...ct_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,7 @@ spec:
volumeMounts:
- mountPath: /csi
name: socket-dir
hostNetwork: true
nodeSelector: null
priorityClassName: system-cluster-critical
securityContext:
Expand Down
2 changes: 1 addition & 1 deletion ...ditionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 64414a2b8163562183ef068994437ef7fc2e3936584fe54f7fa02bb6a63ce15f
manifestHash: 2a49d984a617f44269a004a4c28bd01001d36503ebf700b7da576e7e23e36ad4
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
1 change: 1 addition & 0 deletions ...ws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,7 @@ spec:
volumeMounts:
- mountPath: /csi
name: socket-dir
hostNetwork: true
nodeSelector: null
priorityClassName: system-cluster-critical
securityContext:
Expand Down
2 changes: 1 addition & 1 deletion ...te_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 262f38da3fe01a66c87163d666a2075af2ec1bb71e0228c7e7243627f3879d76
manifestHash: 80a04c96830e1279702d4cdf8004416edc2020f7ada484e5213693962c0ade91
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
6 changes: 6 additions & 0 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,10 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: aws-load-balancer-controller
strategy:
rollingUpdate:
maxSurge: 0
type: RollingUpdate
template:
metadata:
creationTimestamp: null
Expand All @@ -882,6 +886,7 @@ spec:
operator: Exists
containers:
- args:
- --metrics-bind-addr=:9442
- --cluster-name=minimal.example.com
- --enable-waf=false
- --enable-wafv2=false
Expand Down Expand Up @@ -928,6 +933,7 @@ spec:
- mountPath: /var/run/secrets/amazonaws.com/
name: token-amazonaws-com
readOnly: true
hostNetwork: true
priorityClassName: system-cluster-critical
securityContext:
fsGroup: 1337
Expand Down
2 changes: 1 addition & 1 deletion ...cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: 19ea2082a06998052ce085e25c25a2434d0d284a73c8dcb908744727b84c8deb
manifestHash: 128ba6473f6219d65e2a6e5fbcebf936824233d97892ea35c9a01c131b9468d4
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
1 change: 1 addition & 0 deletions ...ws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,7 @@ spec:
volumeMounts:
- mountPath: /csi
name: socket-dir
hostNetwork: true
nodeSelector: null
priorityClassName: system-cluster-critical
securityContext:
Expand Down
2 changes: 1 addition & 1 deletion ...on/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: af71ca6cd4d1d35cb99d115d9927bf7d21d2c696a8e5eb9c52171b8d1cf1c199
manifestHash: fd6cc943dc2ba24bec47f174bce0637bce830d61201e648bcd418baad509a675
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
6 changes: 6 additions & 0 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,10 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: aws-load-balancer-controller
strategy:
rollingUpdate:
maxSurge: 0
type: RollingUpdate
template:
metadata:
creationTimestamp: null
Expand All @@ -882,6 +886,7 @@ spec:
operator: Exists
containers:
- args:
- --metrics-bind-addr=:9442
- --cluster-name=minimal.example.com
- --enable-waf=false
- --enable-wafv2=false
Expand Down Expand Up @@ -928,6 +933,7 @@ spec:
- mountPath: /var/run/secrets/amazonaws.com/
name: token-amazonaws-com
readOnly: true
hostNetwork: true
priorityClassName: system-cluster-critical
securityContext:
fsGroup: 1337
Expand Down
4 changes: 2 additions & 2 deletions ...ster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: 9354cc2e3ac54edabf28bbee0ae8ea0ad4fd75a7c42da735beb21239402312d2
manifestHash: 14ff6e566464f1d0594df6202d79ccb9cbdb597e0475f296ab56e6cb0573c9de
name: cluster-autoscaler.addons.k8s.io
selector:
k8s-addon: cluster-autoscaler.addons.k8s.io
Expand Down Expand Up @@ -163,7 +163,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: 19ea2082a06998052ce085e25c25a2434d0d284a73c8dcb908744727b84c8deb
manifestHash: 128ba6473f6219d65e2a6e5fbcebf936824233d97892ea35c9a01c131b9468d4
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
4 changes: 4 additions & 0 deletions ...ws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ spec:
selector:
matchLabels:
app: cluster-autoscaler
strategy:
rollingUpdate:
maxSurge: 0
type: RollingUpdate
template:
metadata:
annotations:
Expand Down
6 changes: 6 additions & 0 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,10 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: aws-load-balancer-controller
strategy:
rollingUpdate:
maxSurge: 0
type: RollingUpdate
template:
metadata:
creationTimestamp: null
Expand All @@ -882,6 +886,7 @@ spec:
operator: Exists
containers:
- args:
- --metrics-bind-addr=:9442
- --cluster-name=minimal.example.com
- --enable-waf=false
- --enable-wafv2=false
Expand Down Expand Up @@ -928,6 +933,7 @@ spec:
- mountPath: /var/run/secrets/amazonaws.com/
name: token-amazonaws-com
readOnly: true
hostNetwork: true
priorityClassName: system-cluster-critical
securityContext:
fsGroup: 1337
Expand Down
4 changes: 2 additions & 2 deletions ...er/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
version: 9.99.0
- id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: 882f5927c098b3c7bd5837f7db3adde4a7e2d98e3cef924c91c9d5211d6cbbbc
manifestHash: d8e860b6e887d2e05b326668f6961d6b05f6d05808c2427364adc593ae699087
name: cluster-autoscaler.addons.k8s.io
selector:
k8s-addon: cluster-autoscaler.addons.k8s.io
Expand Down Expand Up @@ -170,7 +170,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: 615a3bf4083d8d907e99738f5eb1cddafd5fae8c42b5cf02fcd574447bdc846b
manifestHash: 11496be318917da3ff3ebcc92709c83ae4ba795eb21692f8cb896ba9505588a3
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
4 changes: 4 additions & 0 deletions ...ws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ spec:
selector:
matchLabels:
app: cluster-autoscaler
strategy:
rollingUpdate:
maxSurge: 0
type: RollingUpdate
template:
metadata:
annotations:
Expand Down
1 change: 1 addition & 0 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,7 @@ spec:
spec:
containers:
- args:
- --metrics-bind-addr=:9442
- --cluster-name=minimal.example.com
- --enable-waf=false
- --enable-wafv2=false
Expand Down
2 changes: 1 addition & 1 deletion ...er/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: da760fddf2cf54757b8715a92146a7ce5f332199b885bd9b308645180ea215e1
manifestHash: ee9b625b6f7b60088c907e96e5d87bc391f5a35417723c3d9ce13684d3800be1
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
1 change: 1 addition & 0 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,7 @@ spec:
spec:
containers:
- args:
- --metrics-bind-addr=:9442
- --cluster-name=minimal.example.com
- --enable-waf=false
- --enable-wafv2=false
Expand Down
2 changes: 1 addition & 1 deletion ...er/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: da760fddf2cf54757b8715a92146a7ce5f332199b885bd9b308645180ea215e1
manifestHash: ee9b625b6f7b60088c907e96e5d87bc391f5a35417723c3d9ce13684d3800be1
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
1 change: 1 addition & 0 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,7 @@ spec:
spec:
containers:
- args:
- --metrics-bind-addr=:9442
- --cluster-name=minimal.example.com
- --enable-waf=false
- --enable-wafv2=false
Expand Down
2 changes: 1 addition & 1 deletion ...er/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: da760fddf2cf54757b8715a92146a7ce5f332199b885bd9b308645180ea215e1
manifestHash: ee9b625b6f7b60088c907e96e5d87bc391f5a35417723c3d9ce13684d3800be1
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
1 change: 1 addition & 0 deletions ...ws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,7 @@ spec:
volumeMounts:
- mountPath: /csi
name: socket-dir
hostNetwork: true
nodeSelector: null
priorityClassName: system-cluster-critical
securityContext:
Expand Down
6 changes: 6 additions & 0 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,10 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: aws-load-balancer-controller
strategy:
rollingUpdate:
maxSurge: 0
type: RollingUpdate
template:
metadata:
creationTimestamp: null
Expand All @@ -882,6 +886,7 @@ spec:
operator: Exists
containers:
- args:
- --metrics-bind-addr=:9442
- --cluster-name=minimal.example.com
- --enable-waf=false
- --enable-wafv2=false
Expand Down Expand Up @@ -921,6 +926,7 @@ spec:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
readOnly: true
hostNetwork: true
nodeSelector: null
priorityClassName: system-cluster-critical
securityContext:
Expand Down
6 changes: 3 additions & 3 deletions ...e_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: 552dda0544378cb79b23b1f1cf567ba8a4e0e27f8e57b88bf01e9cebfd23bbca
manifestHash: f3df55330e506169e95b27c4acb50ccca37a132ea2323140ad2a965744a1bd54
name: cluster-autoscaler.addons.k8s.io
selector:
k8s-addon: cluster-autoscaler.addons.k8s.io
Expand Down Expand Up @@ -163,7 +163,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: b2689c2b0412fca98856b0a86b757233c89b6fd65e45d3770f6ea2cc1e6bc710
manifestHash: e58dc5f13ee01476bc1065b548defa80f0d6d3de81c4d2fa3986dd527e8e0d60
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down Expand Up @@ -193,7 +193,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: fcb6af5a121001922027da4bb5d3c67059a4ad1c9320703db35deb7e29d3af44
manifestHash: e6294e96007ef7c79192f0c68131974a2dddb9297d9bbf7d17cc615e120067f6
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
5 changes: 5 additions & 0 deletions ...ws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ spec:
selector:
matchLabels:
app: cluster-autoscaler
strategy:
rollingUpdate:
maxSurge: 0
type: RollingUpdate
template:
metadata:
annotations:
Expand Down Expand Up @@ -363,6 +367,7 @@ spec:
cpu: 100m
memory: 300Mi
dnsPolicy: ClusterFirst
hostNetwork: true
nodeSelector: null
priorityClassName: system-cluster-critical
serviceAccountName: cluster-autoscaler
Expand Down
2 changes: 1 addition & 1 deletion ...e_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: c4b9cdc4f3dc1724be5ea9e62abe442ec7afc53a64d290924b13f9ccdea95551
manifestHash: 29e89f0ab283dcfc85a07b59c452341475cd3aa88644eb1249a08d95a6038f94
name: cluster-autoscaler.addons.k8s.io
selector:
k8s-addon: cluster-autoscaler.addons.k8s.io
Expand Down
5 changes: 5 additions & 0 deletions ...ws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ spec:
selector:
matchLabels:
app: cluster-autoscaler
strategy:
rollingUpdate:
maxSurge: 0
type: RollingUpdate
template:
metadata:
annotations:
Expand Down Expand Up @@ -359,6 +363,7 @@ spec:
cpu: 100m
memory: 300Mi
dnsPolicy: ClusterFirst
hostNetwork: true
nodeSelector: null
priorityClassName: system-cluster-critical
serviceAccountName: cluster-autoscaler
Expand Down
1 change: 1 addition & 0 deletions ...ws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,7 @@ spec:
volumeMounts:
- mountPath: /csi
name: socket-dir
hostNetwork: true
nodeSelector: null
priorityClassName: system-cluster-critical
securityContext:
Expand Down
Loading