Boilerplate: Update to a48d90919cb9a4fe3b4bbd51ac6ef71ea1b49ed6

Conventions: - openshift/golang-osd-operator: Update --- openshift/boilerplate@0a69514...a48d909 commit: c93835dd34f897e62b1ef5a88e1640fb9774850b author: Supreeth Basabattini fix: Invalid option reference commit: ece25ada17378a38dff53847d7ed21132c0caf6d author: Supreeth Basabattini TOC added commit: 75e862e6b6fc86ca7df41fcc9612929247cd8d6d author: Supreeth Basabattini Docs added + cleanup commit: ece978220f0ccdbb00b45f703a2cec01d32d1448 author: Supreeth Basabattini feat: introduce OLM Skiprange commit: cc80888d2bee2552168a9a285d27656e13c5fae5 author: Ritu Mundhe Added env var to osde2e pod template commit: 5d593fd53f826d2886e2086b9adba67caed868ac author: Supreeth Basabattini Make image digest generation modular Removed redundant lines commit: e124c758f491297ef6d9f273296875786bf12008 author: Supreeth Basabattini feat: Support multiple deployments commit: 1b054708852bc2404e830b7a16d66dfbd4ba258f author: Michael Shen Correctly select base image for AppSRE build process Signed-off-by: Michael Shen <[email protected]> commit: 9183ddafe84cb0f4f571d836a116edb2bef6d558 author: Michael Shen We need to stay on RHEL 8 for compatible GCC versions Signed-off-by: Michael Shen <[email protected]> commit: 38335348c70c453c83a3a4b37cef0bd1a4201b68 author: Michael Shen use image-v4.0.0 in .ci-operator Signed-off-by: Michael Shen <[email protected]> commit: 26fbdba3ef571cf413520ef221458c0e2bed6d23 author: Michael Shen Create boilerplate v4.0.0 to support Go 1.20 OCP 4.14 is using Go 1.20 and we need to be able to support it when we pull in dependencies from OCP. Signed-off-by: Michael Shen <[email protected]> commit: 741bd9fc3f5640865015f72966a214d1eaed6715 author: Trevor Nierman OSD-18002 - Prevent operator commit reverts commit: 333fc3eb933631294c2a1ad44df1b441b0c20825 author: Christoph Blecker Update boilerplate SREP TL list commit: e1409eabf6deecff9649d4c8e250417accb56d70 author: Ravi Trivedi Updating Hulk members and FL list commit: b79dfcb57358bd3a04b063e6b57fc189e30595e9 author: Michael Shen Accept the latest ubi-minimal version Specifically, version differences after the last period were previously excluded from consideration. Signed-off-by: Michael Shen <[email protected]> commit: 889a9f5aef2b89750d7bafdea6e146213db7d944 author: Karthik Perumal Update OWNERS_ALIASES with recent team changes (#311) * Update OWNERS_ALIASES with recent team changes * Add Sam to FL list commit: 60617bc64af03d910d8554957a262c8c0a16f114 author: Ritu Mundhe sdcicd-1139 added osde2e tekton job openshift template generation (#309) * sdcicd-1139 added osde2e job template generation * added operator name to job name in e2e template to distinguish from other jobs * nit - fix "hyphen" to "underscore" commit: 8512a74b52ed9d3f1d0a1852713821c9000114ba author: Michael Shen Do not need to surround yq string with single quotes Signed-off-by: Michael Shen <[email protected]> commit: 24fdf68d0161e7ee131f45e0e7ffb8e6da7ef8b7 author: Michael Shen Increment ci image to image-v3.0.6 Signed-off-by: Michael Shen <[email protected]> commit: d6a0b5760288c815c9ce8a2eeda497146ea36eff author: Michael Shen quay.io/app-sre/yq:4 has entrypoint yq Signed-off-by: Michael Shen <[email protected]> commit: bc1c1eb68a02b3f6b7e1c4f5767ff6d65f035fc2 author: Ritu Mundhe push latest harness tag commit: 655fe58dc9700dabff94752ff8ecbf765f41804a author: Michael Shen golang-osd-operator: optionally generate operator manifests using kustomize Signed-off-by: Michael Shen <[email protected]> commit: 3406777ae7fc1bd0cc5bba1758b904f056a6e77a author: Michael Shen Update boilerplate image to us yq:v4.34.2 This commit removes yq:v3 dependencies for the subscriber script within boilerplate as well as the golang-osd-operator's csv-generate script by refactoring the yq commands to use the yq:v4 syntax. Signed-off-by: Michael Shen <[email protected]> commit: 816e2ffebdd62ec7a65b45a70bcb1eb2aec63add author: Michael Shen Add govulncheck to the boilerplate image This will be included in v3.0.5 Signed-off-by: Michael Shen <[email protected]> commit: 092b2f7156ddf8680441795c5bc126f74f6a4cd2 author: Michael Shen Fix bug with printing output in Makefiles Signed-off-by: Michael Shen <[email protected]> commit: cd0e87c2b4a8dcdae6da431074f23d12d38797de author: Michael Shen Bump base image to v3.0.4 in CI Signed-off-by: Michael Shen <[email protected]> commit: 022aa906a5057339081b66ac103dd836858fcb1d author: Michael Shen Enable GOEXPERIMENT=strictfipsruntime This ensures that the binary will fail to run if running in a non-FIPS Compliant environment when built with FIPS_ENABLED=true. GOEXPERIMENT=strictfipsruntime is not supported by Go generally and is something that Red Hat is supporting in our own fork. Red Hat's fork of Go is currently in registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 which will allow this to work. When building locally, developers should set FIPS_ENABLED=false to get around this. Therefore, also rebuilding this image which has the patched Go containing remediations for CVE-2023-3089 Signed-off-by: Michael Shen <[email protected]> commit: b50f89b062d2803e22cb695bc276dbe751126e44 author: Michael Shen CGO_ENABLED=1 for FIPS compliance Enforce that any ubi images are using ubi8/ubi-minimal This is our agreed upon way to ensure FIPS compliance for now https://developers.redhat.com/articles/2022/05/31/your-go-application-fips-compliant Signed-off-by: Michael Shen <[email protected]> commit: b8471722f97446ecb928f969d4452a9166b55fad author: Michael Shen Fix bugs preventing registry from running in fips mode registry.redhat.io/openshift4/ose-operator-registry:v4.12 is the OCP released image that has more guarantees about its release process and ubi-micro needs OpenSSL to be available in order to run in fips mode. Signed-off-by: Michael Shen <[email protected]> commit: ff00526298e00331b92697d83d11569d8a0519ed author: Ritu Mundhe sdcicd-926 harness image versioning commit: e6dd946dc128b4c0a2354bb0221e60c713d29d35 author: Michael Shen Update after shift between rocket and security Signed-off-by: Michael Shen <[email protected]> commit: e54dfc24bf74099164f165a01c756f188224bc50 author: Ritu Mundhe dockerfile template fix commit: 6699b052ab9e59f909b8424b538d77be19ef100e author: Michael Shen Allow generation of embedded ObjectMeta in CRDs This will allow for using metav1.ObjectMeta's in nested fields. Without this option, the generated metadata field is non-functional as described in kubernetes-sigs/controller-tools#557. Signed-off-by: Michael Shen <[email protected]> Co-authored-by: Alice Hubenko <[email protected]> commit: cac1395fbae95d2dc43aeeec649dc46c04d065c4 author: Bo Meng update owners commit: 4c6d460e088fc7520d58cfeb2e5f457228b6ec13 author: Ritu Mundhe fixed hardcoded operator namein osde2e convention template commit: 56ec373e5d204115567d6a399e8cbfcdb71669cb author: Ryan Williams Replace addon with operator name for osde2e boilerplate This commit modifies the following: * Rename the junit output filename to include operator name * Update readme to remove the word "addon" commit: a000622561d57cefe749978b6505be030f3114bb author: Ritu Mundhe renamed test tags from "integration" to "osde2e" for specificity commit: bbb667c6d0ad14399c2e572acab68dd01ffa3f18 author: Dustin Row Exclude build/Dockerfile* from initial git status check commit: 7a16980d213b68b1a982ae3a710a5cee4b983491 author: Ritu Mundhe fix: escaped quote in template commit: ba40cfc5f02b30b6f9c4d1f420c14da7edd8a6c3 author: Ritu Mundhe osde2e dockerfile contains building ginkgo binary (#284) * osde2e dockerfile contains building ginkgo binary * Update ubi version Co-authored-by: Michael Shen <[email protected]> * Update go base image version Co-authored-by: Michael Shen <[email protected]> --------- Co-authored-by: Michael Shen <[email protected]> commit: 023d6fc8e9714428c149c7c1343e24b53449f4bd author: Ritu Mundhe reverting docker registry credentials for test-harness for app-interface commit: 50a4abf7890faa6bdbda0faa03cde25b5ba64be0 author: Ritu Mundhe updating docker registry credentials for test-harness for ci-operator commit: b2e3e1b90c2e5a60020cba909d2112b76021f201 author: Diego Santamaria Swap sed command delimiter I believe this will explode because $TEST_IMAGE contains /s. I would use some other delimiter for that sed command -- one that can't appear in a URI -- e.g.: Co-authored-by: Eric Fried <[email protected]> Remove project.mk commit: 7adb0b88cea0e8527b4d32ddeb9c5425e83aa7a3 author: Diego Santamaria Swap sed command delimiter I believe this will explode because $TEST_IMAGE contains /s. I would use some other delimiter for that sed command -- one that can't appear in a URI -- e.g.: Co-authored-by: Eric Fried <[email protected]> commit: 19ae2a423b085b1ae0b650374570da1784a8daa3 author: Diego Santamaria Add acceptance Test convention commit: f9e6c350556d9d5845babbb46686639a01945d03 author: Diego Santamaria Initial Commit for PD boiletPlate commit: 479ec3635d761fb91a59a884ef6bc29be8a15470 author: Christoph Blecker Revert yq/python version bump commit: 999bf51ca03b8add6de2f6cb83971c5c5a95bb93 author: Christoph Blecker Remove tag-check exemption for config/Dockerfile commit: f77a7379f0bef64b0eab6163f91e87bdd67f8b34 author: Christoph Blecker Bump base image to v3.0.3 commit: 56d013c17a42b259a88e987ed6798d0fdc2f2c2a author: Christoph Blecker Hard code default branch commit: fc2e7a8d1eb5dda50f086e0f16059957352defba author: Christoph Blecker Remove prescriptive URL from config/Dockerfile commit: 82d19adadc2857c2359a8890631c081ac2824bda author: Christoph Blecker Rev boilerplate image to v3.0.3 commit: 46c46423d7f2df00731fbdcf3573773becd7c9e7 author: Christoph Blecker Don't check tag-check or config/Dockerfile when checking for a tag commit: ecfd17b4fed6a4aea80d5bdc551de7350a4d6fd8 author: Christoph Blecker Add skopeo to boilerplate image commit: de1f8d8aa7af04115fa2da8751c2d6a1f4227ddb author: Christoph Blecker Don't fail validate on changes to build/Dockerfile* commit: 4b929d2cb15df8fd9100797f39d67cdfa5dea0ab author: Christoph Blecker Always pull fresh images in our build pipeline commit: 89eaae4e4f08b7c1c4d4c168a64a1f6e2d6424e2 author: Christoph Blecker Write olm-registry dockerfile so that it can be updated by dependabot commit: 31dea5e0c0d561897eec99b72041b31a95e92e19 author: Ritu Mundhe Adding necessary "Test" prefix to e2e test runner function commit: 33deebe8c9f86d86aa773c9546d1545d06d0397c author: Ritu Mundhe whitespace cleanup commit: 09b943656d3d41ed617178935e3807c1e2922e3e author: Ritu Mundhe moved test files to osde2e base dir. Other minor fixes. (#270) * moved test files to osde2e base dir. Other minor fixes. * removed ginkgo.Recover() per openshift/boilerplate#269 commit: 08d5b433772ca42a7b541e6b31a0a0050d6b1d59 author: Dustin Row Scope GO vars per make target instead of global commit: 6f0542f471fbf37ced9e909a2e5bb29e7c1ac47e author: Ritu Mundhe renamed packagename without underscore commit: c1321df3f70091c8492dd4ce2cca4ba2ca49baaf author: Ritu Mundhe removing default target from osde2e convention commit: 7ceb63b0dcc24fdb829f652b943b414c5ffdc335 author: Dustin Row Rename osde2e convention commit: 566848f4eb17890aac7401536167e81e7642f037 author: Ritu Mundhe reverted dynamic var eval commit: 483a87cd016b84879adac3997d2af5806041bc26 author: Ritu Mundhe renamed variable conflicting with other convention dirs commit: b181cee588fa3373172fefbb5da1e7d5c2585f54 author: Ritu Mundhe added note about exclusive use by operators. commit: ff36e6cb4fb3f33cf26d34d38a4283de8cbd0b25 author: Ritu Mundhe convention renamed to focus on operators commit: f2283ca508e2f9af2e1f1d08e86051aefdad0386 author: Ritu Mundhe SDCICD-917 Added boilerplate for osde2e test harness (#262) * SDCICD-917 Added boilerplate for osde2e test harness * SDCICD-917 Moved into new osde2e dedicated convention * convention name commit: 56a55bd887dd24422f3b535cebda0ad3f9e8ac16 author: Michael Shen Update golangci-lint and removing deprecated checks: varcheck, structcheck, and deadcode Signed-off-by: Michael Shen <[email protected]> commit: f107cf95439ba3b90f3ad374f57a76e376b32c18 author: Ritu Mundhe SDCICD-854 adding /osde2e framework to operators. Need to exclude this folder from unit tests. commit: e86e8f484d2329dec8a0cabf9226d042d06d6c64 author: Christoph Blecker Remove deprecated lint checks commit: 8e970fe54984a8a3a4c674d4c96408413222b81f author: Christoph Blecker Fix containerized commands with podman on darwin commit: 282cad375410596eec181561b7a8b83b34944e0a author: Dustin Row Fix typo in name of OWNERS_ALIASES file commit: d6092c90093e6c7d49b5a7c703032002bd131a65 author: Dustin Row Add OWNER_ALIASES to golang-osd-operators commit: 1dae753a7765e57f27c028b738724ec34e723612 author: Dustin Row Remove trailing floating point adhere to MAJOR.MINOR-PATCH semver format commit: e254c36cd75db800235fa95c442871197cd4df24 author: Dustin Row Add dependabot configuration for OSD Operators and update Dockerfile commit: 87aee11f1a1f71b10ace91ba24c59773a0cb1ccc author: Christoph Blecker shallow clone release repo commit: 03d949e8c702b881535147d8662b371910211a29 author: Eric Fried Add mjlshen to OWNERS commit: 96624bfad5a806635da9200c20b2debcd075b391 author: Michael Shen Increment boilerplate image-v3.0.2 to speedup CI Signed-off-by: Michael Shen <[email protected]> commit: 0acfd19f21ba3e6b283a1812e0fcae4d9328785b author: Michael Shen Increment boilerplate image-v3.0.1 to get jq in the image Signed-off-by: Michael Shen <[email protected]> commit: 6d0572cec2e00a4d853f80d4a179379c4bf7938c author: Michael Shen Add the new go:build syntax for go fmt Signed-off-by: Michael Shen <[email protected]> commit: ba65c303d06b8f5d47b113da66bea82745aefdc6 author: Michael Shen Set GOEXPERIMENT=boringcrypto to enable fips moving forward https://go.googlesource.com/go/+/refs/heads/dev.boringcrypto/README.boringcrypto.md Signed-off-by: Michael Shen <[email protected]> commit: b85907a270357cef0599f678cae7f71aa007f8ff author: Michael Shen Update documentation around updating image tags Signed-off-by: Michael Shen <[email protected]> commit: 8637d3dae8ae644b87a922b31594305f3cc0c13c author: Michael Shen Remove old operator-sdk logic Signed-off-by: Michael Shen <[email protected]> commit: 56c1793ab4be2b5d5d7ed88b1f63bbc580980422 author: Michael Shen Release boilerplate v3.0.0 for Operator-SDK v1.25.0, Go 1.19 Signed-off-by: Michael Shen <[email protected]> commit: 94825f3cf075658be2cac702c0b64e6f037ef7c4 author: Andrew Pantuso fix: fix opm-build-push to use proper container engine name commit: 7c59357bf444030bc731acac184fed2aa8a2bf1a author: Andrew Pantuso fix: bump OPM version for opm-build-push commit: 7d3fe8364cdae48e94201f63d57ff20e0e470ed7 author: Andrew Pantuso fix: permit docker with config option for opm-build-push commit: 08bf780089af601a3554931e1342d81238286396 author: klin update ubi image tag commit: 93bb8c3b6f9636c582f4b1e642f259cf569283ab author: klin update ubi image commit: efe22eed1a95a5820f9011c979e8bc25933f2587 author: Supreeth Basabattini Add container-make targets commit: b8febb30962c92e9406143e24292249d38bc5064 author: Michael Shen Make env var optional for operator containers Signed-off-by: Michael Shen <[email protected]> commit: 6f0a5c1385f7b48ff30f7ae49cfbddee775ab88a author: Ravi Trivedi Ignoring autogenerated zz files for codecov commit: b2b57ed9f0d2ebe75dfeea3bb13d360aba460d8a author: Ravi Trivedi Ignoring mock clients for codecov commit: 9520d29ded3d9dda08172165e6e15bc31a72ce4c author: Matt Bargenquast Set main package to base dir in new SDK commit: 350f8631ecf20a852b82a0f90b7bcfea8ff19845 author: Antony Natale OSD-12367: update to fix skopeo version dependency (#236) * update to fix skopeo version dependency * typo fix * typo fix commit: 4c70ca1b4f70da2a3a4606e37bf0d2caa23dc120 author: Antony Natale fix quoting commit: b6c8caca3763c7d3b85783b327f29afbaecaaffb author: Antony Natale added more error checking commit: f6c47f83a2fff43c027d22ff2c93e56496f8e27f author: Antony Natale added other commented fixes from last PR commit: b71e2da17b3d1eb344b57ce6dad8637ac71561ff author: Antony Natale fixes error check on opm command commit: 7db0538e630305a5ba047aa7ceef7bd78adb8f86 author: Antony Natale OSD-11742, OSD-12367 - bug and CVE fixes for catalog operators (#234) * base changes and logic set, needs polishing * adds printout of first run, undos changes made for local testing * update custom catalog makefile to match golang and better handle podman vs docker * fix typos and clean up * made suggested changes * remove unwanted testing values commit: 79cb8136e506524e740d78aff414e419415017ea author: Alex Vulaj Only remove for darwin/mac commit: 21b4ed75091749567ff9f53367e4303f850a0ef5 author: Alex Vulaj Remove :Z mount option for podman in container-make commit: fe734d5a42331418c0630cfe1e86221e8e995320 author: Eric Fried Fix golang-lint README It touted the wrong `make` target name. commit: 7c5112a0a8e3d187f56384efac222200b9b10244 author: Benjamin Dematteo Fixing the variable assignment commit: 1a05b3e6572eb37bd2098267287afc3dc35dead9 author: Supreeth Basabattini Automate migration to an extent commit: 31bf3b7e35fc1f900aa7e1d8ae61e7c209182181 author: Ron Green feat(golangci): add gosec per ticket OSD-10161, this change should be running via CI on all osd operators. this way we are always compliant to the gosec (as we have done one audit a forever ago and cleaned issues this change should get approval before merging as this might cause initial work to upgrade to this version of boilerplate
tnierman · Jan 8, 2024 · f97bdfd · f97bdfd
1 parent 176ee22
commit f97bdfd
Show file tree

Hide file tree

Showing 32 changed files with 563 additions and 146 deletions.
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: boilerplate
   namespace: openshift
-  tag: image-v2.3.2
+  tag: image-v4.0.2
diff --git a/.codecov.yml b/.codecov.yml
@@ -24,3 +24,7 @@ comment:
   layout: "reach,diff,flags,tree"
   behavior: default
   require_changes: no
+
+ignore:
+  - "**/mocks"
+  - "**/zz_generated*.go"
diff --git a/.docker/config.json b/.docker/config.json
@@ -0,0 +1 @@
+{}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: "docker"
+    directory: "/build"
+    labels:
+      - "area/dependency"
+      - "ok-to-test"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "app-sre/boilerplate"
+        # don't upgrade boilerplate via these means
+      - dependency-name: "openshift4/ose-operator-registry"
+        # don't upgrade ose-operator-registry via these means
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -0,0 +1,82 @@
+# ================================ DO NOT EDIT ================================
+# This file is managed in https://github.com/openshift/boilerplate
+# See the OWNERS_ALIASES docs: https://git.k8s.io/community/contributors/guide/owners.md#OWNERS_ALIASES
+# =============================================================================
+aliases:
+  srep-functional-team-aurora:
+    - abyrne55
+    - bdematte
+    - boranx
+    - dakotalongRH
+    - lnguyen1401
+    - luis-falcon
+    - rafael-azevedo
+  srep-functional-team-fedramp:
+    - tonytheleg
+    - theautoroboto
+    - rhdedgar
+    - katherinelc321
+    - robotmaxtron
+    - rojasreinold
+  srep-functional-team-hulk:
+    - a7vicky
+    - rendhalver
+    - ravitri
+    - shitaljante
+    - weherdh
+    - devppratik
+  srep-functional-team-orange:
+    - bng0y
+    - typeid
+    - Makdaam
+    - Nikokolas3270
+    - ninabauer
+    - RaphaelBut
+    - Tessg22
+  srep-functional-team-rocket:
+    - aliceh
+    - anispate
+    - bdmiller3
+    - clcollins
+    - mjlshen
+    - tnierman
+    - yithian
+  srep-functional-team-security:
+    - gsleeman
+    - jaybeeunix
+    - sam-nguyen7
+    - wshearn
+  srep-functional-team-thor:
+    - bmeng
+    - MitaliBhalla
+    - hectorakemp
+    - feichashao
+    - Tafhim
+    - samanthajayasinghe
+  srep-functional-team-v1alpha1:
+    - iamkirkbater
+    - AlexVulaj
+    - T0MASD
+    - bergmannf
+    - dkeohane
+    - reedcort
+    - mrWinston
+  srep-functional-leads:
+    - rafael-azevedo
+    - iamkirkbater
+    - bng0y
+    - tonytheleg
+    - bmeng
+    - mjlshen
+    - sam-nguyen7
+    - ravitri
+  srep-team-leads:
+    - NautiluX
+    - rogbas
+    - fahlmant
+    - dustman9000
+    - wanghaoran1988
+  srep-architects:
+    - jewzaam
+    - jharrington22
+    - cblecker
diff --git a/boilerplate/_data/backing-image-tag b/boilerplate/_data/backing-image-tag
@@ -1 +1 @@
-image-v2.3.2
+image-v4.0.2
diff --git a/boilerplate/_data/last-boilerplate-commit b/boilerplate/_data/last-boilerplate-commit
@@ -1 +1 @@
-0a69514b0c6b0cec124afb603ae2fd2e02ec7fcd
+a48d90919cb9a4fe3b4bbd51ac6ef71ea1b49ed6
diff --git a/boilerplate/_lib/container-make b/boilerplate/_lib/container-make
@@ -19,10 +19,14 @@ CONTAINER_MOUNT=/go/src/$(repo_import $REPO_ROOT)
 
 # First set up a detached container with the repo mounted.
 banner "Starting the container"
+CE_OPTS="--platform=linux/amd64"
 if [[ "${CONTAINER_ENGINE##*/}" == "podman" ]]; then
-    CE_OPTS="--userns keep-id -v $REPO_ROOT:$CONTAINER_MOUNT:Z"
+    CE_OPTS="${CE_OPTS} --userns keep-id"
+fi
+if [[ "${CONTAINER_ENGINE##*/}" == "podman" ]] && [[ $OSTYPE == *"linux"* ]]; then
+    CE_OPTS="${CE_OPTS} -v $REPO_ROOT:$CONTAINER_MOUNT:Z"
 else
-    CE_OPTS="-v $REPO_ROOT:$CONTAINER_MOUNT"
+    CE_OPTS="${CE_OPTS} -v $REPO_ROOT:$CONTAINER_MOUNT"
 fi
 container_id=$($CONTAINER_ENGINE run -d ${CE_OPTS} $IMAGE_PULL_PATH sleep infinity)
 

diff --git a/boilerplate/_lib/freeze-check b/boilerplate/_lib/freeze-check
@@ -35,7 +35,7 @@ BOILERPLATE_GIT_REPO=https://github.com/openshift/boilerplate.git
 # and reapply the diff? Messy and error-prone -- and I would be
 # seriously ticked off if something went wrong and lost my in-flight
 # changes.
-if ! [ -z "$(git status --porcelain)" ]; then
+if ! [ -z "$(git status --porcelain -- ':!build/Dockerfile*')" ]; then
   echo "Can't validate boilerplate in a dirty repository. Please commit your changes and try again." >&2
   exit 1
 fi
@@ -70,9 +70,9 @@ cd $REPO_ROOT
 BOILERPLATE_GIT_CLONE="git clone $TMPD" boilerplate/update
 
 # Okay, if anything has changed, that's bad.
-if [[ $(git status --porcelain | wc -l) -ne 0 ]]; then
+if [[ $(git status --porcelain -- ':!build/Dockerfile*' | wc -l) -ne 0 ]]; then
   echo "Your boilerplate is dirty!" >&2
-  git status --porcelain
+  git status --porcelain -- ':!build/Dockerfile*'
   exit 1
 fi
 

diff --git a/boilerplate/_lib/release.sh b/boilerplate/_lib/release.sh
@@ -97,7 +97,7 @@ release_prep_clone() {
     # If a release repo clone wasn't specified, create one
     if [[ -z "$RELEASE_CLONE" ]]; then
         RELEASE_CLONE=$(mktemp -dt openshift_release_XXXXXXX)
-        git clone [email protected]:${RELEASE_REPO}.git $RELEASE_CLONE
+        git clone --depth=1 [email protected]:${RELEASE_REPO}.git $RELEASE_CLONE
     else
         [[ -z "$(git -C $RELEASE_CLONE status --porcelain)" ]] || err "
 Your release clone must start clean."

diff --git a/boilerplate/_lib/subscriber-report b/boilerplate/_lib/subscriber-report
@@ -11,4 +11,3 @@ SUBCOMMANDS=(
 )
 
 source $REPO_ROOT/boilerplate/_lib/subscriber.sh
-
diff --git a/boilerplate/_lib/subscriber.sh b/boilerplate/_lib/subscriber.sh
@@ -69,13 +69,11 @@ SUBSCRIBERS_FILE=$REPO_ROOT/subscribers.yaml
 #       all:        Prints all subscribers
 #       onboarded:  Prints only onboarded subscribers
 subscriber_list() {
-    local filt
     case $1 in
-        all) filt='[*]';;
+        all) yq '.subscribers[] | .name' $SUBSCRIBERS_FILE;;
         # TODO: Right now subscribers are only "manual".
-        onboarded) filt='(conventions.**.status==manual)';;
+        onboarded) yq '.subscribers[] | select(.conventions[].status == "manual") | .name' $SUBSCRIBERS_FILE;;
     esac
-    yq r $SUBSCRIBERS_FILE "subscribers${filt}.name"
 }
 
 ## last_bp_commit ORG/PROJ

diff --git a/boilerplate/openshift/golang-osd-operator/.codecov.yml b/boilerplate/openshift/golang-osd-operator/.codecov.yml
@@ -24,3 +24,7 @@ comment:
   layout: "reach,diff,flags,tree"
   behavior: default
   require_changes: no
+
+ignore:
+  - "**/mocks"
+  - "**/zz_generated*.go"
diff --git a/boilerplate/openshift/golang-osd-operator/Dockerfile.olm-registry b/boilerplate/openshift/golang-osd-operator/Dockerfile.olm-registry
@@ -0,0 +1,22 @@
+FROM registry.redhat.io/openshift4/ose-operator-registry:v4.12 AS builder
+ARG SAAS_OPERATOR_DIR
+COPY ${SAAS_OPERATOR_DIR} manifests
+RUN initializer --permissive
+
+# ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+
+COPY --from=builder /bin/registry-server /bin/registry-server
+COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
+COPY --from=builder /bin/initializer /bin/initializer
+
+WORKDIR /registry
+RUN chgrp -R 0 /registry && chmod -R g+rwx /registry
+
+USER 1001
+
+COPY --from=builder /registry /registry
+
+EXPOSE 50051
+
+CMD ["registry-server", "-t", "/tmp/terminate.log"]
diff --git a/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES b/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES
@@ -0,0 +1,82 @@
+# ================================ DO NOT EDIT ================================
+# This file is managed in https://github.com/openshift/boilerplate
+# See the OWNERS_ALIASES docs: https://git.k8s.io/community/contributors/guide/owners.md#OWNERS_ALIASES
+# =============================================================================
+aliases:
+  srep-functional-team-aurora:
+    - abyrne55
+    - bdematte
+    - boranx
+    - dakotalongRH
+    - lnguyen1401
+    - luis-falcon
+    - rafael-azevedo
+  srep-functional-team-fedramp:
+    - tonytheleg
+    - theautoroboto
+    - rhdedgar
+    - katherinelc321
+    - robotmaxtron
+    - rojasreinold
+  srep-functional-team-hulk:
+    - a7vicky
+    - rendhalver
+    - ravitri
+    - shitaljante
+    - weherdh
+    - devppratik
+  srep-functional-team-orange:
+    - bng0y
+    - typeid
+    - Makdaam
+    - Nikokolas3270
+    - ninabauer
+    - RaphaelBut
+    - Tessg22
+  srep-functional-team-rocket:
+    - aliceh
+    - anispate
+    - bdmiller3
+    - clcollins
+    - mjlshen
+    - tnierman
+    - yithian
+  srep-functional-team-security:
+    - gsleeman
+    - jaybeeunix
+    - sam-nguyen7
+    - wshearn
+  srep-functional-team-thor:
+    - bmeng
+    - MitaliBhalla
+    - hectorakemp
+    - feichashao
+    - Tafhim
+    - samanthajayasinghe
+  srep-functional-team-v1alpha1:
+    - iamkirkbater
+    - AlexVulaj
+    - T0MASD
+    - bergmannf
+    - dkeohane
+    - reedcort
+    - mrWinston
+  srep-functional-leads:
+    - rafael-azevedo
+    - iamkirkbater
+    - bng0y
+    - tonytheleg
+    - bmeng
+    - mjlshen
+    - sam-nguyen7
+    - ravitri
+  srep-team-leads:
+    - NautiluX
+    - rogbas
+    - fahlmant
+    - dustman9000
+    - wanghaoran1988
+  srep-architects:
+    - jewzaam
+    - jharrington22
+    - cblecker