From e844766d58c18ed78fc5b531cff3cab66ec85043 Mon Sep 17 00:00:00 2001 From: Dustin Row Date: Fri, 5 Jun 2026 11:40:50 -0700 Subject: [PATCH] Add terminationMessagePolicy and required-scc annotation for OCP 4.21 conformance --- build/Dockerfile | 2 +- build/Dockerfile.olm-registry | 2 +- deploy/operator.yaml | 3 +++ .../default/Deployment-splunk-forwarder-operator.yaml | 3 +++ deploy_pko/Deployment-splunk-forwarder-operator.yaml.gotmpl | 3 +++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index dee9d5e9..f21c00c0 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -3,7 +3,7 @@ COPY . /go/src/github.com/openshift/splunk-forwarder-operator WORKDIR /go/src/github.com/openshift/splunk-forwarder-operator RUN make go-build -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1779809423 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1780378819 ENV OPERATOR_PATH=/go/src/github.com/openshift/splunk-forwarder-operator \ OPERATOR_BIN=splunk-forwarder-operator diff --git a/build/Dockerfile.olm-registry b/build/Dockerfile.olm-registry index 7b5899ea..408bc99d 100644 --- a/build/Dockerfile.olm-registry +++ b/build/Dockerfile.olm-registry @@ -4,7 +4,7 @@ COPY ${SAAS_OPERATOR_DIR} manifests RUN initializer --permissive # ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1779809423 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1780378819 COPY --from=builder /bin/registry-server /bin/registry-server COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe diff --git a/deploy/operator.yaml b/deploy/operator.yaml index b6d77e9c..31cf1e63 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -11,6 +11,8 @@ spec: metadata: labels: name: splunk-forwarder-operator + annotations: + openshift.io/required-scc: restricted-v2 spec: serviceAccountName: splunk-forwarder-operator affinity: @@ -43,3 +45,4 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: "splunk-forwarder-operator" + terminationMessagePolicy: FallbackToLogsOnError diff --git a/deploy_pko/.test-fixtures/default/Deployment-splunk-forwarder-operator.yaml b/deploy_pko/.test-fixtures/default/Deployment-splunk-forwarder-operator.yaml index 890966de..6b56faf4 100755 --- a/deploy_pko/.test-fixtures/default/Deployment-splunk-forwarder-operator.yaml +++ b/deploy_pko/.test-fixtures/default/Deployment-splunk-forwarder-operator.yaml @@ -15,6 +15,8 @@ spec: metadata: labels: name: splunk-forwarder-operator + annotations: + openshift.io/required-scc: restricted-v2 spec: serviceAccountName: splunk-forwarder-operator affinity: @@ -46,3 +48,4 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: splunk-forwarder-operator + terminationMessagePolicy: FallbackToLogsOnError diff --git a/deploy_pko/Deployment-splunk-forwarder-operator.yaml.gotmpl b/deploy_pko/Deployment-splunk-forwarder-operator.yaml.gotmpl index ceeb5d38..9f6a61b5 100644 --- a/deploy_pko/Deployment-splunk-forwarder-operator.yaml.gotmpl +++ b/deploy_pko/Deployment-splunk-forwarder-operator.yaml.gotmpl @@ -15,6 +15,8 @@ spec: metadata: labels: name: splunk-forwarder-operator + annotations: + openshift.io/required-scc: restricted-v2 spec: serviceAccountName: splunk-forwarder-operator affinity: @@ -46,3 +48,4 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: splunk-forwarder-operator + terminationMessagePolicy: FallbackToLogsOnError