Merge pull request #394 from smarthall/bug/update-boilerplate

Update boilerplate

Author: openshift-merge-bot[bot]

boilerplate/_data/backing-image-tag

@@ -1 +1 @@
-image-v7.4.0
+image-v8.1.0

boilerplate/_data/last-boilerplate-commit

@@ -1 +1 @@
-2400affc32091b707df9f1d3045b049f0c11628c
+08840ef8db8330487f85dcfd74935ef3c2d7a940

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

@@ -30,6 +30,10 @@ parameters:
     required: true
   - name: LOG_BUCKET
     value: 'osde2e-logs'
+  - name: USE_EXISTING_CLUSTER
+    value: 'TRUE'
+  - name: CAD_PAGERDUTY_ROUTING_KEY
+    required: false
 objects:
   - apiVersion: batch/v1
     kind: Job
@@ -78,5 +82,7 @@ objects:
                   value: ${GCP_CREDS_JSON}
                 - name: LOG_BUCKET
                   value: ${LOG_BUCKET}
+                - name: USE_EXISTING_CLUSTER
+                  value: ${USE_EXISTING_CLUSTER}
                 - name: CAD_PAGERDUTY_ROUTING_KEY
                   value: ${CAD_PAGERDUTY_ROUTING_KEY}                 

boilerplate/openshift/golang-osd-e2e/update

@@ -21,9 +21,9 @@ OPERATOR_NAME_CAMEL_CASE=${OPERATOR_PROPER_NAME// /}
 
 mkdir -p "${E2E_SUITE_DIRECTORY}"
 
-E2E_SUITE_BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
+E2E_SUITE_BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
 if [[ -n ${KONFLUX_BUILDS} ]]; then
-	E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.23"
+	E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24"
 fi
 
 echo "syncing ${E2E_SUITE_DIRECTORY}/Dockerfile"
@@ -109,4 +109,4 @@ sed -e "s/\${OPERATOR_NAME}/${OPERATOR_NAME}/" $(dirname $0)/e2e-template.yml >"
 # todo: remove after file is renamed in ALL consumer repos
 if [ -f "${E2E_SUITE_DIRECTORY}/test-harness-template.yml" ]; then
   rm -f "${E2E_SUITE_DIRECTORY}/test-harness-template.yml"
-fi
+fi

test/e2e/Dockerfile

@@ -1,5 +1,5 @@
 # THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
-FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 as builder
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 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

test/e2e/e2e-template.yml

@@ -30,6 +30,10 @@ parameters:
     required: true
   - name: LOG_BUCKET
     value: 'osde2e-logs'
+  - name: USE_EXISTING_CLUSTER
+    value: 'TRUE'
+  - name: CAD_PAGERDUTY_ROUTING_KEY
+    required: false
 objects:
   - apiVersion: batch/v1
     kind: Job
@@ -78,5 +82,7 @@ objects:
                   value: ${GCP_CREDS_JSON}
                 - name: LOG_BUCKET
                   value: ${LOG_BUCKET}
+                - name: USE_EXISTING_CLUSTER
+                  value: ${USE_EXISTING_CLUSTER}
                 - name: CAD_PAGERDUTY_ROUTING_KEY
                   value: ${CAD_PAGERDUTY_ROUTING_KEY}