Boilerplate: Update to 92d91d47e2f3d37db4314c10a27ff3bfbade1848

Conventions: - openshift/golang-osd-operator: Update - openshift/golang-osd-operator-osde2e: Subscribe --- openshift/boilerplate@8b55746...92d91d4 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 (openshift#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. (openshift#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 (openshift#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.
jbpratt · Jun 28, 2023 · 2799ec7 · 2799ec7
1 parent ffc9355
commit 2799ec7
Show file tree

Hide file tree

Showing 23 changed files with 357 additions and 55 deletions.
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: boilerplate
   namespace: openshift
-  tag: image-v3.0.2
+  tag: image-v3.0.3
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,3 +10,5 @@ updates:
     ignore:
       - dependency-name: "app-sre/boilerplate"
         # don't upgrade boilerplate via these means
+      - dependency-name: "openshift/origin-operator-registry"
+        # don't upgrade origin-operator-registry via these means
diff --git a/.gitignore b/.gitignore
@@ -91,5 +91,4 @@ build/_output
 # The docker hidden dir is created by make
 # for Jenkins credentials to work
 .docker/
-Dockerfile.olm-registry
 saas-cloud-ingress-operator-bundle
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -21,7 +21,6 @@ aliases:
   srep-functional-team-hulk:
     - mrbarge
     - a7vicky
-    - bmeng
     - jwai7
     - rendhalver
     - ravitri
@@ -51,13 +50,13 @@ aliases:
     - jaybeeunix
     - wshearn
   srep-functional-team-thor:
-    - wanghaoran1988
+    - bmeng
     - MitaliBhalla
     - hectorakemp
-    - reetika-vyas
     - feichashao
     - supreeth7
     - Tafhim
+    - samanthajayasinghe
   srep-functional-team-v1alpha1:
     - iamkirkbater
     - AlexVulaj
@@ -69,12 +68,12 @@ aliases:
   srep-functional-leads:
     - mrbarge
     - rafael-azevedo
-    - wanghaoran1988
     - sam-nguyen7
     - iamkirkbater
     - bng0y
     - tonytheleg
     - karthikperu7
+    - bmeng
   srep-team-leads:
     - cblecker
     - jharrington22
@@ -83,6 +82,7 @@ aliases:
     - jewzaam
     - fahlmant
     - dustman9000
+    - wanghaoran1988
   srep-architects:
     - jewzaam
     - jharrington22

diff --git a/boilerplate/_data/backing-image-tag b/boilerplate/_data/backing-image-tag
diff --git a/boilerplate/_data/last-boilerplate-commit b/boilerplate/_data/last-boilerplate-commit
@@ -1 +1 @@
-8b557469ea1d58589056779e80477d824e01cc6e
+92d91d47e2f3d37db4314c10a27ff3bfbade1848
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/generated-includes.mk b/boilerplate/generated-includes.mk
diff --git a/boilerplate/openshift/golang-osd-operator-osde2e/README.md b/boilerplate/openshift/golang-osd-operator-osde2e/README.md
diff --git a/boilerplate/openshift/golang-osd-operator-osde2e/e2e-harness-generate.sh b/boilerplate/openshift/golang-osd-operator-osde2e/e2e-harness-generate.sh
diff --git a/boilerplate/openshift/golang-osd-operator-osde2e/e2e-image-build-push.sh b/boilerplate/openshift/golang-osd-operator-osde2e/e2e-image-build-push.sh
diff --git a/boilerplate/openshift/golang-osd-operator-osde2e/project.mk b/boilerplate/openshift/golang-osd-operator-osde2e/project.mk
diff --git a/boilerplate/openshift/golang-osd-operator-osde2e/standard.mk b/boilerplate/openshift/golang-osd-operator-osde2e/standard.mk
diff --git a/boilerplate/openshift/golang-osd-operator/Dockerfile.olm-registry b/boilerplate/openshift/golang-osd-operator/Dockerfile.olm-registry