From 591060a64690f00f1fcc1aeee4b3e379f478ef21 Mon Sep 17 00:00:00 2001 From: Brady Pratt Date: Wed, 28 Jun 2023 06:39:18 -0500 Subject: [PATCH] Boilerplate: Update to 92d91d47e2f3d37db4314c10a27ff3bfbade1848 Conventions: - openshift/golang-osd-operator: Update --- https://github.com/openshift/boilerplate/compare/4bf1a5962d62e50592542657e42c97f3092e962b...92d91d47e2f3d37db4314c10a27ff3bfbade1848 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 https://github.com/kubernetes-sigs/controller-tools/pull/557. Signed-off-by: Michael Shen Co-authored-by: Alice Hubenko 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 * Update go base image version Co-authored-by: Michael Shen --------- Co-authored-by: Michael Shen 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 <2uasimojo@users.noreply.github.com> 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 <2uasimojo@users.noreply.github.com> commit: 19ae2a423b085b1ae0b650374570da1784a8daa3 author: Diego Santamaria Add acceptance Test convention commit: f9e6c350556d9d5845babbb46686639a01945d03 author: Diego Santamaria Initial Commit for PD boiletPlate --- OWNERS_ALIASES | 8 ++++---- boilerplate/_data/last-boilerplate-commit | 2 +- boilerplate/_lib/freeze-check | 2 +- boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES | 8 ++++---- boilerplate/openshift/golang-osd-operator/standard.mk | 2 +- build/Dockerfile.olm-registry | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 546fa7f5..7a8591b3 100644 --- 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/last-boilerplate-commit b/boilerplate/_data/last-boilerplate-commit index e0f99157..ca319856 100644 --- a/boilerplate/_data/last-boilerplate-commit +++ b/boilerplate/_data/last-boilerplate-commit @@ -1 +1 @@ -4bf1a5962d62e50592542657e42c97f3092e962b +92d91d47e2f3d37db4314c10a27ff3bfbade1848 diff --git a/boilerplate/_lib/freeze-check b/boilerplate/_lib/freeze-check index 7fb18ec3..080629f5 100755 --- 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 diff --git a/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES b/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES index 546fa7f5..7a8591b3 100644 --- a/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES +++ b/boilerplate/openshift/golang-osd-operator/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/openshift/golang-osd-operator/standard.mk b/boilerplate/openshift/golang-osd-operator/standard.mk index 06b55ad2..ebf907be 100644 --- a/boilerplate/openshift/golang-osd-operator/standard.mk +++ b/boilerplate/openshift/golang-osd-operator/standard.mk @@ -193,7 +193,7 @@ OPENAPI_GEN = openapi-gen .PHONY: op-generate ## CRD v1beta1 is no longer supported. op-generate: - cd ./api; $(CONTROLLER_GEN) crd:crdVersions=v1 paths=./... output:dir=$(PWD)/deploy/crds + cd ./api; $(CONTROLLER_GEN) crd:crdVersions=v1,generateEmbeddedObjectMeta=true paths=./... output:dir=$(PWD)/deploy/crds cd ./api; $(CONTROLLER_GEN) object paths=./... .PHONY: openapi-generate diff --git a/build/Dockerfile.olm-registry b/build/Dockerfile.olm-registry index a9a89ade..629b703e 100644 --- a/build/Dockerfile.olm-registry +++ b/build/Dockerfile.olm-registry @@ -3,7 +3,7 @@ ARG SAAS_OPERATOR_DIR COPY ${SAAS_OPERATOR_DIR} manifests RUN initializer --permissive -FROM registry.access.redhat.com/ubi8/ubi-micro:8.8-1 +FROM registry.access.redhat.com/ubi8/ubi-micro:8.8-3 COPY --from=builder /bin/registry-server /bin/registry-server COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe