Boilerplate: Subscribe at 15e273364158e3b430ebb4aa108db585f1a88915

Conventions:
- openshift/golang-osd-operator: Update
- openshift/golang-osd-operator-osde2e: No change

boilerplate/_data/last-boilerplate-commit

@@ -1 +1 @@
-8563add3b7f509de3b49ba04863d2708d965b489
+15e273364158e3b430ebb4aa108db585f1a88915

boilerplate/_lib/common.sh

@@ -89,6 +89,11 @@ image_exists_in_repo() {
 
     local skopeo_stderr=$(mktemp)
 
+    if ! command -v skopeo &>/dev/null; then
+      echo "Failed to find the skopeo binary. If you are on Mac: brew install skopeo." >&2
+      exit 1
+    fi
+
     output=$(skopeo inspect docker://${image_uri} 2>$skopeo_stderr)
     rc=$?
     # So we can delete the temp file right away...
@@ -178,6 +183,8 @@ if [ -z "$BOILERPLATE_GIT_REPO" ]; then
   export BOILERPLATE_GIT_REPO=https://github.com/openshift/boilerplate.git
 fi
 
+# Base image repo url
+IMAGE_REPO=quay.io/redhat-services-prod/openshift
 # The namespace of the ImageStream by which prow will import the image.
 IMAGE_NAMESPACE=openshift
 IMAGE_NAME=boilerplate
@@ -194,4 +201,4 @@ if [[ -z "$LATEST_IMAGE_TAG" ]]; then
     fi
 fi
 # The public image location
-IMAGE_PULL_PATH=${IMAGE_PULL_PATH:-quay.io/app-sre/$IMAGE_NAME:$LATEST_IMAGE_TAG}
+IMAGE_PULL_PATH=${IMAGE_PULL_PATH:-$IMAGE_REPO/$IMAGE_NAME:$LATEST_IMAGE_TAG}

boilerplate/openshift/golang-osd-operator/csv-generate/csv-generate.sh

@@ -169,7 +169,11 @@ if [[ -z "$SKIP_SAAS_FILE_CHECKS" ]]; then
 
             if [[ "$delete" == false ]]; then
                 short_hash=$(echo "$version" | cut -d- -f2)
-
+
+                # before comparing the short_hash to the deployment hash, remove the leading g added in https://issues.redhat.com/browse/OSD-13681
+                # short_hash should be 7 char long without the leading g. 
+                [ ${#short_hash} -gt 7 ] && short_hash=${short_hash:1:7}
+
                 if [[ "$DEPLOYED_HASH" == "${short_hash}"* ]]; then
                     delete=true
                 fi

boilerplate/update

@@ -172,7 +172,7 @@ fi
 
 # Prepare the "nexus makefile include".
 NEXUS_MK="${CONVENTION_ROOT}/generated-includes.mk"
-cat <<EOF>"${NEXUS_MK}"
+cat <<'EOF'>"${NEXUS_MK}"
 # THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
 # This file automatically includes any *.mk files in your subscribed
 # conventions. Please ensure your base Makefile includes only this file.
@@ -200,7 +200,7 @@ for convention in $(scrubbed_conventions $CONFIG_FILE); do
   fi
   rm -rf "${CONVENTION_ROOT}/${convention}"
   mkdir -p $(dirname "${CONVENTION_ROOT}/${convention}")
-  rsync -a -r --delete "$dir_path" $(dirname "${CONVENTION_ROOT}/${convention}")
+  rsync -a -r -L --delete "$dir_path" $(dirname "${CONVENTION_ROOT}/${convention}")
   if [ -f "${CONVENTION_ROOT}/${convention}/update" ]; then
     echo "executing ${CONVENTION_ROOT}/${convention}/update POST"
     "${CONVENTION_ROOT}/${convention}/update" POST
@@ -226,7 +226,7 @@ if [[ -f "${gitattributes}" ]]; then
 fi
 # .gitattributes is processed in top-down order. Putting these entries at the
 # end ensures they take precedence over earlier, manual entries.
-cat <<EOF>>"${gitattributes}"
+cat <<'EOF'>>"${gitattributes}"
 ### BEGIN BOILERPLATE GENERATED -- DO NOT EDIT    ###
 ### This block must be the last thing in your     ###
 ### .gitattributes file; otherwise the 'validate' ###

build/Dockerfile

@@ -8,7 +8,7 @@ COPY . .
 RUN make go-build
 
 ####
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1130
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154
 
 ENV USER_UID=1001 \
     USER_NAME=certman-operator

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/ubi8/ubi-minimal:8.10-1130
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154
 
 COPY --from=builder /bin/registry-server /bin/registry-server
 COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe