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

Jump to bottom

OCPBUGS-26924: Add healthcheck for node-driver-registrar container #155

Merged
merged 3 commits into from
Feb 7, 2024
Merged

OCPBUGS-26924: Add healthcheck for node-driver-registrar container #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f5afd9
Add healthcheck for node-driver-registrar container
gnufied Feb 1, 2024
b82a4cb
Change the healtcheck port for azure-disk and aws-ebs to 10303
gnufied Feb 2, 2024
005e6d4
Change port for node registrar healthcheck
gnufied Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions assets/common/sidecars/node_driver_registrar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +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}
- --v=${LOG_LEVEL}
# Empty env. instead of nil for json patch to append new env. vars there
env: []
Expand All @@ -24,6 +25,18 @@ spec:
mountPath: /csi
- name: registration-dir
mountPath: /registration
ports:
- containerPort: ${NODE_DRIVER_REGISTRAR_HEALTH_PORT}
name: rhealthz
protocol: TCP
livenessProbe:
httpGet:
path: /healthz
port: rhealthz
initialDelaySeconds: 10
timeoutSeconds: 3
periodSeconds: 10
failureThreshold: 5
resources:
requests:
memory: 50Mi
Expand Down
13 changes: 13 additions & 0 deletions assets/overlays/aws-ebs/generated/hypershift/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ spec:
- args:
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
- --http-endpoint=:10304
- --v=${LOG_LEVEL}
env: []
image: ${NODE_DRIVER_REGISTRAR_IMAGE}
Expand All @@ -86,7 +87,19 @@ spec:
- /bin/sh
- -c
- rm -rf /registration/ebs.csi.aws.com-reg.sock /csi/csi.sock
livenessProbe:
failureThreshold: 5
httpGet:
path: /healthz
port: rhealthz
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: csi-node-driver-registrar
ports:
- containerPort: 10304
name: rhealthz
protocol: TCP
resources:
requests:
cpu: 10m
Expand Down
13 changes: 13 additions & 0 deletions assets/overlays/aws-ebs/generated/standalone/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ spec:
- args:
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
- --http-endpoint=:10304
- --v=${LOG_LEVEL}
env: []
image: ${NODE_DRIVER_REGISTRAR_IMAGE}
Expand All @@ -86,7 +87,19 @@ spec:
- /bin/sh
- -c
- rm -rf /registration/ebs.csi.aws.com-reg.sock /csi/csi.sock
livenessProbe:
failureThreshold: 5
httpGet:
path: /healthz
port: rhealthz
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: csi-node-driver-registrar
ports:
- containerPort: 10304
name: rhealthz
protocol: TCP
resources:
requests:
cpu: 10m
Expand Down
13 changes: 13 additions & 0 deletions assets/overlays/azure-disk/generated/hypershift/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ spec:
- args:
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/disk.csi.azure.com/csi.sock
- --http-endpoint=:10304
- --v=${LOG_LEVEL}
env: []
image: ${NODE_DRIVER_REGISTRAR_IMAGE}
Expand All @@ -103,7 +104,19 @@ spec:
- /bin/sh
- -c
- rm -rf /registration/disk.csi.azure.com-reg.sock /csi/csi.sock
livenessProbe:
failureThreshold: 5
httpGet:
path: /healthz
port: rhealthz
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: csi-node-driver-registrar
ports:
- containerPort: 10304
name: rhealthz
protocol: TCP
resources:
requests:
cpu: 10m
Expand Down
13 changes: 13 additions & 0 deletions assets/overlays/azure-disk/generated/standalone/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ spec:
- args:
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/disk.csi.azure.com/csi.sock
- --http-endpoint=:10304
- --v=${LOG_LEVEL}
env: []
image: ${NODE_DRIVER_REGISTRAR_IMAGE}
Expand All @@ -103,7 +104,19 @@ spec:
- /bin/sh
- -c
- rm -rf /registration/disk.csi.azure.com-reg.sock /csi/csi.sock
livenessProbe:
failureThreshold: 5
httpGet:
path: /healthz
port: rhealthz
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: csi-node-driver-registrar
ports:
- containerPort: 10304
name: rhealthz
protocol: TCP
resources:
requests:
cpu: 10m
Expand Down
2 changes: 2 additions & 0 deletions pkg/driver/aws-ebs/aws_ebs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ func GetAWSEBSGeneratorConfig() *generator.CSIDriverGeneratorConfig {
GuestConfig: &generator.GuestConfig{
DaemonSetTemplateAssetName: "overlays/aws-ebs/patches/node_add_driver.yaml",
LivenessProbePort: 10300,
// 10305 is used for healthcheck of efs-operator
NodeRegistrarHealthCheckPort: 10304,
Sidecars: []generator.SidecarConfig{
commongenerator.DefaultNodeDriverRegistrar,
commongenerator.DefaultLivenessProbe.WithExtraArguments(
Expand Down
2 changes: 2 additions & 0 deletions pkg/driver/azure-disk/azure_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ func GetAzureDiskGeneratorConfig() *generator.CSIDriverGeneratorConfig {
GuestConfig: &generator.GuestConfig{
DaemonSetTemplateAssetName: "overlays/azure-disk/patches/node_add_driver.yaml",
LivenessProbePort: 10300,
// 10303 port is taken by azurefile stuff and hence we must use 10304 here
NodeRegistrarHealthCheckPort: 10304,
Sidecars: []generator.SidecarConfig{
commongenerator.DefaultNodeDriverRegistrar,
commongenerator.DefaultLivenessProbe.WithExtraArguments(
Expand Down
4 changes: 4 additions & 0 deletions pkg/generator/asset_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,10 @@ func (gen *AssetGenerator) generateDaemonSet() error {
extraReplacements = append(extraReplacements, "${LIVENESS_PROBE_PORT}", strconv.Itoa(int(cfg.LivenessProbePort)))
}

if cfg.NodeRegistrarHealthCheckPort > 0 {
extraReplacements = append(extraReplacements, "${NODE_DRIVER_REGISTRAR_HEALTH_PORT}", strconv.Itoa(int(cfg.NodeRegistrarHealthCheckPort)))
}

err = gen.applyAssetPatch(dsYAML, cfg.DaemonSetTemplateAssetName, extraReplacements)
if err != nil {
return err
Expand Down
2 changes: 2 additions & 0 deletions pkg/generator/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ type GuestConfig struct {
// MetricsPorts []MetricsPort
// Liveness probe TCP port number exposed by the driver itself, i.e. by DaemonSetTemplateAssetName.
LivenessProbePort uint16
// port where node-registrar will expose health check endpoint
NodeRegistrarHealthCheckPort uint16
// Configuration of all sidecars to inject into the guest DaemonSet.
Sidecars []SidecarConfig

Expand Down