-
Notifications
You must be signed in to change notification settings - Fork 48
decentralize osde2e tests #236
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
decentralize osde2e tests #236
Conversation
jbpratt
commented
Mar 28, 2023
- Boilerplate: Update to 764036b2bf3138ef860fa07d8e0cc017c8cfca43
- osde2e: migrate tests
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: jbpratt The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Hi @jbpratt. Thanks for your PR. I'm waiting for a app-sre member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
Conventions: - openshift/golang-osd-operator: Update - openshift/golang-osd-operator-osde2e: Subscribe --- openshift/boilerplate@f2283ca...764036b commit: b2e3e1b90c2e5a60020cba909d2112b76021f201 author: Diego Santamaria Swap sed command delimiter I believe this will explode because $TEST_IMAGE contains /s. I would use some other delimiter for that sed command -- one that can't appear in a URI -- e.g.: Co-authored-by: Eric Fried <[email protected]> Remove project.mk commit: 7adb0b88cea0e8527b4d32ddeb9c5425e83aa7a3 author: Diego Santamaria Swap sed command delimiter I believe this will explode because $TEST_IMAGE contains /s. I would use some other delimiter for that sed command -- one that can't appear in a URI -- e.g.: Co-authored-by: Eric Fried <[email protected]> commit: 19ae2a423b085b1ae0b650374570da1784a8daa3 author: Diego Santamaria Add acceptance Test convention commit: f9e6c350556d9d5845babbb46686639a01945d03 author: Diego Santamaria Initial Commit for PD boiletPlate commit: 479ec3635d761fb91a59a884ef6bc29be8a15470 author: Christoph Blecker Revert yq/python version bump commit: 999bf51ca03b8add6de2f6cb83971c5c5a95bb93 author: Christoph Blecker Remove tag-check exemption for config/Dockerfile commit: f77a7379f0bef64b0eab6163f91e87bdd67f8b34 author: Christoph Blecker Bump base image to v3.0.3 commit: 56d013c17a42b259a88e987ed6798d0fdc2f2c2a author: Christoph Blecker Hard code default branch commit: fc2e7a8d1eb5dda50f086e0f16059957352defba author: Christoph Blecker Remove prescriptive URL from config/Dockerfile commit: 82d19adadc2857c2359a8890631c081ac2824bda author: Christoph Blecker Rev boilerplate image to v3.0.3 commit: 46c46423d7f2df00731fbdcf3573773becd7c9e7 author: Christoph Blecker Don't check tag-check or config/Dockerfile when checking for a tag commit: ecfd17b4fed6a4aea80d5bdc551de7350a4d6fd8 author: Christoph Blecker Add skopeo to boilerplate image commit: de1f8d8aa7af04115fa2da8751c2d6a1f4227ddb author: Christoph Blecker Don't fail validate on changes to build/Dockerfile* commit: 4b929d2cb15df8fd9100797f39d67cdfa5dea0ab author: Christoph Blecker Always pull fresh images in our build pipeline commit: 89eaae4e4f08b7c1c4d4c168a64a1f6e2d6424e2 author: Christoph Blecker Write olm-registry dockerfile so that it can be updated by dependabot commit: 31dea5e0c0d561897eec99b72041b31a95e92e19 author: Ritu Mundhe Adding necessary "Test" prefix to e2e test runner function commit: 33deebe8c9f86d86aa773c9546d1545d06d0397c author: Ritu Mundhe whitespace cleanup commit: 09b943656d3d41ed617178935e3807c1e2922e3e author: Ritu Mundhe moved test files to osde2e base dir. Other minor fixes. (app-sre#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
10f2ea7
to
530d4a3
Compare
6d2c030
to
9ce6ff9
Compare
move the tests from the centralized osde2e repo Signed-off-by: Brady Pratt <[email protected]>
9ce6ff9
to
59a983c
Compare
/assign @ryankwilliams @ritmun Hi @tremes @JoaoFula, sorry for the delay on this PR. This is ready for review/discussion on moving forward. I've subscribed to the osde2e boilerplate but if that isn't desired, I can unwire that stuff and just bring in the tests themselves. To run locally, you can modify the diffdiff --git a/osde2e/deployment_validation_operator_runner_test.go b/osde2e/deployment_validation_operator_runner_test.go
index 804a496..5f64ebc 100644
--- a/osde2e/deployment_validation_operator_runner_test.go
+++ b/osde2e/deployment_validation_operator_runner_test.go
@@ -1,28 +1,15 @@
-// THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
-//go:build integration
-// +build integration
-
package osde2etests
import (
- "path/filepath"
"testing"
+
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
-const (
- testResultsDirectory = "/test-run-results"
- jUnitOutputFilename = "junit-example-addon.xml"
-)
-
// Test entrypoint. osde2e runs this as a test suite on test pod.
func TestDeploymentValidationOperator(t *testing.T) {
RegisterFailHandler(Fail)
- suiteConfig, reporterConfig := GinkgoConfiguration()
- reporterConfig.JUnitReport = filepath.Join(testResultsDirectory, jUnitOutputFilename)
- RunSpecs(t, "Deployment Validation Operator", suiteConfig, reporterConfig)
-
+ RunSpecs(t, "Deployment Validation Operator")
}
- hope this helps :) |
Thanks a lot @jbpratt. What is the advantage of subscribing to osde2e boilerplate please? I will try to review ASAP. I would love to see this running as a prow CI check here :) but that would be probably next step. |
@tremes The osde2e boilerplate is just to make our lives easier when decentralizing the tests to have a common pattern with building and publishing the tests as a container image to be consumed by osde2e. Since DVO isn't an SRE-P operator, I don't think we really care either way. I'm just not sure if DVO is meant to continue running in our pipelines (I'm lacking information around why or why not :). If that is the case, I don't think it makes too much sense to subscribe and bring in all of these files which won't be used but I want to leave that up to you all. I prefer using ginkgo directly which would simplify development and execution IMO. There is also support gaining to the step registry for deploying managed clusters which we have been exploring as an alternative to using OSDE2E to launch clusters but I think DVO is flexible enough to test wherever so this may not be a concern. I will chat with my team to see if they have an opinions either way! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left a couple of comments related to bp update. Just saw your comment above. Do whatever's best depending on the conclusion.
|
||
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest | ||
|
||
COPY ./harness.test harness.test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This version of dockerfile won't run correctly. I suggest a bp-update and e2e-harness-generate.
) | ||
|
||
// Test entrypoint. osde2e runs this as a test suite on test pod. | ||
func TestDeploymentValidationOperator(t *testing.T) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This function should be suffixed with "Test" otherwise the suite complains about no tests being found. A bp-update and harness-generate will fix this issue as well.
/close in favor of #243 |
…sre#194) Conventions: - openshift/golang-osd-operator: Update --- openshift/boilerplate@b0a2063...a6c2757 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 <[email protected]> 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 (app-sre#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 (app-sre#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 (app-sre#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 <[email protected]> commit: a078e1ce4ffd8607b13f398e7bcab5cc759fa864 author: Michael Shen Unexport GOFLAGS to fix bug when using container-make Signed-off-by: Michael Shen <[email protected]> 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 (app-sre#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 <[email protected]> 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 app-sre#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 <[email protected]> commit: cc0ae4d07927030d527849d0834b84ba0fd51b2e author: Karthik Perumal fix make default target's grep Co-authored-by: Eric Fried <[email protected]> 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 <[email protected]> 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 app-sre#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: 26e72e939a3d0efd4492a94c890ed8148d659654 author: Sebastian Łaskawiec Unbound error fix for the new operators
…sre#212) Conventions: - openshift/golang-osd-operator: Update --- openshift/boilerplate@b0a2063...f1ce2eb 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 <[email protected]> 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 (app-sre#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 (app-sre#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 (app-sre#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 <[email protected]> commit: a078e1ce4ffd8607b13f398e7bcab5cc759fa864 author: Michael Shen Unexport GOFLAGS to fix bug when using container-make Signed-off-by: Michael Shen <[email protected]> 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 (app-sre#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 <[email protected]> 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 app-sre#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 <[email protected]> commit: cc0ae4d07927030d527849d0834b84ba0fd51b2e author: Karthik Perumal fix make default target's grep Co-authored-by: Eric Fried <[email protected]> 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 <[email protected]> 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 app-sre#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: 26e72e939a3d0efd4492a94c890ed8148d659654 author: Sebastian Łaskawiec Unbound error fix for the new operators