⚠ Generate Embedded ObjectMeta in the CRDs, plus addressed comments #557

BlaineEXE · 2021-04-15T00:25:31Z

This PR addresses issue comments from #539, notably linking to a comment by @sttts. The original description of #539 is copied below.

This is desired for an issue we are seeing in Rook with CRD gen: rook/rook#7629
We wish to keep annotations in embedded object meta.

This PR makes it so embedded ObjectMeta in the CRD get's properly generated if the generator option generateEmbeddedObjectMeta=true is passed, this is needed because if a CRD has embedded ObjectMeta in any field and preserveUnknowFields is set to false, all the metadata will be lost when doing conversion between versions.

An example on how to have the embedded ObjectMeta generated in the resulting CRD

controller-gen crd:maxDescLen=0,generateEmbeddedObjectMeta=true paths=. output:dir=.

This PR makes it so by default any embedded ObjectMeta is not generated in the resulting CRD, however the top level ObjectMeta belonging to the CRD itself is never generated as the kubernetes API disallows changes to the CRD metadata between conversions.

The generated ObjectMeta is also only a subset of the original set of fields inside ObjectMeta this is due to the fact that other runtime fields are problematic if they are being traded with the kubernetes API, such as creationTimeStamp (rancher/rancher#23857) so this only generates name, namespace, labels, annotations and finalizers which from a design perspective should be enough. This follows the recommendation by @sttts who recommended a EmbeddedObjectMeta but instead of using a different type, we have a reduced set of fields that are "just enough" for a CRD design.

An example of why we need this is for example if a CRD had a volumeClaimTemplate (for an underlying statefulset) which include ObjectMeta such as Labels, Annotations and/org name which are meant to be passed to the PVC where getting lost between conversions.

This PR is based on the work by @arjunrn and @champak following the discussion on #448 and the PR #498 and it's also similar to #395 as it addressed the same problem, but adds the type casting for FieldsV1 and the requested argument to control this feature (per @DirectXMan12 on #395)

k8s-ci-robot · 2021-04-15T00:25:36Z

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: login-issues@jira.linuxfoundation.org

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

k8s-ci-robot · 2021-04-15T00:25:39Z

Welcome @BlaineEXE!

It looks like this is your first PR to kubernetes-sigs/controller-tools 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/controller-tools has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

pkg/crd/gen.go

make it so embedded ObjectMeta in the CRD get's properly generated if the generator option generateEmbeddedObjectMeta=true is passed, this is needed because if a CRD has embedded ObjectMeta in any field and preserveUnknowFields is set to false, all the metadata will be lost when doing conversion between versions. By default any embedded ObjectMeta is not generated in the resulting CRD, however the top level ObjectMeta belonging to the CRD itself is never generated as the kubernetes API disallows changes to the CRD metadata between conversions. The generated ObjectMeta is also only a subset of the original set of fields inside ObjectMeta this is due to the fact that other runtime fields are problematic if they are being traded with the kubernetes API, such as creationTimeStamp so this only generates name, namespace, labels, annotations and finalizers which from a design perspective should be enough. An example of why this is useful is if a CRD had a volumeClaimTemplate (for an underlying statefulset) which include ObjectMeta such as Labels, Annotations and/or name which are meant to be passed to the PVC. Also addresses the type of FieldsV1 being typed as "Any" and instead types it as "object"

Signed-off-by: Blaine Gardner <b.blaine.gardner@gmail.com>

DirectXMan12

/lgtm
/approve

k8s-ci-robot · 2021-04-20T22:06:30Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BlaineEXE, DirectXMan12

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [DirectXMan12]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Currently its not possible to specify the fields like name,namespace etc in the embeded metadata objects in the volumeClaim templates etc. adding generateEmbeddedObjectMeta to the controller-gen which allow us generated the CRD's with ObjectMeta. Ref: kubernetes-sigs/controller-tools#557 Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>

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>

Conventions: - openshift/golang-osd-operator: Update --- openshift/boilerplate@4bf1a59...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 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 <mishen@umich.edu> * Update go base image version Co-authored-by: Michael Shen <mishen@umich.edu> --------- Co-authored-by: Michael Shen <mishen@umich.edu> 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

Conventions: - openshift/golang-osd-operator: Update --- openshift/boilerplate@b8a9cf4...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 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

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

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>

Conventions: - openshift/golang-osd-operator: Update - openshift/golang-osd-operator-osde2e: Subscribe --- openshift/boilerplate@4bf1a59...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 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 <mishen@umich.edu> * Update go base image version Co-authored-by: Michael Shen <mishen@umich.edu> --------- Co-authored-by: Michael Shen <mishen@umich.edu> 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

Conventions: - openshift/golang-osd-operator: Update --- openshift/boilerplate@b8a9cf4...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 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

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>

Conventions: - openshift/golang-osd-operator: Update --- openshift/boilerplate@4bf1a59...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 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 <mishen@umich.edu> * Update go base image version Co-authored-by: Michael Shen <mishen@umich.edu> --------- Co-authored-by: Michael Shen <mishen@umich.edu> 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

Conventions: - openshift/golang-osd-operator: Update --- openshift/boilerplate@4bf1a59...851cc4a 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 <mshen@redhat.com> commit: e6dd946dc128b4c0a2354bb0221e60c713d29d35 author: Michael Shen Update after shift between rocket and security Signed-off-by: Michael Shen <mshen@redhat.com> 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 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 <mishen@umich.edu> * Update go base image version Co-authored-by: Michael Shen <mishen@umich.edu> --------- Co-authored-by: Michael Shen <mishen@umich.edu> 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

Conventions: - openshift/golang-osd-operator: Update - openshift/golang-osd-operator-osde2e: Subscribe --- openshift/boilerplate@4bf1a59...07564a3 commit: 816e2ffebdd62ec7a65b45a70bcb1eb2aec63add author: Michael Shen Add govulncheck to the boilerplate image This will be included in v3.0.5 Signed-off-by: Michael Shen <mishen@umich.edu> commit: 092b2f7156ddf8680441795c5bc126f74f6a4cd2 author: Michael Shen Fix bug with printing output in Makefiles Signed-off-by: Michael Shen <mshen@redhat.com> commit: cd0e87c2b4a8dcdae6da431074f23d12d38797de author: Michael Shen Bump base image to v3.0.4 in CI Signed-off-by: Michael Shen <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mshen@redhat.com> 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 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 <mishen@umich.edu> * Update go base image version Co-authored-by: Michael Shen <mishen@umich.edu> --------- Co-authored-by: Michael Shen <mishen@umich.edu> 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

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 <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 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 <mishen@umich.edu> * Update go base image version Co-authored-by: Michael Shen <mishen@umich.edu> --------- Co-authored-by: Michael Shen <mishen@umich.edu> 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 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 <mshen@redhat.com> commit: f107cf95439ba3b90f3ad374f57a76e376b32c18 author: Ritu Mundhe SDCICD-854 adding /osde2e framework to operators. Need to exclude this folder from unit tests.

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 <mshen@redhat.com> commit: 9183ddafe84cb0f4f571d836a116edb2bef6d558 author: Michael Shen We need to stay on RHEL 8 for compatible GCC versions Signed-off-by: Michael Shen <mshen@redhat.com> commit: 38335348c70c453c83a3a4b37cef0bd1a4201b68 author: Michael Shen use image-v4.0.0 in .ci-operator Signed-off-by: Michael Shen <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mishen@umich.edu> commit: 24fdf68d0161e7ee131f45e0e7ffb8e6da7ef8b7 author: Michael Shen Increment ci image to image-v3.0.6 Signed-off-by: Michael Shen <mishen@umich.edu> commit: d6a0b5760288c815c9ce8a2eeda497146ea36eff author: Michael Shen quay.io/app-sre/yq:4 has entrypoint yq Signed-off-by: Michael Shen <mishen@umich.edu> 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 <mshen@redhat.com> 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 <mishen@umich.edu> commit: 816e2ffebdd62ec7a65b45a70bcb1eb2aec63add author: Michael Shen Add govulncheck to the boilerplate image This will be included in v3.0.5 Signed-off-by: Michael Shen <mishen@umich.edu> commit: 092b2f7156ddf8680441795c5bc126f74f6a4cd2 author: Michael Shen Fix bug with printing output in Makefiles Signed-off-by: Michael Shen <mshen@redhat.com> commit: cd0e87c2b4a8dcdae6da431074f23d12d38797de author: Michael Shen Bump base image to v3.0.4 in CI Signed-off-by: Michael Shen <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mshen@redhat.com> 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 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 <mishen@umich.edu> * Update go base image version Co-authored-by: Michael Shen <mishen@umich.edu> --------- Co-authored-by: Michael Shen <mishen@umich.edu> 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 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 <mshen@redhat.com> 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 <mshen@redhat.com> commit: 0acfd19f21ba3e6b283a1812e0fcae4d9328785b author: Michael Shen Increment boilerplate image-v3.0.1 to get jq in the image Signed-off-by: Michael Shen <mshen@redhat.com> commit: 6d0572cec2e00a4d853f80d4a179379c4bf7938c author: Michael Shen Add the new go:build syntax for go fmt Signed-off-by: Michael Shen <mshen@redhat.com> 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 <mshen@redhat.com> commit: b85907a270357cef0599f678cae7f71aa007f8ff author: Michael Shen Update documentation around updating image tags Signed-off-by: Michael Shen <mshen@redhat.com> commit: 8637d3dae8ae644b87a922b31594305f3cc0c13c author: Michael Shen Remove old operator-sdk logic Signed-off-by: Michael Shen <mshen@redhat.com> commit: 56c1793ab4be2b5d5d7ed88b1f63bbc580980422 author: Michael Shen Release boilerplate v3.0.0 for Operator-SDK v1.25.0, Go 1.19 Signed-off-by: Michael Shen <mshen@redhat.com> 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 <mshen@redhat.com> 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

@dofinn

Conventions: - openshift/golang-osd-operator: Update --- openshift/boilerplate@0ba6566...5be0e41 commit: 723a44471cf0fe2cf6dcc4369d207d6c52a32aba author: Michael Shen Update e2e harness image to Go 1.22 * The openshift CI team no longer wishes to support the release/golang-* images moving forward Signed-off-by: Michael Shen <mshen@redhat.com> commit: e8a73611ad9810a8373401a3dd4cb40039663c24 author: Mariusz Mazur Add mmazur to reviewers/approvers With the RVMO work I had to familiarize myself with the olm bits of this, so while I couldn't ack any PR, I could ack some. commit: 39a99ee7771eb3e0652bff36ab23a6feffe8ec98 author: Shawn Bai Adding additional reviewers commit: d4f5e8add3d7afdd361c069d18ae7582943273bd author: Alice Hubenko [OSD-13681] Added a prefix 'g' to handle leading zeroes in CSV version (#373) * [OSD-13681] Added a prefix 'g' to handle leading zeroes in CSV version * Update boilerplate/openshift/golang-osd-operator/standard.mk Co-authored-by: Michael Shen <mishen@umich.edu> --------- Co-authored-by: Michael Shen <mishen@umich.edu> commit: ca54c30115e082b6813e343f115870de4b600df2 author: Michael Shen Ignore exit code when checking if image exists Signed-off-by: Michael Shen <mshen@redhat.com> commit: 212fbe20c141b80dd91378bffb2865f7d6e39598 author: Michael Shen Copy the node container auth file to allow pulling from registry.ci.openshift.org Signed-off-by: Michael Shen <mshen@redhat.com> commit: 72c3b82e6b8daceb25888a60aa55a5117b969e71 author: Michael Shen Fix app-sre-build-push after switch to podman Signed-off-by: Michael Shen <mshen@redhat.com> commit: bf2e4be777e374fe026c913f99fb47ee93ee0c52 author: Mariusz Mazur Don't specify TEMPLATE_FILE, but a TEMPLATE_DIR Package Operator supports multiple files. commit: 24a0d8214bb6f491950bbe387c6065191b9dfb1b author: Mariusz Mazur Extract actual REPO_NAME and pass to rvmo script commit: 5ec08872c70650bc6ca5900576c63690179720c7 author: Christoph Blecker Bump golangci-lint version commit: deae323b261ce058d4f876febf79e6c466a62c41 author: Christoph Blecker Enable spellchecking in boilerplate repos commit: b802a1386de27c4a82327c8d4303dfcbc404766a author: Mariusz Mazur Ensure $RELEASE_BRANCHED_BUILDS access in called scripts commit: 914b3cb21509697caaf596fe2afc45ce48034d62 author: Mariusz Mazur Create release- branches for olm bundle repo from master Having anything there might cause issues. commit: 7b6ef75a05cc1a455d895ed2cadaa031d0dcb699 author: Mariusz Mazur Take container auth file from jenkins commit: a8f545c2189b25b161fd6b9403ba45b814eed70f author: Mariusz Mazur Give RVMO code path proper version detection commit: a2ccef190dc761eee12fcdbfc29b70d146f4f33b author: Ritu Mundhe use CLOUD_PROVIDER_REGION for region so that we don't need multiple cloud specific region env vars commit: b4498b34f115e85864e0642456cbf65fcbd0d3e7 author: Michael Shen Collapse build_image scripts into one This avoids having to maintain older scripts which were not being used in practice and lets us better leverage git. Signed-off-by: Michael Shen <mshen@redhat.com> commit: 3750a89ca19f41ce6956f4bdc6e29af1edc0cd7b author: Michael Shen Validate controller-gen code-generation Signed-off-by: Michael Shen <mshen@redhat.com> commit: 8914d7f99f5d684c6866df62b0cb3040ad50049f author: Michael Shen Update boilerplate to support Go 1.22 Signed-off-by: Michael Shen <mshen@redhat.com> commit: 03dc7a163c4c5f68f3ec4e06f6cef118d0a9a8eb author: Brady Pratt golang-osd-operator: resolve BRANCH and fix REPOSITORY REPOSITORY should be https, not ssh The branch that is cloned of `openshift/managed-release-bundle-osd` should be the branch that the current branch of the operator executing the make target. Get the branch and pass it into the bundle script. Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 310e8ab7f2ecf185e2e3841dd7601a77953904ce author: Ritu Mundhe add GCP params to harness osde2e job template commit: d76c7aa1dbb6b65989573e8f07295a9c138fb8a4 author: Brady Pratt golang-osd-operator: new name for mrb-osd repo Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 98f96d5e24060fbf52baf913ae572ee55be33414 author: Brady Pratt golang-osd-operator: check remote and checkout check the remote if the branch exists so we don't pull all branches locally and checkout the expected branch otherwise also checkout new branch based on production Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: ad4a09104312d8a5e275f6559c2ca3128d75be05 author: Brady Pratt golang-osd-operator: set VERSION_MAJOR/MINOR when RELEASE_BRANCHED_BUILDS is set and the branch name matches the release-4.\d\d expression, set VERSION_MAJOR and VERSION_MINOR to be the version contained in the branch name This will make branching easier so we don't have to set up the versions per branch Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 5a2a4101c822be1ebec93841cb66e230896bed15 author: Brady Pratt golang-osd-operator: revert loop skopeo copy the else condition is incorrect and needs to push `<channel>-latest` to `<channel>-<commit hash>`. Revert back to the original state to unblock pipeline builds Will try to follow up with a fix to the improved state Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 8174bc79c08890d10cc7e46b61e9a94ca6fab044 author: Brady Pratt golang-osd-operator: only checkout new branch on RELEASE_BRANCHED_BUILDS this broke the build pipelines as they would checkout production and track is based on staging which would lead to a failure when pushing the branch ``` ... 10:14:40 Switched to a new branch 'production' 10:14:40 Branch 'production' set up to track remote branch 'staging' from 'origin'. ... ``` ``` 10:14:49 To https://gitlab.cee.redhat.com/service/saas-managed-upgrade-operator-bundle.git 10:14:49 ! [rejected] HEAD -> production (non-fast-forward) 10:14:49 error: failed to push some refs to 'https://app:****@gitlab.cee.redhat.com/service/saas-managed-upgrade-operator-bundle.git' 10:14:49 hint: Updates were rejected because the tip of your current branch is behind 10:14:49 hint: its remote counterpart. Integrate the remote changes (e.g. 10:14:49 hint: 'git pull ...') before pushing again. 10:14:49 hint: See the 'Note about fast-forwards' in 'git push --help' for details. 10:14:49 make[1]: *** [production-catalog-publish] Error 1 ``` Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: b884b5f9f78e76a9997020911aa2b81618af55fd author: Michael Shen fix bug where quotes were not escaped correctly Signed-off-by: Michael Shen <mshen@redhat.com> commit: 1cff2876193a8b9475344458b8d17e409186613e author: Michael Shen Add DISABLE_JUNIT_REPORT to skip JUnit report generation when running locally Signed-off-by: Michael Shen <mshen@redhat.com> commit: f28630ff568e6d76e2f02e62f56e7215f6973081 author: Michael Shen Update harness e2e image to use Go 1.21 Signed-off-by: Michael Shen <mshen@redhat.com> commit: b987b220a2248d105af7e0385ee9ccf4537c2524 author: Kirk Bater Update OWNERS_ALIASES Updates Team Rocket Owners commit: 8d0ab48f03401cb9fec862c00e10a5c5fd32bf58 author: Eric Fried DRY some script loops Followon from #350. commit: d40d2d1b9f385ab0847f30f060c407a8bdb24e82 author: Brady Pratt golang-osd-operator: checkout new release branch the release-4.Y branch won't exist initially and needs to be created based on the staging branch. Create it and use it if it does not exist. ``` fatal: Remote branch release-4.15 not found in upstream origin ``` Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 56a079fa142892f30cb34536c5663d1bd0d5e8c7 author: Brady Pratt golang-osd-operator: exit 0 and add comment feedback from #350, make it obvious the these exits are a success case and add a comment explaining the string manipulation Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 12171070a25de32ffab7df9a373301f250db5dd2 author: Brady Pratt golang-osd-operator: SaaS repo versioned branches allow for cloning/publishing the SaaS repo with the specific version branch. Update the other reference to push HEAD of what we are currently on Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 39204d474a5c6df765ca5a80b63bf4872467822d author: Brady Pratt common: image_exists_in_repo check stdout a newer version of skopeo changed loggers which had an effect on the stderr now being written to stdout. Update the conditions to check stdout to allow newer versions to work as expected. ``` ❯ podman run docker://quay.io/skopeo/stable:v1.7.0 inspect docker://quay.io/bpratt/image-does-not-exist:latest 2>/dev/null ❯ skopeo --version skopeo version 1.15.0 ❯ skopeo inspect docker://quay.io/bpratt/image-does-not-exist:latest 2>/dev/null FATA[0000] Error parsing image name "docker://quay.io/bpratt/image-does-not-exist:latest": reading manifest latest in quay.io/bpratt/image-does-not-exist: unauthorized: access to the requested resource is not authorized ``` Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 370563f844932148f4eb2eea36f614330741fa1f author: Brady Pratt golang-osd-operator: publish registry per branch when RELEASE_BRANCHING_OPT_IN is set, change the tag of the registry image to be OPERATOR_NEW_VERSION instead of production/stage-<commit> Add conditionals around the existing behavior to allow this to be slowly rolled out to the operators. Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 96528a639f1d2bf88fa4ca1c053eac99928cb36b author: Brady Pratt golang-osd-operator: add stable catalog channel Add a new stable channel to eventually drop the building of "production" and "staging" single channel catalogs in favor of building a single channel catalog image per Y stream branch. The operators will need to set VERSION_MAJOR/VERSION_MINOR in order to have incrementing versions between branches allowing for upgrades between Y releases. Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 9abcd43fa6cc07b804084ef61b5e225c3c27f105 author: feichashao update ose-operator-registry commit: 3511d1c4c2e6c545b552507a76871dfc2d5b9cb6 author: Brady Pratt golang-osd-operator: set olm database location OLM sets a standard label on registry images to point to the declarative config location (be it an sqlite database or flat files). This labels allows for `opm migrate ...` to process the registry image and migrate to the new file-based format. Without this label, the `migrate` subcommand is unable to locate the declarative config to load. https://github.com/operator-framework/operator-registry/blob/9fdedc29d2575e021128050c5ef532f730fce2a5/pkg/containertools/dockerfilegenerator.go#L12-L13 This will help ease the migration process from the deprecated sqlite-based catalogs to the file-based catalog format. before: ``` ❯ opm migrate quay.io/app-sre/must-gather-operator-registry:staging-latest . INFO[0000] rendering index "quay.io/app-sre/must-gather-operator-registry:staging-latest" as file-based catalog FATA[0002] render catalog image: render reference "quay.io/app-sre/must-gather-operator-registry:staging-latest": render "quay.io/app-sre/must-gather-operator-registry:staging-latest": image type could not be determined, found labels ... ``` apply changes and rebuild: ``` ❯ make staging-catalog-build boilerplate/openshift/golang-osd-operator/standard.mk:113: Setting GOEXPERIMENT=strictfipsruntime,boringcrypto - this generally causes builds to fail unless building inside the provided Dockerfile. If building locally consider calling 'go build .' go: unknown GOEXPERIMENT strictfipsruntime [1/2] STEP 1/4: FROM registry.redhat.io/openshift4/ose-operator-registry:v4.12 AS builder Trying to pull registry.redhat.io/openshift4/ose-operator-registry:v4.12... ... [2/2] STEP 11/11: LABEL operators.operatorframework.io.index.database.v1=/registry/bundles.db [2/2] COMMIT quay.io/app-sre/must-gather-operator-registry:staging-latest --> 30ab80a68e7a Successfully tagged quay.io/app-sre/must-gather-operator-registry:staging-latest 30ab80a68e7a4b053e8a3fd9e07d5b02cfed032cd5e58eb536a2c7390696ab06 ❯ podman tag quay.io/app-sre/must-gather-operator-registry:staging-latest ghcr.io/jbpratt/mgo-registry:staging-latest ❯ podman push ghcr.io/jbpratt/mgo-registry:staging-latest ``` after: ``` ❯ opm migrate ghcr.io/jbpratt/mgo-registry:staging-latest . INFO[0000] rendering index "ghcr.io/jbpratt/mgo-registry:staging-latest" as file-based catalog WARN[0006] DEPRECATION NOTICE: Sqlite-based catalogs and their related subcommands are deprecated. Support for them will be removed in a future release. Please migrate your catalog workflows to the new file-based catalog format. INFO[0006] wrote rendered file-based catalog to "." ❯ cat must-gather-operator/catalog.json | head { "schema": "olm.package", "name": "must-gather-operator", "defaultChannel": "staging" } { "schema": "olm.channel", "name": "staging", "package": "must-gather-operator", "entries": [ ``` Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 2056b6bdbb20c3652e19837ed72408556d7b91d3 author: sam-nguyen7 Update OWNERS_ALIASES commit: d74af071286c305cb269c87c2c760f6ea77e492b author: Florian Bergmann Do exit with 0 code instead of 1 if directory already exists. commit: 4f068877df94a89c7708b48abded5066ae35e038 author: Florian Bergmann Do not create a bundle that replaces itself. In certain cases it can happen that this tries to create a bundle that replaces itself, which will lead to installation failures. As commits that create the same version should not be allowed in csv-generate.sh by checking for reverts, it should be safe to simply error out, as this seems to only happen, when an existing bundle gets updated with the incorrect replace, after it initially had the correct 'replaces' statement. This commit adds two checks (and the one in the python code should not really ever be hit): - Make sure that a bundle that already exists is not regenerated in the shell script. - Error out in the python script that actually writes the files if the previous_version == current_version (if this gets called somewhere else the initial check might not be in place). commit: f80d7d3b22e0055de63d550c1d32a16c25b20fdb author: Michael Shen Revert using containerized skopeo We would need to mount the docker/podman sockets as a file mount for this to truly work and instead performed a workaround on the Jenkins VMs. Signed-off-by: Michael Shen <mshen@redhat.com> commit: 70f4f3e41146868b5ca0d52b917ccfea09fac5f8 author: Michael Shen Limit controller-runtime to v0.17.2 for Go 1.21 support Signed-off-by: Michael Shen <mshen@redhat.com> commit: d11572e7fe85fd5c236d430c2d047ddf5b3869c3 author: Michael Shen Update push steps to use containerized skopeo Signed-off-by: Michael Shen <mshen@redhat.com> commit: 5e86a99159abf0f428e9568e624cf1fc3bc9280e author: Brady Pratt golang-osd-operator: use new path to TEMPLATE_FILE this file will not exist in most repositories yet, it will need to be added during the migration process Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: aad1f1f7fab42ece64fc88aa3ff61244c60bb09b author: Michael Shen Update docs link for location for openshift/release mirroring Signed-off-by: Michael Shen <mshen@redhat.com> commit: 802e445d71269d6222c876625cbfa62e60ace952 author: Ritu Mundhe Update golangci lint version commit: f67d44013d4bc051df8819624eb300d6cc16974b author: Kirk Bater Update OWNERS_ALIASES Removes Team v1a. commit: e5b6c598d3b71a2701ec663a8556f63f009187b0 author: Claudio Busse Dockerfile.appsre: fix ci image name from build farm commit: c0f1454be240aeadda950719868a17a95c756cf4 author: Claudio Busse Use existing container engine instead of podman commit: ce86987696a5bddc54dd9cbbb7720ed74927374a author: typeid Fix build push (#335) * Fix build-push script for boilerplate to build latest tag if it doesn't exist * Validate returned output of inspect and checkout tag commit: 532a19ca42db4d73f6c51a8b9b779bbd7ec4ecb6 author: Chris Collins Replaces egrep with grep -E due to deprecation [egrep is being deprecated in favor of grep -e](https://lists.gnu.org/archive/html/info-gnu/2022-09/msg00001.html), and now throws warnings about the deprecation when being used. This PR replaces `egrep` with `grep -E`, which should be a drop in replacement, handle the deprecation when it happens, and suppress the warnings that are printed every time we run the `make` command with boilerplate. Signed-off-by: Chris Collins <collins.christopher@gmail.com> commit: 7752da0184b22a32162f29676f2fbe67f8b49d81 author: Claudio Busse Empty commit to re-tag image-v5.0.0 commit: 70f2f2d539355d6ea52979d1a1cfaff58f8b2b71 author: Antony Natale updates fl list, adds new fedramp team sre's commit: 31a961f645f450eca0d738df2c2a701e1b356c02 author: Michael Shen Leaver process - bdmiller3 Signed-off-by: Michael Shen <mshen@redhat.com> commit: d80ca839f04fb651dfa070558ded1fa18c466577 author: Claudio Busse Add Benson as TL and Nico as FL commit: 26cc7d3aef3fc8ed1edd0fde32d61b78608557c6 author: Claudio Busse Create boilerplate v5.0.0 to support Go 1.21 commit: d033aef49e14b4ddd74ecbe505e3399c9b4625bc author: Brady Pratt golang-osd-operator: bundle rvmo Signed-off-by: Brady Pratt <bpratt@redhat.com> commit: 84ef94271c76e2b576fd612294746eace8a54865 author: Chris Collins Subscribe compliance-audit-router (CAR) to boilerplate Adds openshift/compliance-audit-router (CAR) to the boilerplate subscribers.yaml, with the osd-container-image convention. Signed-off-by: Chris Collins <collins.christopher@gmail.com> commit: f7a78274e657627b94a26a145acebd91c750b32b author: Maor Friedman add SRE group leads to owners aliases 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 <mshen@redhat.com> commit: 9183ddafe84cb0f4f571d836a116edb2bef6d558 author: Michael Shen We need to stay on RHEL 8 for compatible GCC versions Signed-off-by: Michael Shen <mshen@redhat.com> commit: 38335348c70c453c83a3a4b37cef0bd1a4201b68 author: Michael Shen use image-v4.0.0 in .ci-operator Signed-off-by: Michael Shen <mshen@redhat.com> 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 <mshen@redhat.com> commit: 741bd9fc3f5640865015f72966a214d1eaed6715 author: Trevor Nierman OSD-18002 - Prevent operator commit reverts commit: bd72354b8bbe2f9c67fc0b1f73fa1390fc5c3c67 author: Sam Nguyen Update Team Security members 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 <mshen@redhat.com> 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 <mishen@umich.edu> commit: 24fdf68d0161e7ee131f45e0e7ffb8e6da7ef8b7 author: Michael Shen Increment ci image to image-v3.0.6 Signed-off-by: Michael Shen <mishen@umich.edu> commit: d6a0b5760288c815c9ce8a2eeda497146ea36eff author: Michael Shen quay.io/app-sre/yq:4 has entrypoint yq Signed-off-by: Michael Shen <mishen@umich.edu> 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 <mshen@redhat.com> 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 <mishen@umich.edu> commit: 816e2ffebdd62ec7a65b45a70bcb1eb2aec63add author: Michael Shen Add govulncheck to the boilerplate image This will be included in v3.0.5 Signed-off-by: Michael Shen <mishen@umich.edu> commit: 092b2f7156ddf8680441795c5bc126f74f6a4cd2 author: Michael Shen Fix bug with printing output in Makefiles Signed-off-by: Michael Shen <mshen@redhat.com> commit: cd0e87c2b4a8dcdae6da431074f23d12d38797de author: Michael Shen Bump base image to v3.0.4 in CI Signed-off-by: Michael Shen <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mshen@redhat.com> 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 <mshen@redhat.com> 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 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 <mishen@umich.edu> * Update go base image version Co-authored-by: Michael Shen <mishen@umich.edu> --------- Co-authored-by: Michael Shen <mishen@umich.edu> 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 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 <mshen@redhat.com> 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 <mshen@redhat.com> commit: 0acfd19f21ba3e6b283a1812e0fcae4d9328785b author: Michael Shen Increment boilerplate image-v3.0.1 to get jq in the image Signed-off-by: Michael Shen <mshen@redhat.com> commit: 6d0572cec2e00a4d853f80d4a179379c4bf7938c author: Michael Shen Add the new go:build syntax for go fmt Signed-off-by: Michael Shen <mshen@redhat.com> 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 <mshen@redhat.com> commit: b85907a270357cef0599f678cae7f71aa007f8ff author: Michael Shen Update documentation around updating image tags Signed-off-by: Michael Shen <mshen@redhat.com> commit: 8637d3dae8ae644b87a922b31594305f3cc0c13c author: Michael Shen Remove old operator-sdk logic Signed-off-by: Michael Shen <mshen@redhat.com> commit: 56c1793ab4be2b5d5d7ed88b1f63bbc580980422 author: Michael Shen Release boilerplate v3.0.0 for Operator-SDK v1.25.0, Go 1.19 Signed-off-by: Michael Shen <mshen@redhat.com> 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 <mshen@redhat.com> 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: 8e0880fc695a2421cdd400249690a997ce50ff11 author: Antony Natale changes source of operator name as it is not compatible with jenkins pipeline commit: 9744d76fc22d4b838dadee9fb229f5e591e837ac author: John Roche Change to a template file commit: ec6e7a3e70bb23401df5f7e333569fdef2535c4e author: Supreeth Basabattini Remove support for CRDv1beta1 in boilerplate Removed op-generate-crd-fixup test case commit: 16924d60224e73f7d5b82c652fc9e28fb18794a5 author: Ravi Trivedi Adding initializer for debugging purpose commit: ffc15d3682ce1f84f37499fd65c472dc60623ecf author: Haoran Wang generate CRD v1 by default commit: 1e947d2b7daee575dbc0283c647b9945a8081c8f author: Haoran Wang 1. Set a home dir that are writable when do go test to workaround the (#224) issue we have in openshift ci 2. Set the test binary bin dir to a tmp dir commit: 8f3dfee52954fecbb9b834676f3bfc435619d9d7 author: Supreeth Basabattini Remove explicit configuration of envtest bin directory commit: 95509602ef9a3fe37a23f3b15d0f013918d2cebb author: Supreeth Basabattini Fix openapi-gen versioning for new o-sdk commit: 39cc9e896380f04987f92d5a5aeec331966e2d1e author: Supreeth Basabattini Include openapi-gen and setup-envtest in the backing image commit: 1d6d39398ec892deec3add7f9b0c3d616af1a60a author: Supreeth Basabattini Fix incorrect bash syntax commit: 1f0fa3dc4630b115897dcadf1cf2f25edfa3a731 author: Ravi Trivedi Rebuild registry image from 4.10.0 into a ubi-micro image commit: bac2488ea130d26848df3cba7ccc1ef98496b436 author: Haoran Wang Update boilerplate to support latest osdk use controller-gen v0.3.0 when it's using old osdk Address some comments use controller-gen in the baking image commit: 210292d58116f6c5981e1ab43b5d6543fb8a070d author: Haoran Wang install v0.8.0 controller-gen in the backing image commit: 9fa3022a5f8c00b7f5e1e10f6f935162c1741a21 author: John Roche make target for fips on osd operators commit: e35d0f5c1aa9ef8b22ede5e2bd7f674d2f07b3ba author: Michael Shen Initial prow-config addition Signed-off-by: Michael Shen <mshen@redhat.com> commit: a078e1ce4ffd8607b13f398e7bcab5cc759fa864 author: Michael Shen Unexport GOFLAGS to fix bug when using container-make Signed-off-by: Michael Shen <mshen@redhat.com> commit: b99a046991521f41600c897354009b93dee15e33 author: Benjamin Dematteo Fixing errors from golang-lint (in standard.mk) commit: 3560610f126217211ad9663f8e5729ffee2735c6 author: Benson Ngoy USER 1001 doesn't have pip install permissions + updating pip commit: bbf4703f01903064bf1d2f79a0e893f8535ce048 author: Wesley Hearn [OSD-10491] Bump urllib3 version (#209) * [OSD-10491] Bump urllib3 version * Update catalog-build.sh Remove the --upgrade from the pip3 install commit: c06911de4e086ff74e40cc31f018a71f72b9b408 author: Michael Shen Initial commit for osd-container-image convention Signed-off-by: Michael Shen <mshen@redhat.com> commit: b924e51f50330cd4e7279acc102b7e1adc29f338 author: Benjamin Dematteo update README for new conventions commit: 7788244648e463fac115937799297d6eab204179 author: Benjamin Dematteo updating with PR Review comments commit: 1c13a6d23ef92603bbae32d5fb8f543789fc579c author: Christoph Blecker Update image tag in test files commit: 4d1f8a2678f70f7c64c0ae16800049e3feee64cc author: Christoph Blecker Update build_image script to work with RHEL8/go1.17 commit: 35820443749339ecb2f9d5d5ff7df0f43b159776 author: Christoph Blecker Switch to RHEL8 builder image commit: 03deceeda6b7b39b22e4eae06d59de78e5fdbbf0 author: Eric Fried Update README for image tagging quirks Clarify a couple of things in the README wrt image tagging: - You have to push the new tag to your `origin` as well as `upstream`. - You have to edit the tag in a couple of in-repo files as well. commit: b1c28646013edcecdcc7ab0631bd43c3183184b4 author: Eric Fried Fix broken link in README The release repo moved the file where we import our backing image. 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 commit: 7d81a9d4ba6ed1b17ed0f0ceee85cb9def9884d4 author: Benjamin Dematteo Initial commit for golang-codecov and golang-lint conventions commit: 35c3064256d88136a6eaa75ced0660a7426d3c70 author: Eric Fried Remove support for hack/generate-operator-bundle.py Support for using a "local" (within the consuming repo) hack/generate-operator-bundle.py script was included as a bridge while consumers were cutting over to use the common bundle generator. That has happened. Get rid of the old script, make targets, and support. commit: 5f249984fba668d090b3ee2194dd0e98e506d43c author: Ron Green fix(CONTAINER_ENGINE): allow setting the env after #201 didn't work, I updated it a bit now you can set the env and it's not overriden commit: 304c86f779a2b8cb3daf8f02ae06fc0afe158bca author: Matt Bargenquast Support empty SaaS repositories commit: aa424cb414d16f5227ad15815487932f3ea7276c author: Ron Green fix(CONTAINER_ENGINE): allow setting the env this allows setting the image from an external source (additional checks might be required) commit: 2c52f542c9e5baf4bd77ed126e70c0c207829cdc author: Christoph Blecker Always re-pull the FROM images on container build commit: e2466bb12ad455410516761fdc90e9ea2381439d author: Matt Bargenquast App-SRE testing docs should suggest to rebase saas fork commit: 4cc462fca11eecd6e25b3ffca74a7b966470d623 author: Eric Fried golang-osd-operator appsre: Fix docker login When stealing (ahem, "reappropriating") podman/docker-accommodating App-SRE pipeline code when hive switched to a rhel8 jenkins node, we found a latent bug on the docker side: the `REGISTRY_AUTH_FILE` variable needs to point to an actual file, not just the directory in which the file is located. Contributing the fix back "upstream". commit: eefc1c43ec3a9717f6017fd747134568192e634d author: Candace Sheremeta Add OPERATOR_IMAGE as an env var for OSD operators commit: 1e7de2c16f088bbb18c7a83835870c3e6a35318b author: Dustin Row Add --pull to build command for operator-registry build for security fixes commit: 14bb7be131c97bb6271e78c4c211224f6d9a775d author: Dustin Row Revert "Update operator-registry base image to 4.9.0" commit: 3af04216b99e713d24a3ba527c283d9f45c3e7df author: Dustin Row Update operator-registry base image to 4.9.0 commit: 8f2bc55518f69bd5cd6cd9c73cba4b689fce5858 author: Karthik Perumal more loose ends being fixed commit: 4ab8860af2acc2eebc38ce96247134df4a432a83 author: Karthik Perumal Fix a few small issues with custom catalog convention commit: 253f82a45b2f5f57302e59ca6f355201ff9860bb author: Karthik Perumal Apply suggestions from code review Co-authored-by: Eric Fried <2uasimojo@users.noreply.github.com> commit: cc0ae4d07927030d527849d0834b84ba0fd51b2e author: Karthik Perumal fix make default target's grep Co-authored-by: Eric Fried <2uasimojo@users.noreply.github.com> commit: 9d78a55603eeb6f312e18ce1a8e23b41b5e7e6bf author: Karthik Perumal clean-up custom catalog convention as per review commit: b8892e15fd675c2f137a1b20df604c6a95a5b1d3 author: Karthik Perumal fix typo Co-authored-by: Eric Fried <2uasimojo@users.noreply.github.com> commit: 6c8a1d587dd975b0bced42560c85399cf3b1500d author: Karthik Perumal Add custom-catalog-osd-operator convention to boilerplate upstream [OSD-7284] commit: e26f6048109a5403a55f3008fee7c66e29e93c82 author: Benson Ngoy OSD-7604 - CRDs don't have a spec.version field in v1 commit: 5ad097e2fd2103bfe9bd007a68c5d3bc46e95fbe author: Eric Fried podman enablement - Podman and docker use different mechanisms to override the default path to the credentials cache. Accommodate both. - Podman and docker use different transport prefixes to reference locally built images via skopeo. Accommodate both. - Expand addition of `--userns keep-id` and `-v ...:Z` to more places. - Resolve OSD-6941 by detecting the container engine in catalog-build.sh. Co-Authored-By: @dofinn commit: 2ceeef142460be66ac28fb9f9fbcd42d64c89d9d author: Eric Fried Support CRD v1 (optional) By default, `make op-generate` will now generate CRD v1. Setting the `make` variable `CRD_VERSION=v1beta1` will override this behavior and build v1beta1 as before. OSD-5869 commit: fd46dd207919143b42db39ea73b20a0ae530aa5c author: Eric Fried Remove codecov secret mapping stuff This is no longer applicable since the move to self-service vault. commit: deb98557f3fe39ba318e9890e93aac5d6a72a739 author: Eric Fried Skip update/revert test case if at master If we're already at master (which happens e.g. during rehearsals on CI config updates), the 04-update-from-master-and-revert test is a) silly, and b) going to fail when attempting `boilerplate-commit` because there's nothing to update and therefore nothing to commit. Add logic to short out of this test case in this scenario. commit: 7ac2a583973b4799c685d701d784624bb815b729 author: Dominic Finn Update boilerplate/_lib/container-make commit: 42e4047700fbf04e5ee984a092562208ed33bc14 author: Dominic Finn Update boilerplate/_lib/container-make commit: 7dd43153c50332aa1cc9ba02db6231a3b026edcb author: Dominic Finn enable make generate locally commit: 2714e7c4a11d931ee8272b55c49445437ce2273a author: Eric Fried image-v2.1.0: add `gh` Add the `gh` (GitHub CLI) executable to the backing image so CICD jobs can do consumer reports. Part of OSD-5962 commit: 8bc4fa86071070d417e81170b1f6c37ea8c4756e author: Eric Fried Add `make subscriber-report` Create a `make` target that runs subscriber reports. The intent is to run this in a postsubmit prow job, the results of which will (eventually) be posted somewhere/somehow. Currently only runs `onboarding` and `release` subcommands, as the `pr` subcommand requires the `gh` CLI to be installed and authenticated. Part of OSD-5962 commit: 32bbc81aae1388f638cdecc29f0457344a369bef author: Eric Fried image-v2.0.1: Ratchet base to image-v2.0.0 To speed up boilerplate CI, ratchet prow's Dockerfile to build FROM `image-v2.0.0`. commit: ac77c2b43941a96dcd9b133bbc57772814c3a2da author: Eric Fried image-v2.0.0: Get rid of operator-sdk generate Remove invocations of and support for `operator-sdk generate`, replacing these with the corresponding `controller-gen` calls in the `op-generate` target of openshift/golang-osd-operator's standard.mk. The operator-sdk-generate.sh helper script is removed. We invoke controller-gen directly from the `make` target. We need to preserve and add to the post-CRD-gen `yq` hacks to produce CRDs compatible with both v3 and v4. These should be able to go away once 3.11 is dead. (At that time we'll also need to flag controller-gen to produce CRD v1 instead of v1beta1.) As written, this will work for consumers whether their APIs are packaged separately (as in e.g. openshift/aws-account-operator#580) or not. With this commit, we produce a fresh backing image that omits the operator-sdk binaries, but is otherwise the same as image-v1.0.1. With this commit, we're rebuilding the backing image from scratch, so the prow and jenkins Dockerfiles are the same. A subsequent commit will ratchet the former to be based on image-v2.0.0 to speed up builds, in a spirit similar to openshift#164. OSD-7352 OSD-7353 commit: 6b7309ab8cb31ca402961f832346fdafea06574b author: Eric Fried Document picking up fixes in the backing image commit: f156e7bf09eabdd45fccd1a898c92f53a8061ae5 author: Eric Fried image-v1.0.1: Ratchet base image to 1.0.0 To make presumbit CI faster, this commit ratchets up the CI image build to "start" from the previously-released image, `image-v1.0.0`. The original build.sh is renamed and a fresh build.sh is introduced. The latter is currently a no-op; subsequent image releases can add to it. An app-sre-specific Dockerfile combines all the build scripts to do a full build from scratch in the appsre pipeline. There is no functional change to the image itself. OSD-7253 commit: d923893b9d7c085b933c38f67045997ea0fb3e94 author: Eric Fried Fix "unbound variable" error The OPM build still showed ``` boilerplate/openshift/golang-osd-operator/build-opm-catalog.sh: line 1: temp_dir: unbound variable ``` Turns out this was coming from an `EXIT` trap which was deferring interpolation of `$temp_dir` when it should have been doing it right away. Fix. commit: aeea281d69711798cd3184ba7ccdfbb9a126305e author: Eric Fried Fix OPM catalog build (again) Someone ought to take some time to figure out how to test this locally. commit: e6753c2a4252695328187dad83370e63f308e355 author: Christopher Collins Updates the version of the openshift-operator-registry image Updates the version of the openshift-operator-registry image to 4.8.0, to address several high vulnerabilities found in the 4.7.0 image. REF: [OSD-6831](https://issues.redhat.com/browse/OSD-6831) Signed-off-by: Christopher Collins <collins.christopher@gmail.com> commit: c35da9dd532d5ed389e4e93f83c75fe9e51e98c9 author: Eric Fried Fix generated-files-checker for go 1.16 go 1.16 is stricter about go.sum being up to date for things like `go -list`. Fix up the test (case & project) accordingly. Also add test loops for missing supported asdk versions. Not sure when we missed those. Also fix the backing image -- it was hacking the go lib/cache permissions too early. Also make it possible to override the backing image used by `container-make`, to ease debugging when writing commits like this. commit: 0acfc9d8d31942977df26f49ec043038d2fd3320 author: Rob Rati Update to use golang 1.16 commit: c49cf6f755ffab5c6e2ce6e4118b743e83093248 author: Eric Fried Fix unbound local variable error ...noted in https://ci.int.devshift.net/job/app-sre-deployment-validation-operator-gh-build-master/60/console commit: 3bcb750bd6dc9120f5458aa44d82fff6973d2171 author: Eric Fried Improve `subscriber report release` This commit improves the `subscriber report release` tool in the following ways: - It now requires a list of subscribers, or `ALL`, with the same semantics as `subscriber propose update`. - It now produces a diff with which you can `patch -R` what's in the release repository to make it conform. commit: 9062716c4df7b01b72ba4308e106b4c932ab5649 author: Christopher Collins Adds .gitattributes to unacceptable_deltas "ignores" list With a recent update to boilerplate, a .gitattributes file is created during the bootstrap process. This is causing failures in the "framework/04-update-from-master-and-revert" test, which currently doesn't expect the .gitattributes file to exist, uncommitted, after the test bootstrap. This adds the .gitattributes file to the "ignores" list in the unacceptable_deltas function of boilerplate/update. Also runs `./boilerplate/_lib/boilerplate-commit` to "clean" before the next test run. Signed-off-by: Christopher Collins <collins.christopher@gmail.com> commit: 69519b47fcbd219aa4d30aeb28377c2113ea8272 author: Eric Fried Secure freeze-check, enable hiding boilerplate deltas - Document the "trust and ignore" philosophy that subscribers should adopt when reviewing PRs that include boilerplate updates. - Secure `freeze-check` so you actually _can_ trust such changes. - Lay down .gitattributes content such that, if a subscriber decides to suppress boilerplate deltas by default, certain files will still always be shown: - Because an attacker could attempt to subvert `freeze-check` by modifying that script or its dependencies, we explicitly exclude those from the hiding-by-default. - Because an attacker could try to subvert the hiding by appending entries to .gitattributes, we exclude THAT file from the hiding-by-default as well. Security is hard. commit: 26e72e939a3d0efd4492a94c890ed8148d659654 author: Sebastian Łaskawiec Unbound error fix for the new operators

k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Apr 15, 2021

k8s-ci-robot requested review from DirectXMan12 and droot April 15, 2021 00:25

k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 15, 2021

BlaineEXE force-pushed the allow-generating-embedded-objectmeta branch from 5dee51c to a3ac948 Compare April 15, 2021 00:31

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 15, 2021

BlaineEXE changed the title ~~⚠️ updating #539 to address issue comments~~ ⚠ updating #539 to address issue comments Apr 15, 2021

BlaineEXE changed the title ~~⚠ updating #539 to address issue comments~~ ⚠ Generate Embedded ObjectMeta in the CRDs, plus with addressed comments Apr 15, 2021

BlaineEXE changed the title ~~⚠ Generate Embedded ObjectMeta in the CRDs, plus with addressed comments~~ ⚠ Generate Embedded ObjectMeta in the CRDs, plus addressed comments Apr 15, 2021

BlaineEXE mentioned this pull request Apr 15, 2021

api: persist VolumeClaimTemplate metadtata rook/rook#7631

Merged

10 tasks

leseb reviewed Apr 15, 2021

View reviewed changes

pkg/crd/gen.go Outdated Show resolved Hide resolved

pkg/crd/gen.go Outdated Show resolved Hide resolved

BlaineEXE force-pushed the allow-generating-embedded-objectmeta branch 2 times, most recently from 153f3ce to f4b6ba7 Compare April 20, 2021 21:56

dvaldivia and others added 2 commits April 20, 2021 15:59

link to embedded ObjectMeta discussion

1d66658

Signed-off-by: Blaine Gardner <b.blaine.gardner@gmail.com>

BlaineEXE force-pushed the allow-generating-embedded-objectmeta branch from f4b6ba7 to 1d66658 Compare April 20, 2021 22:02

DirectXMan12 approved these changes Apr 20, 2021

View reviewed changes

k8s-ci-robot assigned DirectXMan12 Apr 20, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 20, 2021

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 20, 2021

k8s-ci-robot merged commit f284e2e into kubernetes-sigs:master Apr 20, 2021

BlaineEXE deleted the allow-generating-embedded-objectmeta branch April 20, 2021 22:49

markusthoemmes mentioned this pull request Apr 26, 2021

✨ Generate embedded ObjectMeta with schemapatch as well #563

Merged

DirectXMan12 mentioned this pull request Apr 30, 2021

⚠ Generate Embedded ObjectMeta in the CRDs #539

Closed

pauldthomson mentioned this pull request Apr 30, 2021

Allow adding labels to StatefulSet created by Controller schemahero/schemahero#346

Closed

y25ean mentioned this pull request May 4, 2021

Schema Validation Fix druid-io/druid-operator#167

Merged

4 tasks

coro mentioned this pull request Oct 3, 2022

Use apps/v1 type for StatefulSetSpec in RabbitmqCluster override rabbitmq/cluster-operator#1152

Closed

DanielePalaia mentioned this pull request Oct 26, 2022

Use apps/v1 type for StatefulSetSpec in RabbitmqCluster override rabbitmq/cluster-operator#1170

Closed

danielvegamyhre mentioned this pull request Apr 5, 2023

Initial controller implementation kubernetes-sigs/jobset#5

Merged

jessefeinman mentioned this pull request Apr 27, 2023

Promote minimized CRD ObjectMeta type to be it's own named type #805

Open

mjlshen mentioned this pull request Jun 1, 2023

Allow generation of embedded ObjectMeta in CRDs openshift/boilerplate#291

Merged

cblecker mentioned this pull request Jul 25, 2023

Boilerplate: Update to 851cc4a567773fdfa7c879f2f1f2bd97f6981d43 openshift/managed-velero-operator#181

Merged

zhzhuang-zju mentioned this pull request Nov 24, 2023

operator/config/samples/karmada.yaml may be not valid karmada-io/karmada#4128

Closed

tnierman mentioned this pull request Jan 8, 2024

Boilerplate: Update to a48d90919cb9a4fe3b4bbd51ac6ef71ea1b49ed6 openshift/aws-efs-operator#54

Closed

clcollins mentioned this pull request Jul 15, 2024

Boilerplate: Update to 5be0e418987099c08f75632eea3b2fe382b626ed openshift/custom-domains-operator#169

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

⚠ Generate Embedded ObjectMeta in the CRDs, plus addressed comments #557

⚠ Generate Embedded ObjectMeta in the CRDs, plus addressed comments #557

BlaineEXE commented Apr 15, 2021

k8s-ci-robot commented Apr 15, 2021

k8s-ci-robot commented Apr 15, 2021

DirectXMan12 left a comment

k8s-ci-robot commented Apr 20, 2021

⚠ Generate Embedded ObjectMeta in the CRDs, plus addressed comments #557

⚠ Generate Embedded ObjectMeta in the CRDs, plus addressed comments #557

Conversation

BlaineEXE commented Apr 15, 2021

k8s-ci-robot commented Apr 15, 2021

k8s-ci-robot commented Apr 15, 2021

DirectXMan12 left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Apr 20, 2021