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.

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

Use port 9811 for EBS CSI controller healthcheck #16967

Merged
merged 2 commits into from
Nov 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: a5b98b0e1567802e86a0acdf40915643d41f06db609e2f66a702b0cb3e2deb5f
manifestHash: ab4a6f82af9ce89cfc4458d0da29e42b2fbe13b5be0515af0f27dd1256bb7b56
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974
manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1084,7 +1084,7 @@ spec:
readOnly: true
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
env:
- name: AWS_ROLE_ARN
value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 708673cced95a78d0fe1558035c0ecf42831c03909f5a5c87260b9a3152ba812
manifestHash: 3b0df2d544873a0453d87b9a197830fba310cb73cbd09f367fad7db6161e9e34
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 29e5d90b768b96358405830bfddefcbeb5021a5f61a9f5d7337a3ca9958c4e43
manifestHash: 175814ab70587812d227ab0fa84fea60598ca86bbb1b6b916132dcf9558bdedc
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 39cef94908b236f6655a56e658a5c8ce7482e02a8f467f12889798838b7d9997
manifestHash: 618a57463c43b385b746a8d9cfa66606143d675750baa52e587e442785f3d77d
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 67fe4767a73c3d6991847705e6a4e108b845598a4e866b9c54a43cdd18ea6680
manifestHash: 916c40c65c8dd2498d7976c60a90f86812ae553164515bd151ffe4462f9dbe42
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 17fd795c56753c4281d8df073380a638403e4aee10fd68dada5c356bf9488264
manifestHash: bfc948340e56cecb10d825d217ee9b614a9fdb37c54d9dde7eef6177fc04dccd
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 698ef91047a24ebef2e35f01dc5da5cb8e0c066c956b7bc3da03b8b1b0916d34
manifestHash: 69447c3e0d8cfe291773dfa3baeae28731448de5b6b236b0deb9b1144bc4b845
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: b32426417f7de6a078379f6552c9c3a07a196f62a9b5452bafd8d0d476abe14a
manifestHash: fc81153cec28c58bb1db488b9f8d683591d660eaff2c7075f018c963e21a4bda
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: b32426417f7de6a078379f6552c9c3a07a196f62a9b5452bafd8d0d476abe14a
manifestHash: fc81153cec28c58bb1db488b9f8d683591d660eaff2c7075f018c963e21a4bda
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 4c9851cc0526e3121d831d8bdd93b40a84492b409f39e736baf902cfd49097c7
manifestHash: d10948a715a668965ad7e82fdebf5541188b2407493f2d7efb72da48224badb8
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 5b97f53fb8cad34434eb9dd2c7b280c2e7d8e339dfeeaa9e146870bdfc9d9fe5
manifestHash: 6174190a8dbb2f3efcb49a4cb99504f5b328d179b1a7970e89d1650fc2b5da86
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 89800bddb7b4cd673ccbb612a77c55ac8e41b5c84717adb634e42372c11384c4
manifestHash: e7c3df47bf5ff90f86348c6598fb84ea03bc94719bb0adaa123e72807ee3ac5e
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1053,7 +1053,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10
imagePullPolicy: IfNotPresent
name: liveness-probe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974
manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ spec:
timeoutSeconds: 3
name: ebs-plugin
ports:
- containerPort: 9809
- containerPort: 9811
name: healthz
protocol: TCP
- containerPort: 3301
Expand Down Expand Up @@ -1084,7 +1084,7 @@ spec:
readOnly: true
- args:
- --csi-address=/csi/csi.sock
- --http-endpoint=0.0.0.0:9809
- --http-endpoint=0.0.0.0:9811
env:
- name: AWS_ROLE_ARN
value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com
Expand Down
Loading
Loading