Skip to content

Commit

Permalink
Boilerplate: Update to 92d91d47e2f3d37db4314c10a27ff3bfbade1848
Browse files Browse the repository at this point in the history
Conventions:
- openshift/golang-osd-operator: Update
- openshift/golang-osd-operator-osde2e: Update
---
openshift/boilerplate@d361232...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 <mshen@redhat.com>

Co-authored-by: Alice Hubenko <ahubenko@redhat.com>

commit: cac1395fbae95d2dc43aeeec649dc46c04d065c4
author: Bo Meng
update owners

commit: 4c6d460e088fc7520d58cfeb2e5f457228b6ec13
author: Ritu Mundhe
fixed hardcoded operator namein osde2e convention template

Signed-off-by: Brady Pratt <bpratt@redhat.com>
  • Loading branch information
jbpratt committed Jun 20, 2023
1 parent cf417e0 commit 6572c6c
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ aliases:
srep-functional-team-hulk:
- mrbarge
- a7vicky
- bmeng
- jwai7
- rendhalver
- ravitri
Expand Down Expand Up @@ -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
Expand All @@ -69,12 +68,12 @@ aliases:
srep-functional-leads:
- mrbarge
- rafael-azevedo
- wanghaoran1988
- sam-nguyen7
- iamkirkbater
- bng0y
- tonytheleg
- karthikperu7
- bmeng
srep-team-leads:
- cblecker
- jharrington22
Expand All @@ -83,6 +82,7 @@ aliases:
- jewzaam
- fahlmant
- dustman9000
- wanghaoran1988
srep-architects:
- jewzaam
- jharrington22
Expand Down
2 changes: 1 addition & 1 deletion boilerplate/_data/last-boilerplate-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d3612328c972f49103b8fd1be49cd8b0a387c980
92d91d47e2f3d37db4314c10a27ff3bfbade1848
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ aliases:
srep-functional-team-hulk:
- mrbarge
- a7vicky
- bmeng
- jwai7
- rendhalver
- ravitri
Expand Down Expand Up @@ -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
Expand All @@ -69,12 +68,12 @@ aliases:
srep-functional-leads:
- mrbarge
- rafael-azevedo
- wanghaoran1988
- sam-nguyen7
- iamkirkbater
- bng0y
- tonytheleg
- karthikperu7
- bmeng
srep-team-leads:
- cblecker
- jharrington22
Expand All @@ -83,6 +82,7 @@ aliases:
- jewzaam
- fahlmant
- dustman9000
- wanghaoran1988
srep-architects:
- jewzaam
- jharrington22
Expand Down
2 changes: 1 addition & 1 deletion boilerplate/openshift/golang-osd-operator/standard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.olm-registry
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6572c6c

Please sign in to comment.