From 3b110b7f1ed33ce9e7c6035427c296f1b5b5a7f5 Mon Sep 17 00:00:00 2001 From: David Eads Date: Fri, 12 Apr 2024 15:41:52 -0400 Subject: [PATCH 1/2] OCPBUGS-28230: enforce termination message policy on all platform pods --- ...000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml | 2 +- manifests/0000_50_olm_06-psm-operator.deployment.yaml | 2 +- manifests/0000_50_olm_07-collect-profiles.cronjob.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml b/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml index 019320d609..8f04377c1c 100644 --- a/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml +++ b/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml @@ -52,7 +52,7 @@ spec: memory: 20Mi cpu: 10m terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File + terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - mountPath: /etc/tls/private name: package-server-manager-serving-cert diff --git a/manifests/0000_50_olm_06-psm-operator.deployment.yaml b/manifests/0000_50_olm_06-psm-operator.deployment.yaml index bdb9ff8949..b0b0242530 100644 --- a/manifests/0000_50_olm_06-psm-operator.deployment.yaml +++ b/manifests/0000_50_olm_06-psm-operator.deployment.yaml @@ -51,7 +51,7 @@ spec: memory: 20Mi cpu: 10m terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File + terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - mountPath: /etc/tls/private name: package-server-manager-serving-cert diff --git a/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml b/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml index a269266668..6989b82070 100644 --- a/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml +++ b/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml @@ -52,6 +52,7 @@ spec: requests: cpu: 10m memory: 80Mi + terminationMessagePolicy: FallbackToLogsOnError volumes: - name: config-volume configMap: From 1658453a641f67f3e43c113fa4960b291f8a0c82 Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Fri, 12 Apr 2024 16:59:48 -0400 Subject: [PATCH 2/2] OCPBUGS-28230: update manifest generation to enforce termination message policy on all platform pods Signed-off-by: Joe Lanford --- ...00_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml | 2 +- .../0000_50_olm_06-psm-operator.deployment.yaml | 2 +- .../0000_50_olm_07-collect-profiles.cronjob.yaml | 1 + scripts/generate_crds_manifests.sh | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/microshift-manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml b/microshift-manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml index 019320d609..8f04377c1c 100644 --- a/microshift-manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml +++ b/microshift-manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml @@ -52,7 +52,7 @@ spec: memory: 20Mi cpu: 10m terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File + terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - mountPath: /etc/tls/private name: package-server-manager-serving-cert diff --git a/microshift-manifests/0000_50_olm_06-psm-operator.deployment.yaml b/microshift-manifests/0000_50_olm_06-psm-operator.deployment.yaml index bdb9ff8949..b0b0242530 100644 --- a/microshift-manifests/0000_50_olm_06-psm-operator.deployment.yaml +++ b/microshift-manifests/0000_50_olm_06-psm-operator.deployment.yaml @@ -51,7 +51,7 @@ spec: memory: 20Mi cpu: 10m terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File + terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - mountPath: /etc/tls/private name: package-server-manager-serving-cert diff --git a/microshift-manifests/0000_50_olm_07-collect-profiles.cronjob.yaml b/microshift-manifests/0000_50_olm_07-collect-profiles.cronjob.yaml index a269266668..6989b82070 100644 --- a/microshift-manifests/0000_50_olm_07-collect-profiles.cronjob.yaml +++ b/microshift-manifests/0000_50_olm_07-collect-profiles.cronjob.yaml @@ -52,6 +52,7 @@ spec: requests: cpu: 10m memory: 80Mi + terminationMessagePolicy: FallbackToLogsOnError volumes: - name: config-volume configMap: diff --git a/scripts/generate_crds_manifests.sh b/scripts/generate_crds_manifests.sh index 08edd1f7f1..8f9aa9d107 100755 --- a/scripts/generate_crds_manifests.sh +++ b/scripts/generate_crds_manifests.sh @@ -168,7 +168,7 @@ spec: memory: 20Mi cpu: 10m terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File + terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - mountPath: /etc/tls/private name: package-server-manager-serving-cert @@ -416,6 +416,7 @@ spec: requests: cpu: 10m memory: 80Mi + terminationMessagePolicy: FallbackToLogsOnError volumes: - name: config-volume configMap: