Skip to content

Commit

Permalink
Merge pull request #119 from deads2k/termination
Browse files Browse the repository at this point in the history
OCPBUGS-28230: enforce termination message policy on all platform pods
  • Loading branch information
openshift-merge-bot[bot] authored Apr 22, 2024
2 parents b40c858 + b0f92e2 commit 799327f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
10 changes: 10 additions & 0 deletions assets/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ spec:
timeoutSeconds: 3
periodSeconds: 10
failureThreshold: 5
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
Expand Down Expand Up @@ -100,6 +101,7 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
Expand Down Expand Up @@ -128,6 +130,7 @@ spec:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: metrics-serving-cert
Expand All @@ -146,6 +149,7 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
Expand All @@ -172,6 +176,7 @@ spec:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: metrics-serving-cert
Expand All @@ -189,6 +194,7 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
Expand All @@ -215,6 +221,7 @@ spec:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: metrics-serving-cert
Expand All @@ -233,6 +240,7 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /var/lib/csi/sockets/pluginproxy/
name: socket-dir
Expand All @@ -259,6 +267,7 @@ spec:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: metrics-serving-cert
Expand All @@ -270,6 +279,7 @@ spec:
- --probe-timeout=3s
- --health-port=10301
- --v=${LOG_LEVEL}
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: socket-dir
mountPath: /csi
Expand Down
3 changes: 3 additions & 0 deletions assets/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ spec:
requests:
memory: 50Mi
cpu: 10m
terminationMessagePolicy: FallbackToLogsOnError
- name: csi-node-driver-registrar
securityContext:
privileged: true
Expand Down Expand Up @@ -123,6 +124,7 @@ spec:
timeoutSeconds: 3
periodSeconds: 10
failureThreshold: 5
terminationMessagePolicy: FallbackToLogsOnError
- name: csi-liveness-probe
image: ${LIVENESS_PROBE_IMAGE}
imagePullPolicy: IfNotPresent
Expand All @@ -138,6 +140,7 @@ spec:
requests:
memory: 50Mi
cpu: 10m
terminationMessagePolicy: FallbackToLogsOnError
volumes:
- name: kubelet-dir
hostPath:
Expand Down

0 comments on commit 799327f

Please sign in to comment.