From e0c72de192710fe1f33431b6090d3612a5406b5d Mon Sep 17 00:00:00 2001
From: SonicDeathMonkey <scottstroud@gmail.com>
Date: Tue, 16 Mar 2021 13:02:10 -0600
Subject: [PATCH 1/7] meh

---
 hardening_manifest.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index ae30b80..68c95ec 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -8,23 +8,23 @@ name: "confluent/confluent-component-operator/cp-server-connect-operator-5.5.x"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "5.5.3"
+- "5.5.4"
 - "5.5.x"
 - "5.5"
   
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "confluent/kafka-connect/cp-server-connect-5.5.x"
-  BASE_TAG: "5.5.3"
+  BASE_TAG: "5.5.4"
 
 # Docker image labels
 labels:
   org.opencontainers.image.title: "cp-server-connect-operator-5.5.x"
   org.opencontainers.image.description: "Confluent Operator image for cp-server-connect."
   org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE"
-  org.opencontainers.image.url: "https://docs.confluent.io/5.5.3/installation/operator/index.html"
+  org.opencontainers.image.url: "https://docs.confluent.io/5.5.4/installation/operator/index.html"
   org.opencontainers.image.vendor: "Confluent"
-  org.opencontainers.image.version: "5.5.3"
+  org.opencontainers.image.version: "5.5.4"
   mil.dso.ironbank.image.keywords: "confluent,kafka,zookeeper,operator"
   mil.dso.ironbank.image.type: "commercial"
   mil.dso.ironbank.product.name: "Confluent Platform"
-- 
GitLab


From ffcd550854cb33c245308cda3e8343daf072399a Mon Sep 17 00:00:00 2001
From: SonicDeathMonkey <scottstroud@gmail.com>
Date: Thu, 22 Apr 2021 10:58:53 -0600
Subject: [PATCH 2/7] rpm update

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9b291e3..4ce4aba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,8 @@ archive.key
 build-container.sh
 python-libs_filelist.txt
 .env
+build-image.sh
+*.whl
+*.tar.gz
+*.rpm
+build-image.sh
-- 
GitLab


From ad0709b5d91fc21ecf3db5de445bc8261cebdb75 Mon Sep 17 00:00:00 2001
From: SonicDeathMonkey <scottstroud@gmail.com>
Date: Thu, 22 Apr 2021 16:12:32 -0600
Subject: [PATCH 3/7] 5.5.4

---
 Dockerfile              | 10 +++++-----
 hardening_manifest.yaml |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e1606da..cb329a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=confluentinc/cp-server-connect
-ARG BASE_TAG=5.5.3
+ARG BASE_TAG=5.5.4
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 USER root
@@ -17,11 +17,11 @@ WORKDIR /opt
 
 ## Copy dependencies
 RUN mkdir -p /usr/share/java/cc-base /opt/caas
-COPY operator-5.5.3-plugins.tar.gz /usr/share/java/cc-base/
-COPY cp-server-connect-operator-5.5.3_caas.tar.gz /opt/caas/
+COPY operator-5.5.4-plugins.tar.gz /usr/share/java/cc-base/
+COPY cp-server-connect-operator-5.5.4_caas.tar.gz /opt/caas/
 
-RUN cd /usr/share/java/cc-base && tar -xvf operator-5.5.3-plugins.tar.gz && rm operator-5.5.3-plugins.tar.gz \
-    && cd /opt/caas && tar -xvf cp-server-connect-operator-5.5.3_caas.tar.gz && rm cp-server-connect-operator-5.5.3_caas.tar.gz \
+RUN cd /usr/share/java/cc-base && tar -xvf operator-5.5.4-plugins.tar.gz && rm operator-5.5.4-plugins.tar.gz \
+    && cd /opt/caas && tar -xvf cp-server-connect-operator-5.5.4_caas.tar.gz && rm cp-server-connect-operator-5.5.4_caas.tar.gz \
     && yum install -y openssl findutils diffutils && yum clean all && mkdir -p "${CONNECT_LOG4J_DIR}" "${CONNECT_SECRETS_DIR}" "${CONNECT_CONFIG_DIR}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}/jars" \
     && chmod -R ag+w "${CONNECT_LOG4J_DIR}" "${CONNECT_SECRETS_DIR}" "${CONNECT_CONFIG_DIR}" "/opt"
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 68c95ec..8c28bcb 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -31,13 +31,13 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- filename: operator-5.5.3-plugins.tar.gz
-  url: https://ironbank-files.s3.amazonaws.com/operator-5.5.3-plugins.tar.gz
+- filename: operator-5.5.4-plugins.tar.gz
+  url: https://ironbank-files.s3.amazonaws.com/operator-5.5.4-plugins.tar.gz
   validation:
     type: sha256
     value: 28023c40fa06e695f97a5942b74663a6ce397edb78c5376dae14addb01355a80
-- filename: cp-server-connect-operator-5.5.3_caas.tar.gz
-  url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.3_caas.tar.gz
+- filename: cp-server-connect-operator-5.5.4_caas.tar.gz
+  url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4_caas.tar.gz
   validation: 
     type: sha256
     value: b6557abd57ad4b05d4b9f6f1c964250be80a6f9db11420ade8d739d340e77c59
-- 
GitLab


From caf1c161ff0b55035e70849b91e52c18dffb4d67 Mon Sep 17 00:00:00 2001
From: Scott Stroud <sstroud@confluent.io>
Date: Fri, 7 May 2021 09:32:08 -0600
Subject: [PATCH 4/7] tar ball updates

---
 Dockerfile              |  9 +++++----
 hardening_manifest.yaml | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb329a3..f08f49a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,16 +12,17 @@ ENV COMPONENT=connect
 
 ENV DOCKER_SCRIPT_DIR=/opt/caas/bin
 ENV COMPONENT_SCRIPT_DIR=/opt/confluent/etc
+ENV CUB_CLASSPATH="/usr/share/java/cp-base-new/*"
 
 WORKDIR /opt
 
 ## Copy dependencies
 RUN mkdir -p /usr/share/java/cc-base /opt/caas
-COPY operator-5.5.4-plugins.tar.gz /usr/share/java/cc-base/
-COPY cp-server-connect-operator-5.5.4_caas.tar.gz /opt/caas/
+COPY cp-server-connect-operator-5.5.4.0_usrShareJava.tar.gz /usr/share/java/
+COPY cp-server-connect-operator-5.5.4.0_opt.tar.gz /opt/
 
-RUN cd /usr/share/java/cc-base && tar -xvf operator-5.5.4-plugins.tar.gz && rm operator-5.5.4-plugins.tar.gz \
-    && cd /opt/caas && tar -xvf cp-server-connect-operator-5.5.4_caas.tar.gz && rm cp-server-connect-operator-5.5.4_caas.tar.gz \
+RUN cd /usr/share/java && tar -xvf cp-server-connect-operator-*_usrShareJava.tar.gz && rm cp-server-connect-operator-*_usrShareJava.tar.gz \
+    && cd /opt && tar -xvf cp-server-connect-operator-*_opt.tar.gz && rm cp-server-connect-operator-*_opt.tar.gz \
     && yum install -y openssl findutils diffutils && yum clean all && mkdir -p "${CONNECT_LOG4J_DIR}" "${CONNECT_SECRETS_DIR}" "${CONNECT_CONFIG_DIR}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}/jars" \
     && chmod -R ag+w "${CONNECT_LOG4J_DIR}" "${CONNECT_SECRETS_DIR}" "${CONNECT_CONFIG_DIR}" "/opt"
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 8c28bcb..ef7fc4f 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -31,16 +31,16 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- filename: operator-5.5.4-plugins.tar.gz
-  url: https://ironbank-files.s3.amazonaws.com/operator-5.5.4-plugins.tar.gz
+- filename: cp-server-connect-operator-5.5.4.0_usrShareJava.tar.gz
+  url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_usrShareJava.tar.gz
   validation:
     type: sha256
-    value: 28023c40fa06e695f97a5942b74663a6ce397edb78c5376dae14addb01355a80
-- filename: cp-server-connect-operator-5.5.4_caas.tar.gz
-  url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4_caas.tar.gz
+    value: 
+- filename: cp-server-connect-operator-5.5.4.0_opt.tar.gz
+  url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_opt.tar.gz
   validation: 
     type: sha256
-    value: b6557abd57ad4b05d4b9f6f1c964250be80a6f9db11420ade8d739d340e77c59
+    value: 
   
 # List of project maintainers
 maintainers:
-- 
GitLab


From f5be4dbfc707fe73dc0811b05ced6ef19cca82bb Mon Sep 17 00:00:00 2001
From: Scott Stroud <sstroud@confluent.io>
Date: Fri, 7 May 2021 09:35:32 -0600
Subject: [PATCH 5/7] forgot the shas

---
 hardening_manifest.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index ef7fc4f..f3a452a 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -35,12 +35,12 @@ resources:
   url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_usrShareJava.tar.gz
   validation:
     type: sha256
-    value: 
+    value: f16b523b7a0ff5487a7e5edb4a3119a0438924562139ef1ffe3b71ec64ca80fa
 - filename: cp-server-connect-operator-5.5.4.0_opt.tar.gz
   url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_opt.tar.gz
   validation: 
     type: sha256
-    value: 
+    value: 2aeae33e88798c7b0e7dfc74d8281bfd0760a2499d37addc06d17eb2bcd43aef
   
 # List of project maintainers
 maintainers:
-- 
GitLab


From 340dd8e7ee1f78aea88696b64c894ddf35cefc81 Mon Sep 17 00:00:00 2001
From: Scott Stroud <sstroud@confluent.io>
Date: Fri, 7 May 2021 09:45:03 -0600
Subject: [PATCH 6/7] lets try again

---
 hardening_manifest.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index f3a452a..40df2e8 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -35,7 +35,7 @@ resources:
   url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_usrShareJava.tar.gz
   validation:
     type: sha256
-    value: f16b523b7a0ff5487a7e5edb4a3119a0438924562139ef1ffe3b71ec64ca80fa
+    value: 12b4c24c84178fb067cf00ecad642711ec1abe10906025517ce291e1a4da4bd0
 - filename: cp-server-connect-operator-5.5.4.0_opt.tar.gz
   url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_opt.tar.gz
   validation: 
-- 
GitLab


From ac485e0965d714a95032f7964d3a213cc7f6f320 Mon Sep 17 00:00:00 2001
From: Scott Stroud <sstroud@confluent.io>
Date: Tue, 11 May 2021 14:46:26 -0600
Subject: [PATCH 7/7] tar ball update

---
 Dockerfile              | 2 +-
 hardening_manifest.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f08f49a..3d22bcd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ WORKDIR /opt
 
 ## Copy dependencies
 RUN mkdir -p /usr/share/java/cc-base /opt/caas
-COPY cp-server-connect-operator-5.5.4.0_usrShareJava.tar.gz /usr/share/java/
+COPY cp-server-connect-operator-5.5.4.0_1_usrShareJava.tar.gz /usr/share/java/
 COPY cp-server-connect-operator-5.5.4.0_opt.tar.gz /opt/
 
 RUN cd /usr/share/java && tar -xvf cp-server-connect-operator-*_usrShareJava.tar.gz && rm cp-server-connect-operator-*_usrShareJava.tar.gz \
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 40df2e8..5a6ea49 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -31,11 +31,11 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- filename: cp-server-connect-operator-5.5.4.0_usrShareJava.tar.gz
-  url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_usrShareJava.tar.gz
+- filename: cp-server-connect-operator-5.5.4.0_1_usrShareJava.tar.gz
+  url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_1_usrShareJava.tar.gz
   validation:
     type: sha256
-    value: 12b4c24c84178fb067cf00ecad642711ec1abe10906025517ce291e1a4da4bd0
+    value: bb63d7dcc8565cc62028b068fb326843925a328a4fadc9c24b8615df5984174a
 - filename: cp-server-connect-operator-5.5.4.0_opt.tar.gz
   url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_opt.tar.gz
   validation: 
-- 
GitLab