From 6572c6c0866b3ffd1129c57ca544b43ad8d6859e Mon Sep 17 00:00:00 2001 From: Brady Pratt Date: Tue, 20 Jun 2023 07:16:30 -0500 Subject: [PATCH] Boilerplate: Update to 92d91d47e2f3d37db4314c10a27ff3bfbade1848 Conventions: - openshift/golang-osd-operator: Update - openshift/golang-osd-operator-osde2e: Update --- https://github.com/openshift/boilerplate/compare/d3612328c972f49103b8fd1be49cd8b0a387c980...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 Signed-off-by: Brady Pratt --- OWNERS_ALIASES | 8 ++++---- boilerplate/_data/last-boilerplate-commit | 2 +- .../golang-osd-operator-osde2e/e2e-harness-generate.sh | 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 546fa7f..7a8591b 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 e3e490d..ca31985 100644 --- a/boilerplate/_data/last-boilerplate-commit +++ b/boilerplate/_data/last-boilerplate-commit @@ -1 +1 @@ -d3612328c972f49103b8fd1be49cd8b0a387c980 +92d91d47e2f3d37db4314c10a27ff3bfbade1848 diff --git a/boilerplate/openshift/golang-osd-operator-osde2e/e2e-harness-generate.sh b/boilerplate/openshift/golang-osd-operator-osde2e/e2e-harness-generate.sh index 66fbb0c..7476540 100755 --- a/boilerplate/openshift/golang-osd-operator-osde2e/e2e-harness-generate.sh +++ b/boilerplate/openshift/golang-osd-operator-osde2e/e2e-harness-generate.sh @@ -29,7 +29,7 @@ mkdir $HARNESS_DIR echo " # THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT. FROM registry.ci.openshift.org/openshift/release:golang-1.19 AS builder -WORKDIR /go/src/github.com/openshift/aws-vpce-operator/ +WORKDIR /go/src/github.com/openshift/$OPERATOR_NAME/ COPY . . RUN CGO_ENABLED=0 GOFLAGS=\"-mod=mod\" go test ./osde2e -v -c --tags=osde2e -o /harness.test diff --git a/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES b/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES index 546fa7f..7a8591b 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 06b55ad..ebf907b 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 9c44222..a9a89ad 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.7-8 +FROM registry.access.redhat.com/ubi8/ubi-micro:8.8-1 COPY --from=builder /bin/registry-server /bin/registry-server COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe