From fa572bd24a1d1028edd0ceba1332cc5d474fd281 Mon Sep 17 00:00:00 2001
From: Kirk Bater <kirk.bater@gmail.com>
Date: Wed, 10 Jun 2026 09:27:27 -0400
Subject: [PATCH] Boilerplate: Update to
 8fb7c801f68dc7e06e8d2ae138c2a98f0b234b56

Conventions:
- openshift/golang-osd-operator: Update
- openshift/golang-osd-e2e: No change
---
https://github.com/openshift/boilerplate/compare/1cb129aed5a91f2098f70c0e141561e00b1e16fc...8fb7c801f68dc7e06e8d2ae138c2a98f0b234b56

commit: 8fb7c801f68dc7e06e8d2ae138c2a98f0b234b56
author: Josh Branham
Remove user no longer in the org

commit: adf5de77e6238d9697351b1030ec7f4c3e793bac
author: Mitali Bhalla
ROSA-745: MintMaker gomod batch + automerge via boilerplate renovate (#748)

Enable grouped gomod manager in shared renovate.json with Mon-Fri 02:00-04:59
UTC batch window; pre-label lgtm/approved on safe patch/minor/digest updates;
major gomod and Tekton updates open for manual review. Add lgtm/approved and
Mon 03:00 UTC schedule to Dependabot docker template.

Co-authored-by: Cursor <cursoragent@cursor.com>

commit: fb6795dfd897e2b42b7d3b9646228812b57d98c8
author: Kirk Bater
remove iamkirkbater from team leads alias

commit: 1d09b759691974be7028624ad761eb25915d344c
author: Christopher Collins
Fix container-make leaving orphaned containers on interruption

Add --rm to the detached container run so it self-removes when stopped.
Add an EXIT trap to stop the container on abnormal exit (Ctrl+C, terminal
close, SIGTERM). Disarm the trap before normal cleanup so the happy path
uses the existing explicit rm -f without a redundant stop.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 OWNERS_ALIASES                                           | 1 -
 boilerplate/_data/last-boilerplate-commit                | 2 +-
 boilerplate/_lib/container-make                          | 7 ++++++-
 boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES | 1 -
 boilerplate/openshift/golang-osd-operator/dependabot.yml | 5 +++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 7fddbfa2..12676f65 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -81,7 +81,6 @@ aliases:
     - ravitri
   srep-team-leads:
     - rafael-azevedo
-    - iamkirkbater
     - dustman9000
     - bmeng
     - typeid
diff --git a/boilerplate/_data/last-boilerplate-commit b/boilerplate/_data/last-boilerplate-commit
index e1285a81..3e14fd49 100644
--- a/boilerplate/_data/last-boilerplate-commit
+++ b/boilerplate/_data/last-boilerplate-commit
@@ -1 +1 @@
-1cb129aed5a91f2098f70c0e141561e00b1e16fc
+8fb7c801f68dc7e06e8d2ae138c2a98f0b234b56
diff --git a/boilerplate/_lib/container-make b/boilerplate/_lib/container-make
index 77834586..8da20031 100755
--- a/boilerplate/_lib/container-make
+++ b/boilerplate/_lib/container-make
@@ -29,12 +29,14 @@ if [[ "${CONTAINER_ENGINE##*/}" == "podman" ]] && [[ $OSTYPE == *"linux"* ]]; th
 else
     CE_OPTS="${CE_OPTS} -v $REPO_ROOT:$CONTAINER_MOUNT"
 fi
-container_id=$($CONTAINER_ENGINE run -d ${CE_OPTS} $IMAGE_PULL_PATH sleep infinity)
+container_id=$($CONTAINER_ENGINE run --rm -d ${CE_OPTS} $IMAGE_PULL_PATH sleep infinity)
 
 if [[ $? -ne 0 ]] || [[ -z "$container_id" ]]; then
   err "Couldn't start detached container"
 fi
 
+trap "$CONTAINER_ENGINE stop $container_id >/dev/null 2>&1" EXIT
+
 # Now run our `make` command in it with the right UID and working directory
 args="exec -it -u $(id -u):0 -w $CONTAINER_MOUNT $container_id"
 banner "Running: make $@"
@@ -52,6 +54,9 @@ if [[ $rc -ne 0 ]]; then
   fi
 fi
 
+# Disarm the interrupt trap -- normal cleanup handles it from here
+trap - EXIT
+
 # Finally, remove the container
 banner "Cleaning up the container"
 $CONTAINER_ENGINE rm -f $container_id >/dev/null
diff --git a/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES b/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES
index 7fddbfa2..12676f65 100644
--- a/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES
+++ b/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES
@@ -81,7 +81,6 @@ aliases:
     - ravitri
   srep-team-leads:
     - rafael-azevedo
-    - iamkirkbater
     - dustman9000
     - bmeng
     - typeid
diff --git a/boilerplate/openshift/golang-osd-operator/dependabot.yml b/boilerplate/openshift/golang-osd-operator/dependabot.yml
index 45e5fe35..eae3de41 100644
--- a/boilerplate/openshift/golang-osd-operator/dependabot.yml
+++ b/boilerplate/openshift/golang-osd-operator/dependabot.yml
@@ -5,8 +5,13 @@ updates:
     labels:
       - "area/dependency"
       - "ok-to-test"
+      - "lgtm"
+      - "approved"
     schedule:
       interval: "weekly"
+      day: "monday"
+      time: "03:00"
+      timezone: "UTC"
     ignore:
       - dependency-name: "redhat-services-prod/openshift/boilerplate"
         # don't upgrade boilerplate via these means