updating go toolset to 1.25.5

Author: diakovnec

boilerplate/_data/backing-image-tag

@@ -1 +1 @@
-image-v8.2.0
+image-v8.3.2

boilerplate/_data/last-boilerplate-commit

@@ -1 +1 @@
-27b681eaa783ae7183c53546a7194162a3041fa0
+03d10f359a4a9d3b38c4f5e1494f771ef603fc3f

boilerplate/_lib/container-make

@@ -4,6 +4,7 @@ if [[ "$1" == "-h"* ]] || [[ "$1" == "--h"* ]]; then
   echo "Usage: $0 {arguments to the real 'make'}"
   echo "Runs 'make' in the boilerplate backing container."
   echo "If the command fails, starts a shell in the container so you can debug."
+  echo "Set NONINTERACTIVE=true (or TRUE) to skip the debug shell and exit with the make return code."
   exit -1
 fi
 
@@ -40,12 +41,20 @@ banner "Running: make $@"
 $CONTAINER_ENGINE $args make "$@"
 rc=$?
 
-# If it failed, drop into the container in a shell
+# If it failed, check if we should drop into a shell or exit
 if [[ $rc -ne 0 ]]; then
-  banner "The 'make' command failed! Starting a shell in the container for debugging. Just 'exit' when done."
-  $CONTAINER_ENGINE $args /bin/bash
+  # Case-insensitive check for NONINTERACTIVE (true, TRUE, True all work)
+  if [[ "${NONINTERACTIVE,,}" == "true" ]]; then
+    banner "The 'make' command failed with exit code $rc. Skipping debug shell (NONINTERACTIVE=${NONINTERACTIVE})."
+  else
+    banner "The 'make' command failed! Starting a shell in the container for debugging. Just 'exit' when done."
+    $CONTAINER_ENGINE $args /bin/bash
+  fi
 fi
 
 # Finally, remove the container
 banner "Cleaning up the container"
 $CONTAINER_ENGINE rm -f $container_id >/dev/null
+
+# Exit with the return code from make
+exit $rc

boilerplate/openshift/golang-osd-e2e/e2e-template.yml

@@ -56,6 +56,13 @@ objects:
                 - --skip-must-gather
                 - --configs
                 - ${OSDE2E_CONFIGS}
+              resources:
+                requests:
+                  cpu: "300m"
+                  memory: "600Mi"
+                limits:
+                  cpu: "1"
+                  memory: "1200Mi"
               securityContext:
                 runAsNonRoot: true
                 allowPrivilegeEscalation: false
@@ -85,4 +92,4 @@ objects:
                 - name: USE_EXISTING_CLUSTER
                   value: ${USE_EXISTING_CLUSTER}
                 - name: CAD_PAGERDUTY_ROUTING_KEY
-                  value: ${CAD_PAGERDUTY_ROUTING_KEY}                 
+                  value: ${CAD_PAGERDUTY_ROUTING_KEY}

boilerplate/openshift/golang-osd-e2e/update

@@ -21,21 +21,21 @@ OPERATOR_NAME_CAMEL_CASE=${OPERATOR_PROPER_NAME// /}
 
 mkdir -p "${E2E_SUITE_DIRECTORY}"
 
-E2E_SUITE_BUILDER_IMAGE=registry.access.redhat.com/ubi9/go-toolset:1.24
+E2E_SUITE_BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21
 if [[ -n ${KONFLUX_BUILDS} ]]; then
-	E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24"
+	E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25"
 fi
 
 echo "syncing ${E2E_SUITE_DIRECTORY}/Dockerfile"
 tee "${E2E_SUITE_DIRECTORY}/Dockerfile" <<EOF
 # THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
 FROM ${E2E_SUITE_BUILDER_IMAGE} as builder
-WORKDIR /opt/app-root/src
+WORKDIR /go/src/github.com/openshift/$OPERATOR_NAME/
 COPY . .
-RUN  CGO_ENABLED=0 GOFLAGS="-mod=mod" go test ./test/e2e -v -c --tags=osde2e -o e2e.test
+RUN  CGO_ENABLED=0 GOFLAGS="-mod=mod" go test ./test/e2e -v -c --tags=osde2e -o /e2e.test
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
-COPY --from=builder /opt/app-root/src/e2e.test e2e.test
+COPY --from=builder ./e2e.test e2e.test
 ENTRYPOINT [ "/e2e.test" ]
 EOF
 

build/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=registry.access.redhat.com/ubi9/go-toolset:1.25
+ARG BASE_IMAGE=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21
 FROM ${BASE_IMAGE} AS builder
 
 WORKDIR /opt/app-root/src

test/e2e/Dockerfile

@@ -1,20 +1,9 @@
 # THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
-FROM registry.access.redhat.com/ubi9/go-toolset:1.25 as builder
-WORKDIR /opt/app-root/src
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 as builder
+WORKDIR /go/src/github.com/openshift/validation-webhook/
 COPY . .
-RUN  CGO_ENABLED=0 GOFLAGS="-mod=mod" go test ./test/e2e -v -c --tags=osde2e -o e2e.test
+RUN  CGO_ENABLED=0 GOFLAGS="-mod=mod" go test ./test/e2e -v -c --tags=osde2e -o /e2e.test
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
-COPY --from=builder /opt/app-root/src/e2e.test e2e.test
-
-LABEL com.redhat.component="managed-cluster-validating-webhooks-e2e-container" \
-      name="managed-cluster-validating-webhooks-e2e" \
-      version="1.0" \
-      release="1" \
-      summary="E2E tests for Managed Cluster Validating Webhooks" \
-      description="End-to-end tests for validating admission webhooks for OpenShift" \
-      io.k8s.description="End-to-end tests for validating admission webhooks for OpenShift" \
-      io.k8s.display-name="Managed Cluster Validating Webhooks E2E" \
-      io.openshift.tags="openshift,webhooks,validation,e2e,tests"
-
+COPY --from=builder ./e2e.test e2e.test
 ENTRYPOINT [ "/e2e.test" ]

test/e2e/e2e-template.yml

@@ -56,6 +56,13 @@ objects:
                 - --skip-must-gather
                 - --configs
                 - ${OSDE2E_CONFIGS}
+              resources:
+                requests:
+                  cpu: "300m"
+                  memory: "600Mi"
+                limits:
+                  cpu: "1"
+                  memory: "1200Mi"
               securityContext:
                 runAsNonRoot: true
                 allowPrivilegeEscalation: false
@@ -85,4 +92,4 @@ objects:
                 - name: USE_EXISTING_CLUSTER
                   value: ${USE_EXISTING_CLUSTER}
                 - name: CAD_PAGERDUTY_ROUTING_KEY
-                  value: ${CAD_PAGERDUTY_ROUTING_KEY}                 
+                  value: ${CAD_PAGERDUTY_ROUTING_KEY}