Merge branch 'main' into consolidate-code

Author: halim-lee

.one-pipeline-cd.yaml

@@ -23,7 +23,7 @@ setup:
       echo "${DIGEST}"
       echo "${APP}" | jq '.'
 
-      SAVED_DIGEST="$(skopeo inspect docker://$ARTIFACT | grep Digest | grep -o 'sha[^\"]*')"
+      SAVED_DIGEST="$(skopeo inspect docker://$ARTIFACT | jq '.Digest'| sed -e 's/"//g')"
       if [[ ${DIGEST} == ${SAVED_DIGEST} ]]; then
         echo "Image, $ARTIFACT, passes validation"
       else

.one-pipeline.yaml

@@ -306,7 +306,7 @@ containerize:
       for i in "${tags[@]}"
       do
         IMAGE=$PIPELINE_REGISTRY/$PIPELINE_OPERATOR_IMAGE:$i
-        DIGEST="$(skopeo inspect docker://$IMAGE | grep Digest | grep -o 'sha[^\"]*')"
+        DIGEST="$(skopeo inspect docker://$IMAGE | jq '.Digest'| sed -e 's/"//g')"
         { ARCH="$(echo $i | grep -o '\(amd64\|s390x\|ppc64le\)$')" && TYPE="image"; } || { TYPE="manifest"; }
         if [[ "$TYPE" == "manifest" ]]; then
           echo "Saving artifact operator-$i type=$TYPE name=$IMAGE digest=$DIGEST"
@@ -317,13 +317,13 @@ containerize:
         fi
       done
       IMAGE=$PIPELINE_REGISTRY/$PIPELINE_OPERATOR_IMAGE-bundle:${RELEASE_TARGET}
-      DIGEST="$(skopeo inspect docker://$IMAGE | grep Digest | grep -o 'sha[^\"]*')"
+      DIGEST="$(skopeo inspect docker://$IMAGE | jq '.Digest'| sed -e 's/"//g')"
       echo "Saving artifact bundle-${RELEASE_TARGET} name=$IMAGE digest=$DIGEST"
       save_artifact bundle-${RELEASE_TARGET} type=image name="$IMAGE" "digest=$DIGEST"
       for i in "${tags[@]}"
       do
         IMAGE=$PIPELINE_REGISTRY/$PIPELINE_OPERATOR_IMAGE-catalog:$i
-        DIGEST="$(skopeo inspect docker://$IMAGE | grep Digest | grep -o 'sha[^\"]*')"
+        DIGEST="$(skopeo inspect docker://$IMAGE | jq '.Digest'| sed -e 's/"//g')"
         { ARCH="$(echo $i | grep -o '\(amd64\|s390x\|ppc64le\)$')" && TYPE="image"; } || { ARCH="amd64" && TYPE="manifest"; }
         if [[ "$TYPE" == "manifest" ]]; then
           echo "Saving artifact catalog-$i type=$TYPE name=$IMAGE digest=$DIGEST"
@@ -340,7 +340,7 @@ containerize:
       
       ## Perform lint
       IMAGE="${PIPELINE_REGISTRY}/${PIPELINE_OPERATOR_IMAGE}-bundle:${RELEASE_TARGET}"
-      DIGEST="$(skopeo inspect docker://$IMAGE | grep Digest | grep -o 'sha[^\"]*')"
+      DIGEST="$(skopeo inspect docker://$IMAGE | jq '.Digest'| sed -e 's/"//g')"
       BUNDLE_IMAGE_WITH_DIGEST="${IMAGE}@${DIGEST}"
       ./scripts/pipeline/static-linter-scan.sh --git-token $(get_env git-token) --bundle-image $BUNDLE_IMAGE_WITH_DIGEST --static-linter-version $(get_env static-linter-version)
 

bundle/tests/scorecard/kuttl/probe/03-assert.yaml

@@ -43,9 +43,6 @@ spec:
           successThreshold: 1
           failureThreshold: 20
 status:
-# not checking readyReplicas or replicas while using icr.io/appcafe/websphere-liberty:full-java8-openj9-ubi 
-# as it uses different default ports. Replace with icr.io/appcafe/open-liberty/samples/getting-started 
-# when available
-#  readyReplicas: 1
-#  replicas: 1
+  readyReplicas: 1
+  replicas: 1
   updatedReplicas: 1

bundle/tests/scorecard/kuttl/probe/03-runtime-probe-defaults.yaml

@@ -4,7 +4,7 @@ metadata:
   name: probes-rc
 spec:
   # Add fields here
-  applicationImage: icr.io/appcafe/open-liberty
+  applicationImage: icr.io/appcafe/open-liberty/samples/getting-started
   manageTLS: false
   service:
     port: 9443

bundle/tests/scorecard/kuttl/probe/04-assert.yaml

@@ -43,9 +43,6 @@ spec:
             successThreshold: 1
             failureThreshold: 5
 status:
-# not checking readyReplicas or replicas while using icr.io/appcafe/websphere-liberty:full-java8-openj9-ubi 
-# as it uses different default ports. Replace with icr.io/appcafe/open-liberty/samples/getting-started 
-# when available
-#  readyReplicas: 1
-#  replicas: 1
+  readyReplicas: 1
+  replicas: 1
   updatedReplicas: 1

bundle/tests/scorecard/kuttl/probe/05-assert.yaml

@@ -23,9 +23,6 @@ spec:
           successThreshold: 1
           failureThreshold: 20
 status:
-# not checking readyReplicas or replicas while using icr.io/appcafe/websphere-liberty:full-java8-openj9-ubi 
-# as it uses different default ports. Replace with icr.io/appcafe/open-liberty/samples/getting-started 
-# when available
-#  readyReplicas: 1
-#  replicas: 1
+  readyReplicas: 1
+  replicas: 1
   updatedReplicas: 1

scripts/setup-kind-cluster.sh

@@ -16,6 +16,10 @@ install_kind() {
 }
 
 install_dependencies() {
+  # Without this, pods may fail with 'too many open files'
+  # https://kind.sigs.k8s.io/docs/user/known-issues/#pod-errors-due-to-too-many-open-files
+  sysctl fs.inotify.max_user_watches=524288
+  sysctl fs.inotify.max_user_instances=512
   ## Install docker
   if ! command -v docker &> /dev/null; then
     echo "****** Installing Docker..."