Skip to content

Commit cd06bbc

Browse files
Merge pull request #330 from deads2k/termination
OCPBUGS-28230: add FallbackToLogsOnError for easier debugging
2 parents 247c501 + e7ff01d commit cd06bbc

13 files changed

Lines changed: 19 additions & 0 deletions

manifests/0000_26_cloud-controller-manager-operator_11_deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ spec:
6262
requests:
6363
cpu: 10m
6464
memory: 50Mi
65+
terminationMessagePolicy: FallbackToLogsOnError
6566
volumeMounts:
6667
- name: images
6768
mountPath: /etc/cloud-controller-manager-config/
@@ -99,6 +100,7 @@ spec:
99100
requests:
100101
cpu: 10m
101102
memory: 25Mi
103+
terminationMessagePolicy: FallbackToLogsOnError
102104
volumeMounts:
103105
- mountPath: /etc/kubernetes
104106
name: host-etc-kube
@@ -125,6 +127,7 @@ spec:
125127
requests:
126128
memory: 20Mi
127129
cpu: 10m
130+
terminationMessagePolicy: FallbackToLogsOnError
128131
volumeMounts:
129132
- mountPath: /etc/kube-rbac-proxy
130133
name: auth-proxy-config

pkg/cloud/alibaba/assets/alibaba-cloud-controller-manager-deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ spec:
9696
requests:
9797
cpu: 200m
9898
memory: 50Mi
99+
terminationMessagePolicy: FallbackToLogsOnError
99100
volumeMounts:
100101
- mountPath: /etc/kubernetes
101102
name: host-etc-kube

pkg/cloud/aws/assets/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ spec:
5454
requests:
5555
cpu: 200m
5656
memory: 50Mi
57+
terminationMessagePolicy: FallbackToLogsOnError
5758
volumeMounts:
5859
- mountPath: /etc/kubernetes
5960
name: host-etc-kube

pkg/cloud/azure/assets/cloud-controller-manager-deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ spec:
9494
name: azure-cloud-credentials
9595
key: azure_federated_token_file
9696
optional: true
97+
terminationMessagePolicy: FallbackToLogsOnError
9798
volumeMounts:
9899
- name: config-accm
99100
mountPath: /etc/cloud-config
@@ -140,6 +141,7 @@ spec:
140141
--leader-elect-renew-deadline=107s \
141142
--leader-elect-retry-period=26s \
142143
--leader-elect-resource-namespace=openshift-cloud-controller-manager
144+
terminationMessagePolicy: FallbackToLogsOnError
143145
volumeMounts:
144146
- name: host-etc-kube
145147
mountPath: /etc/kubernetes

pkg/cloud/azure/assets/cloud-node-manager-daemonset.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ spec:
8383
name: azure-cloud-credentials
8484
key: azure_federated_token_file
8585
optional: true
86+
terminationMessagePolicy: FallbackToLogsOnError
8687
volumeMounts:
8788
- name: host-etc-kube
8889
mountPath: /etc/cloud-config
@@ -115,6 +116,7 @@ spec:
115116
valueFrom:
116117
fieldRef:
117118
fieldPath: spec.nodeName
119+
terminationMessagePolicy: FallbackToLogsOnError
118120
volumeMounts:
119121
- name: merged-cloud-config
120122
mountPath: /etc/kubernetes

pkg/cloud/azurestack/assets/cloud-controller-manager-deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ spec:
7272
secretKeyRef:
7373
name: azure-cloud-credentials
7474
key: azure_client_secret
75+
terminationMessagePolicy: FallbackToLogsOnError
7576
volumeMounts:
7677
- name: config-accm
7778
mountPath: /tmp/cloud-config
@@ -120,6 +121,7 @@ spec:
120121
--leader-elect-renew-deadline=107s \
121122
--leader-elect-retry-period=26s \
122123
--leader-elect-resource-namespace=openshift-cloud-controller-manager
124+
terminationMessagePolicy: FallbackToLogsOnError
123125
volumeMounts:
124126
- name: host-etc-kube
125127
mountPath: /etc/kubernetes

pkg/cloud/azurestack/assets/cloud-node-manager-daemonset.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ spec:
6868
secretKeyRef:
6969
name: azure-cloud-credentials
7070
key: azure_client_secret
71+
terminationMessagePolicy: FallbackToLogsOnError
7172
volumeMounts:
7273
- name: config-accm
7374
mountPath: /tmp/cloud-config
@@ -106,6 +107,7 @@ spec:
106107
value: /etc/cloud-config-original/endpoints.conf
107108
- name: CLOUD_CONFIG
108109
value: /etc/cloud-config/cloud.conf
110+
terminationMessagePolicy: FallbackToLogsOnError
109111
volumeMounts:
110112
- name: host-etc-kube
111113
mountPath: /etc/kubernetes

pkg/cloud/gcp/assets/cloud-controller-manager.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ spec:
9595
--leader-elect-renew-deadline=107s \
9696
--leader-elect-retry-period=26s \
9797
--leader-elect-resource-namespace=openshift-cloud-controller-manager
98+
terminationMessagePolicy: FallbackToLogsOnError
9899
volumeMounts:
99100
- name: host-etc-kube
100101
mountPath: /etc/kubernetes

pkg/cloud/ibm/assets/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ spec:
103103
requests:
104104
cpu: 75m
105105
memory: 60Mi
106+
terminationMessagePolicy: FallbackToLogsOnError
106107
volumeMounts:
107108
- mountPath: /etc/kubernetes
108109
name: host-etc-kube

pkg/cloud/nutanix/assets/cloud-controller-manager-deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ spec:
9898
--leader-elect-renew-deadline=107s \
9999
--leader-elect-retry-period=26s \
100100
--leader-elect-resource-namespace=openshift-cloud-controller-manager
101+
terminationMessagePolicy: FallbackToLogsOnError
101102
volumeMounts:
102103
- name: nutanix-config
103104
mountPath: /etc/cloud

0 commit comments

Comments
 (0)