From 91eb8ed6c302890407555c5acac54fc78ebc5063 Mon Sep 17 00:00:00 2001
From: Jason Healy <jahealy@redhat.com>
Date: Thu, 19 Dec 2024 16:28:51 -0500
Subject: [PATCH 1/2] fix syntax highlighting

Highlighting for this file is broken in VSCode and on Github. Adding the
single quotes around `EOF` fixes it in both places.
---
 boilerplate/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boilerplate/update b/boilerplate/update
index 9a4aa98b..8dfece01 100755
--- a/boilerplate/update
+++ b/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.
@@ -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' ###

From 6332cfff43364769ea2465551d3e7a51de72c755 Mon Sep 17 00:00:00 2001
From: Jason Healy <jahealy@redhat.com>
Date: Thu, 19 Dec 2024 16:36:03 -0500
Subject: [PATCH 2/2] include OWNERS_ALIASES and dependabot in
 osd-container-image

The `-L` flag makes `rsync` follow symlinks when copying, so the files
in this repository can just be symlinked to the ones in
golang-osd-operator.
---
 .../openshift/osd-container-image/OWNERS_ALIASES      |  1 +
 .../openshift/osd-container-image/dependabot.yml      |  1 +
 boilerplate/openshift/osd-container-image/update      | 11 ++++++++++-
 boilerplate/update                                    |  2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 120000 boilerplate/openshift/osd-container-image/OWNERS_ALIASES
 create mode 120000 boilerplate/openshift/osd-container-image/dependabot.yml

diff --git a/boilerplate/openshift/osd-container-image/OWNERS_ALIASES b/boilerplate/openshift/osd-container-image/OWNERS_ALIASES
new file mode 120000
index 00000000..398befdb
--- /dev/null
+++ b/boilerplate/openshift/osd-container-image/OWNERS_ALIASES
@@ -0,0 +1 @@
+../golang-osd-operator/OWNERS_ALIASES
\ No newline at end of file
diff --git a/boilerplate/openshift/osd-container-image/dependabot.yml b/boilerplate/openshift/osd-container-image/dependabot.yml
new file mode 120000
index 00000000..86dc2a56
--- /dev/null
+++ b/boilerplate/openshift/osd-container-image/dependabot.yml
@@ -0,0 +1 @@
+../golang-osd-operator/dependabot.yml
\ No newline at end of file
diff --git a/boilerplate/openshift/osd-container-image/update b/boilerplate/openshift/osd-container-image/update
index 98ffd804..82babe4b 100755
--- a/boilerplate/openshift/osd-container-image/update
+++ b/boilerplate/openshift/osd-container-image/update
@@ -10,13 +10,22 @@ source $CONVENTION_ROOT/_lib/common.sh
 # Expect POST
 [[ "$1" == "POST" ]] || err "Got a parameter I don't understand: '$1'. Did the infrastructure change?"
 
+# Add OWNERS_ALIASES to $REPO_ROOT
+echo "Copying OWNERS_ALIASES to your repository root."
+cp ${HERE}/OWNERS_ALIASES $REPO_ROOT
+
+# Add dependabot configuration
+mkdir -p $REPO_ROOT/.github
+echo "Copying dependabot.yml to .github/dependabot.yml"
+cp ${HERE}/dependabot.yml ${REPO_ROOT}/.github/dependabot.yml
+
 echo "Writing .ci-operator.yaml in your repository root with:"
 echo "    namespace: $IMAGE_NAMESPACE"
 echo "    name: $IMAGE_NAME"
 echo "    tag: $LATEST_IMAGE_TAG"
 ${SED?} "s/__NAMESPACE__/$IMAGE_NAMESPACE/; s/__NAME__/$IMAGE_NAME/; s/__TAG__/$LATEST_IMAGE_TAG/" ${HERE}/.ci-operator.yaml > $REPO_ROOT/.ci-operator.yaml
 
-cat <<EOF
+cat <<'EOF'
 
 =====================
 THINGS YOU NEED TO DO
diff --git a/boilerplate/update b/boilerplate/update
index 8dfece01..78289173 100755
--- a/boilerplate/update
+++ b/boilerplate/update
@@ -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