Skip to content
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
22 changes: 22 additions & 0 deletions assets/common/sidecars/host_network_livenessprobe.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This sidecar is injected to DaemonSet
spec:
template:
spec:
containers:
- name: csi-liveness-probe
image: ${LIVENESS_PROBE_IMAGE}
imagePullPolicy: IfNotPresent
terminationMessagePolicy: FallbackToLogsOnError
args:
- --csi-address=/csi/csi.sock
- --http-endpoint=127.0.0.1:${LIVENESS_PROBE_PORT}
- --v=${LOG_LEVEL}
# Empty env. instead of nil for json patch to append new env. vars there
env: []
volumeMounts:
- name: socket-dir
mountPath: /csi
resources:
requests:
memory: 50Mi
cpu: 10m
3 changes: 2 additions & 1 deletion assets/common/sidecars/node_driver_registrar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
args:
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/${DRIVER_NAME}/csi.sock
- --http-endpoint=:${NODE_DRIVER_REGISTRAR_HEALTH_PORT}
- --http-endpoint=127.0.0.1:${NODE_DRIVER_REGISTRAR_HEALTH_PORT}
- --v=${LOG_LEVEL}
# Empty env. instead of nil for json patch to append new env. vars there
env: []
Expand All @@ -31,6 +31,7 @@ spec:
protocol: TCP
livenessProbe:
httpGet:
host: 127.0.0.1
path: /healthz
port: rhealthz
initialDelaySeconds: 10
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This sidecar is injected both to Deployment and DaemonSet
# This sidecar is injected to Deployment
spec:
template:
spec:
Expand Down
6 changes: 3 additions & 3 deletions assets/overlays/aws-ebs/generated/hypershift/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
# snapshotter.yaml: Added arguments [--extra-create-metadata --kube-api-qps=20 --kube-api-burst=100 --worker-threads=100]
# snapshotter.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
# Applied strategic merge patch snapshotter.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# pod_network_livenessprobe.yaml: Loaded from common/sidecars/pod_network_livenessprobe.yaml
# pod_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch pod_network_livenessprobe.yaml
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
# Applied strategic merge patch overlays/aws-ebs/patches/controller_add_hypershift_controller_minter.yaml
#
Expand Down
12 changes: 7 additions & 5 deletions assets/overlays/aws-ebs/generated/hypershift/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Applied strategic merge patch overlays/aws-ebs/patches/node_add_driver.yaml
# node_driver_registrar.yaml: Loaded from common/sidecars/node_driver_registrar.yaml
# Applied strategic merge patch node_driver_registrar.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# host_network_livenessprobe.yaml: Loaded from common/sidecars/host_network_livenessprobe.yaml
# host_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch host_network_livenessprobe.yaml
#
#

Expand Down Expand Up @@ -46,6 +46,7 @@ spec:
livenessProbe:
failureThreshold: 5
httpGet:
host: 127.0.0.1
path: /healthz
port: healthz
initialDelaySeconds: 10
Expand Down Expand Up @@ -78,7 +79,7 @@ spec:
- args:
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
- --http-endpoint=:10309
- --http-endpoint=127.0.0.1:10309
- --v=${LOG_LEVEL}
env: []
image: ${NODE_DRIVER_REGISTRAR_IMAGE}
Expand All @@ -93,6 +94,7 @@ spec:
livenessProbe:
failureThreshold: 5
httpGet:
host: 127.0.0.1
path: /healthz
port: rhealthz
initialDelaySeconds: 10
Expand All @@ -117,7 +119,7 @@ spec:
name: registration-dir
- args:
- --csi-address=/csi/csi.sock
- --health-port=10300
- --http-endpoint=127.0.0.1:10300
- --v=${LOG_LEVEL}
- --probe-timeout=3s
env: []
Expand Down
6 changes: 3 additions & 3 deletions assets/overlays/aws-ebs/generated/standalone/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
# snapshotter.yaml: Loaded from common/sidecars/snapshotter.yaml
# snapshotter.yaml: Added arguments [--extra-create-metadata --kube-api-qps=20 --kube-api-burst=100 --worker-threads=100]
# Applied strategic merge patch snapshotter.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# pod_network_livenessprobe.yaml: Loaded from common/sidecars/pod_network_livenessprobe.yaml
# pod_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch pod_network_livenessprobe.yaml
# Applied strategic merge patch common/standalone/controller_add_affinity.yaml
#
#
Expand Down
12 changes: 7 additions & 5 deletions assets/overlays/aws-ebs/generated/standalone/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Applied strategic merge patch overlays/aws-ebs/patches/node_add_driver.yaml
# node_driver_registrar.yaml: Loaded from common/sidecars/node_driver_registrar.yaml
# Applied strategic merge patch node_driver_registrar.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# host_network_livenessprobe.yaml: Loaded from common/sidecars/host_network_livenessprobe.yaml
# host_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch host_network_livenessprobe.yaml
#
#

Expand Down Expand Up @@ -46,6 +46,7 @@ spec:
livenessProbe:
failureThreshold: 5
httpGet:
host: 127.0.0.1
path: /healthz
port: healthz
initialDelaySeconds: 10
Expand Down Expand Up @@ -78,7 +79,7 @@ spec:
- args:
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
- --http-endpoint=:10309
- --http-endpoint=127.0.0.1:10309
- --v=${LOG_LEVEL}
env: []
image: ${NODE_DRIVER_REGISTRAR_IMAGE}
Expand All @@ -93,6 +94,7 @@ spec:
livenessProbe:
failureThreshold: 5
httpGet:
host: 127.0.0.1
path: /healthz
port: rhealthz
initialDelaySeconds: 10
Expand All @@ -117,7 +119,7 @@ spec:
name: registration-dir
- args:
- --csi-address=/csi/csi.sock
- --health-port=10300
- --http-endpoint=127.0.0.1:10300
- --v=${LOG_LEVEL}
- --probe-timeout=3s
env: []
Expand Down
1 change: 1 addition & 0 deletions assets/overlays/aws-ebs/patches/node_add_driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ spec:
protocol: TCP
livenessProbe:
httpGet:
host: 127.0.0.1
path: /healthz
port: healthz
initialDelaySeconds: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
# snapshotter.yaml: Added arguments [--timeout=600s]
# snapshotter.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
# Applied strategic merge patch snapshotter.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# pod_network_livenessprobe.yaml: Loaded from common/sidecars/pod_network_livenessprobe.yaml
# pod_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch pod_network_livenessprobe.yaml
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
# Applied strategic merge patch overlays/azure-disk/patches/controller_add_hypershift_controller.yaml
#
Expand Down
12 changes: 7 additions & 5 deletions assets/overlays/azure-disk/generated/hypershift/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Applied strategic merge patch overlays/azure-disk/patches/node_add_driver.yaml
# node_driver_registrar.yaml: Loaded from common/sidecars/node_driver_registrar.yaml
# Applied strategic merge patch node_driver_registrar.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# host_network_livenessprobe.yaml: Loaded from common/sidecars/host_network_livenessprobe.yaml
# host_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch host_network_livenessprobe.yaml
#
#

Expand Down Expand Up @@ -55,6 +55,7 @@ spec:
livenessProbe:
failureThreshold: 5
httpGet:
host: 127.0.0.1
path: /healthz
port: healthz
initialDelaySeconds: 10
Expand Down Expand Up @@ -94,7 +95,7 @@ spec:
- args:
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/disk.csi.azure.com/csi.sock
- --http-endpoint=:10304
- --http-endpoint=127.0.0.1:10304
- --v=${LOG_LEVEL}
env: []
image: ${NODE_DRIVER_REGISTRAR_IMAGE}
Expand All @@ -109,6 +110,7 @@ spec:
livenessProbe:
failureThreshold: 5
httpGet:
host: 127.0.0.1
path: /healthz
port: rhealthz
initialDelaySeconds: 10
Expand All @@ -133,7 +135,7 @@ spec:
name: registration-dir
- args:
- --csi-address=/csi/csi.sock
- --health-port=10300
- --http-endpoint=127.0.0.1:10300
- --v=${LOG_LEVEL}
- --probe-timeout=3s
env: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
# snapshotter.yaml: Loaded from common/sidecars/snapshotter.yaml
# snapshotter.yaml: Added arguments [--timeout=600s]
# Applied strategic merge patch snapshotter.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# pod_network_livenessprobe.yaml: Loaded from common/sidecars/pod_network_livenessprobe.yaml
# pod_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch pod_network_livenessprobe.yaml
# Applied strategic merge patch common/standalone/controller_add_affinity.yaml
# Applied strategic merge patch overlays/azure-disk/patches/controller_add_standalone_injector.yaml
#
Expand Down
12 changes: 7 additions & 5 deletions assets/overlays/azure-disk/generated/standalone/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Applied strategic merge patch overlays/azure-disk/patches/node_add_driver.yaml
# node_driver_registrar.yaml: Loaded from common/sidecars/node_driver_registrar.yaml
# Applied strategic merge patch node_driver_registrar.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# host_network_livenessprobe.yaml: Loaded from common/sidecars/host_network_livenessprobe.yaml
# host_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch host_network_livenessprobe.yaml
#
#

Expand Down Expand Up @@ -55,6 +55,7 @@ spec:
livenessProbe:
failureThreshold: 5
httpGet:
host: 127.0.0.1
path: /healthz
port: healthz
initialDelaySeconds: 10
Expand Down Expand Up @@ -94,7 +95,7 @@ spec:
- args:
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/disk.csi.azure.com/csi.sock
- --http-endpoint=:10304
- --http-endpoint=127.0.0.1:10304
- --v=${LOG_LEVEL}
env: []
image: ${NODE_DRIVER_REGISTRAR_IMAGE}
Expand All @@ -109,6 +110,7 @@ spec:
livenessProbe:
failureThreshold: 5
httpGet:
host: 127.0.0.1
path: /healthz
port: rhealthz
initialDelaySeconds: 10
Expand All @@ -133,7 +135,7 @@ spec:
name: registration-dir
- args:
- --csi-address=/csi/csi.sock
- --health-port=10300
- --http-endpoint=127.0.0.1:10300
- --v=${LOG_LEVEL}
- --probe-timeout=3s
env: []
Expand Down
1 change: 1 addition & 0 deletions assets/overlays/azure-disk/patches/node_add_driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ spec:
protocol: TCP
livenessProbe:
httpGet:
host: 127.0.0.1
path: /healthz
port: healthz
initialDelaySeconds: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
# resizer.yaml: Added arguments [--timeout=120s -handle-volume-inuse-error=false]
# resizer.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
# Applied strategic merge patch resizer.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# pod_network_livenessprobe.yaml: Loaded from common/sidecars/pod_network_livenessprobe.yaml
# pod_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch pod_network_livenessprobe.yaml
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
# Applied strategic merge patch overlays/azure-file/patches/controller_add_hypershift_controller.yaml
# Applied JSON patch overlays/azure-file/patches/controller_add_driver_kubeconfig_hypershift.yaml.patch
Expand Down
12 changes: 7 additions & 5 deletions assets/overlays/azure-file/generated/hypershift/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Applied strategic merge patch overlays/azure-file/patches/node_add_driver.yaml
# node_driver_registrar.yaml: Loaded from common/sidecars/node_driver_registrar.yaml
# Applied strategic merge patch node_driver_registrar.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# host_network_livenessprobe.yaml: Loaded from common/sidecars/host_network_livenessprobe.yaml
# host_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch host_network_livenessprobe.yaml
#
#

Expand Down Expand Up @@ -55,6 +55,7 @@ spec:
livenessProbe:
failureThreshold: 5
httpGet:
host: 127.0.0.1
path: /healthz
port: healthz
initialDelaySeconds: 10
Expand Down Expand Up @@ -97,7 +98,7 @@ spec:
- args:
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/file.csi.azure.com/csi.sock
- --http-endpoint=:10305
- --http-endpoint=127.0.0.1:10305
- --v=${LOG_LEVEL}
env: []
image: ${NODE_DRIVER_REGISTRAR_IMAGE}
Expand All @@ -112,6 +113,7 @@ spec:
livenessProbe:
failureThreshold: 5
httpGet:
host: 127.0.0.1
path: /healthz
port: rhealthz
initialDelaySeconds: 10
Expand All @@ -136,7 +138,7 @@ spec:
name: registration-dir
- args:
- --csi-address=/csi/csi.sock
- --health-port=10302
- --http-endpoint=127.0.0.1:10302
- --v=${LOG_LEVEL}
- --probe-timeout=3s
env: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
# resizer.yaml: Loaded from common/sidecars/resizer.yaml
# resizer.yaml: Added arguments [--timeout=120s -handle-volume-inuse-error=false]
# Applied strategic merge patch resizer.yaml
# livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
# livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch livenessprobe.yaml
# pod_network_livenessprobe.yaml: Loaded from common/sidecars/pod_network_livenessprobe.yaml
# pod_network_livenessprobe.yaml: Added arguments [--probe-timeout=3s]
# Applied strategic merge patch pod_network_livenessprobe.yaml
# Applied strategic merge patch common/standalone/controller_add_affinity.yaml
# Applied strategic merge patch overlays/azure-file/patches/controller_add_standalone_injector.yaml
#
Expand Down
Loading