Skip to content

Commit e844766

Browse files
committed
Add terminationMessagePolicy and required-scc annotation for OCP 4.21 conformance
1 parent 72d29cf commit e844766

5 files changed

Lines changed: 11 additions & 2 deletions

File tree

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ COPY . /go/src/github.com/openshift/splunk-forwarder-operator
33
WORKDIR /go/src/github.com/openshift/splunk-forwarder-operator
44
RUN make go-build
55

6-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1779809423
6+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1780378819
77
ENV OPERATOR_PATH=/go/src/github.com/openshift/splunk-forwarder-operator \
88
OPERATOR_BIN=splunk-forwarder-operator
99

build/Dockerfile.olm-registry

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COPY ${SAAS_OPERATOR_DIR} manifests
44
RUN initializer --permissive
55

66
# ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available
7-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1779809423
7+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1780378819
88

99
COPY --from=builder /bin/registry-server /bin/registry-server
1010
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe

deploy/operator.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ spec:
1111
metadata:
1212
labels:
1313
name: splunk-forwarder-operator
14+
annotations:
15+
openshift.io/required-scc: restricted-v2
1416
spec:
1517
serviceAccountName: splunk-forwarder-operator
1618
affinity:
@@ -43,3 +45,4 @@ spec:
4345
fieldPath: metadata.name
4446
- name: OPERATOR_NAME
4547
value: "splunk-forwarder-operator"
48+
terminationMessagePolicy: FallbackToLogsOnError

deploy_pko/.test-fixtures/default/Deployment-splunk-forwarder-operator.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ spec:
1515
metadata:
1616
labels:
1717
name: splunk-forwarder-operator
18+
annotations:
19+
openshift.io/required-scc: restricted-v2
1820
spec:
1921
serviceAccountName: splunk-forwarder-operator
2022
affinity:
@@ -46,3 +48,4 @@ spec:
4648
fieldPath: metadata.name
4749
- name: OPERATOR_NAME
4850
value: splunk-forwarder-operator
51+
terminationMessagePolicy: FallbackToLogsOnError

deploy_pko/Deployment-splunk-forwarder-operator.yaml.gotmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ spec:
1515
metadata:
1616
labels:
1717
name: splunk-forwarder-operator
18+
annotations:
19+
openshift.io/required-scc: restricted-v2
1820
spec:
1921
serviceAccountName: splunk-forwarder-operator
2022
affinity:
@@ -46,3 +48,4 @@ spec:
4648
fieldPath: metadata.name
4749
- name: OPERATOR_NAME
4850
value: splunk-forwarder-operator
51+
terminationMessagePolicy: FallbackToLogsOnError

0 commit comments

Comments
 (0)