Merge branch 'development' into 'master'

Development

See merge request dsop/confluent/confluentinc/confluent-operator-2.6.x!16

Dockerfile

 ARG CONFLUENT_OPERATOR_BASE_IMAGE=confluentinc/confluent-operator
-ARG CONFLUENT_OPERATOR_BASE_TAG=0.771.13
+ARG CONFLUENT_OPERATOR_BASE_TAG=0.771.29
 
 ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=redhat/ubi/ubi8
@@ -22,6 +22,8 @@ COPY hardening_manifest.yaml /etc/confluent/ironbank/
 COPY --from=base /licenses /licenses
 COPY --from=base /opt/manager /opt/manager
 
+COPY scripts/entrypoint.sh /entrypoint.sh
+
 RUN echo "===> Dependency update" \
         && dnf update -y --nodocs \
         && chmod gu-s /usr/bin/write \
@@ -30,6 +32,8 @@ RUN echo "===> Dependency update" \
         && yum clean all \
         && rm -rf /tmp/* /var/cache/dnf
 
+ENTRYPOINT ["/entrypoint.sh"]
+
 # Polling period  : 5 seconds
 # Timeout period  : 2 seconds (if the polling does not return within this time, treat as a failed poll)
 # Retry period    : 25 sec (after which container is deemed unhealthy)

hardening_manifest.yaml

@@ -8,15 +8,15 @@ name: "confluentinc/confluent-operator"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dso.mil
 tags:
-  - "2.6.0"
+  - "2.6.1"
   - "2.6"
-  - "0.771.13"
+  - "0.771.29"
   - "0.771"
   
 # Build args passed to Dockerfile ARGs
 args:
   CONFLUENT_OPERATOR_BASE_IMAGE: "confluentinc/confluent-operator"
-  CONFLUENT_OPERATOR_BASE_TAG: "0.771.13"
+  CONFLUENT_OPERATOR_BASE_TAG: "0.771.29"
   BASE_IMAGE: "redhat/ubi/ubi8"
   BASE_TAG: "8.8"
 
@@ -27,14 +27,14 @@ labels:
   org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE"
   org.opencontainers.image.url: "https://docs.confluent.io/current/installation/operator/index.html"
   org.opencontainers.image.vendor: "Confluent"
-  org.opencontainers.image.version: "0.771.13"
+  org.opencontainers.image.version: "0.771.29"
   mil.dso.ironbank.image.keywords: "confluent,kafka,zookeeper,operator"
   mil.dso.ironbank.image.type: "commercial"
   mil.dso.ironbank.product.name: "Confluent Platform"
 
 resources:
-  - tag: confluentinc/confluent-operator:0.771.13
-    url: docker://docker.io/confluentinc/confluent-operator:0.771.13
+  - tag: confluentinc/confluent-operator:0.771.29
+    url: docker://docker.io/confluentinc/confluent-operator:0.771.29
 
 # List of project maintainers
 maintainers:

scripts/entrypoint.sh

+#!/bin/bash
+
+/opt/manager
\ No newline at end of file