Updates for operator sdk v1.28 #45

michael-valdron · 2023-08-24T18:14:06Z

Please specify the area for this PR

What does does this PR do / why we need it:

Provides updates to the project files to support Operator SDK version 1.28, these changes are documented under https://sdk.operatorframework.io/docs/upgrading-sdk-version/ up to v1.28 docs.

Additional Changes:

OpenShift Integration test script deploys 15 seconds before running test suite
Integration test suite uses registry-operator-system for registry operator pod instead of TEST_NAMESPACE
- This fixes the ability to use TEST_NAMESPACE as an optional separate namespace for the devfile registry test deployments

Which issue(s) this PR fixes:

Fixes #?

fixes devfile/api#881
fixes devfile/api#1106

PR acceptance criteria:

Test Coverage
- Are your changes sufficiently tested, and are any applicable test cases added or updated to cover your changes?
Gosec scans
- Fix all MEDIUM and higher findings and/or annotate a finding per gosec instructions: https://github.com/securego/gosec#annotating-code to address why a finding is not a security issue

Documentation

Does the registry operator documentation need to updated with your changes?

How to test changes / Special notes to the reviewer:

openshift-ci · 2023-08-24T18:14:11Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

codecov · 2023-08-27T02:10:25Z

Codecov Report

Patch coverage has no change and project coverage change: +0.30% 🎉

Comparison is base (9ac9961) 22.41% compared to head (ff9e578) 22.72%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main      #45      +/-   ##
==========================================
+ Coverage   22.41%   22.72%   +0.30%     
==========================================
  Files          23       23              
  Lines        1307     1307              
==========================================
+ Hits          293      297       +4     
+ Misses        998      995       -3     
+ Partials       16       15       -1

Files Changed	Coverage Δ
api/v1alpha1/zz_generated.deepcopy.go	`36.28% <ø> (ø)`
...rollers/clusterdevfileregistrieslist_controller.go	`92.85% <ø> (ø)`
controllers/devfileregistrieslist_controller.go	`92.85% <ø> (+14.28%)`	⬆️
controllers/validate.go	`100.00% <ø> (ø)`

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

johnmcollier

Left some comments.

Also, could we move back the controller go sources from internal/controller/xyz to just controllers/? I think internal/controller is the default for new controller runtime projects, but the added "internal" in the path is unnecessary for our use case IMO

CHANGELOG.md

Dockerfile

config/rbac/service_account.yaml

michael-valdron · 2023-08-28T16:58:01Z

@michael-valdron: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:
Test name Commit Details Required Rerun command
ci/prow/v4.12-registry-operator-integration-test 1f0abf2 link true /test v4.12-registry-operator-integration-test

Full PR test history. Your PR dashboard.

CI is still running the integration tests using go 1.18, this needs to be updated to go 1.19 for this to pass.

go: go.mod file indicates go 1.19, but maximum version supported by tidy is 1.18

michael-valdron · 2023-08-28T18:10:51Z

Left some comments.

Also, could we move back the controller go sources from internal/controller/xyz to just controllers/? I think internal/controller is the default for new controller runtime projects, but the added "internal" in the path is unnecessary for our use case IMO

Reverted go v4 project structure changes.

michael-valdron · 2023-08-29T14:58:08Z

/retest

michael-valdron · 2023-08-29T15:00:30Z

/retest-required

michael-valdron · 2023-08-29T16:09:34Z

/retest-required

michael-valdron · 2023-08-29T16:11:38Z

/retest-required

michael-valdron · 2023-08-30T03:17:12Z

/retest

Signed-off-by: Michael Valdron <[email protected]>

…ration test suite Signed-off-by: Michael Valdron <[email protected]>

…ript Signed-off-by: Michael Valdron <[email protected]>

Signed-off-by: Michael Valdron <[email protected]>

…tion under CONTRIBUTING.md Signed-off-by: Michael Valdron <[email protected]>

michael-valdron · 2023-08-30T19:36:10Z

/test

openshift-ci · 2023-08-30T19:36:13Z

@michael-valdron: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

/test v4.12-images
/test v4.12-registry-operator-integration-test

Use /test all to run all jobs.

In response to this:

/test

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.

michael-valdron · 2023-08-30T19:36:27Z

/test all

michael-valdron · 2023-08-30T20:04:59Z

/retest

michael-valdron · 2023-08-30T23:20:46Z

/retest

johnmcollier · 2023-08-30T23:56:41Z

/retest

michael-valdron · 2023-08-31T13:19:07Z

/retest

…ation tests Signed-off-by: Michael Valdron <[email protected]>

johnmcollier

/lgtm

openshift-ci · 2023-08-31T15:22:37Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johnmcollier, michael-valdron

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~~ [johnmcollier,michael-valdron]

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

* required changes to update operator sdk Signed-off-by: Michael Valdron <[email protected]> * ginkgo v2 migration changes. Signed-off-by: Michael Valdron <[email protected]> * remove extra ENVTEST definition Signed-off-by: Michael Valdron <[email protected]> * dependencies updated to match operator sdk v1.28 requirements Signed-off-by: Michael Valdron <[email protected]> * refactoring controllers package to internal/controller package as part of go/v4 prep changes in operator sdk v1.28 Signed-off-by: Michael Valdron <[email protected]> * bump gcr.io/kubebuilder/kube-rbac-proxy from v0.13.0 to v0.13.1 as part of operator sdk v1.28 changes Signed-off-by: Michael Valdron <[email protected]> * refactoring main.go to cmd/main.go as part of go/v4 prep changes in operator sdk v1.28 Signed-off-by: Michael Valdron <[email protected]> * update header under integration test source Signed-off-by: Michael Valdron <[email protected]> * update go version from 1.18 to 1.19 under ci workflows Signed-off-by: Michael Valdron <[email protected]> * import admissionv1beta1 changed to admissionv1 as part of operator sdk v1.28 changes Signed-off-by: Michael Valdron <[email protected]> * update license header and boilerplate files Signed-off-by: Michael Valdron <[email protected]> * rbac service account role bindings fixed with labels added Signed-off-by: Michael Valdron <[email protected]> * security context for manager container updated. Signed-off-by: Michael Valdron <[email protected]> * recent changes applied to bundle manifests Signed-off-by: Michael Valdron <[email protected]> * service account renamed to fix name prefix issue. Signed-off-by: Michael Valdron <[email protected]> * fixed envtest binary name Signed-off-by: Michael Valdron <[email protected]> * fixed relative path to 'config/crd/bases' under controller test suite Signed-off-by: Michael Valdron <[email protected]> * controller-gen deepcopy source update to header Signed-off-by: Michael Valdron <[email protected]> * fixup docker-buildx rule Signed-off-by: Michael Valdron <[email protected]> * CHANGELOG added Signed-off-by: Michael Valdron <[email protected]> * included change log documenting as part of PR acceptance criteria Signed-off-by: Michael Valdron <[email protected]> * target os is always linux Signed-off-by: Michael Valdron <[email protected]> * sa changed to service-account Signed-off-by: Michael Valdron <[email protected]> * bundle csv update Signed-off-by: Michael Valdron <[email protected]> * go v4 project structure changes reverted. Signed-off-by: Michael Valdron <[email protected]> * restore unset GOFLAGS Signed-off-by: Michael Valdron <[email protected]> * use operator namespace when waiting for operator pod to run for integration test suite Signed-off-by: Michael Valdron <[email protected]> * add registry operator deploy command to openshift integration test script Signed-off-by: Michael Valdron <[email protected]> * add touch command in Makefile to create junit report if does not exist Signed-off-by: Michael Valdron <[email protected]> * add docker-buildx optional step to build and run the operator instruction under CONTRIBUTING.md Signed-off-by: Michael Valdron <[email protected]> * make /tmp/artifacts directory if does not exist before running integration tests Signed-off-by: Michael Valdron <[email protected]> --------- Signed-off-by: Michael Valdron <[email protected]> Signed-off-by: thepetk <[email protected]>

openshift-ci bot added the do-not-merge/work-in-progress label Aug 24, 2023

openshift-ci bot added the approved label Aug 24, 2023

michael-valdron mentioned this pull request Aug 24, 2023

Update Ginkgo version in registry operator devfile/api#881

Closed

2 tasks

michael-valdron marked this pull request as ready for review August 28, 2023 14:46

openshift-ci bot removed the do-not-merge/work-in-progress label Aug 28, 2023

openshift-ci bot requested review from elsony and maysunfaisal August 28, 2023 14:46

michael-valdron requested review from johnmcollier and kim-tsao August 28, 2023 14:47

michael-valdron mentioned this pull request Aug 28, 2023

Registry operator should be in sync with operator SDK releases devfile/api#1106

Closed

3 tasks

michael-valdron force-pushed the chore/operator-sdk-sync branch from 6782eab to 1f0abf2 Compare August 28, 2023 15:30

johnmcollier requested changes Aug 28, 2023

View reviewed changes

CHANGELOG.md Show resolved Hide resolved

Dockerfile Outdated Show resolved Hide resolved

config/rbac/service_account.yaml Outdated Show resolved Hide resolved

openshift-ci bot assigned johnmcollier Aug 28, 2023

michael-valdron mentioned this pull request Aug 28, 2023

Update to golang 1.19 for devfile registry operator openshift/release#42759

Merged

michael-valdron requested a review from johnmcollier August 29, 2023 14:58

michael-valdron closed this Aug 29, 2023

michael-valdron reopened this Aug 29, 2023

michael-valdron force-pushed the chore/operator-sdk-sync branch from 3421ec9 to f7b6524 Compare August 29, 2023 22:30

michael-valdron force-pushed the chore/operator-sdk-sync branch 3 times, most recently from 1f2e22b to a5e3d53 Compare August 30, 2023 05:59

michael-valdron added 6 commits August 30, 2023 15:25

go v4 project structure changes reverted.

df5e1e6

Signed-off-by: Michael Valdron <[email protected]>

restore unset GOFLAGS

d2dcfc5

Signed-off-by: Michael Valdron <[email protected]>

use operator namespace when waiting for operator pod to run for integ…

69c5f99

…ration test suite Signed-off-by: Michael Valdron <[email protected]>

add registry operator deploy command to openshift integration test sc…

2c763a2

…ript Signed-off-by: Michael Valdron <[email protected]>

add touch command in Makefile to create junit report if does not exist

e1f6c87

Signed-off-by: Michael Valdron <[email protected]>

add docker-buildx optional step to build and run the operator instruc…

604db86

…tion under CONTRIBUTING.md Signed-off-by: Michael Valdron <[email protected]>

michael-valdron force-pushed the chore/operator-sdk-sync branch from 0ffd67e to 604db86 Compare August 30, 2023 19:30

michael-valdron closed this Aug 30, 2023

michael-valdron reopened this Aug 30, 2023

michael-valdron closed this Aug 30, 2023

michael-valdron reopened this Aug 30, 2023

michael-valdron mentioned this pull request Aug 30, 2023

Devfile registry operator pre-release to OperatorHub devfile/api#1211

Closed

7 tasks

johnmcollier approved these changes Aug 30, 2023

View reviewed changes

openshift-ci bot added the lgtm label Aug 30, 2023

make /tmp/artifacts directory if does not exist before running integr…

ff9e578

…ation tests Signed-off-by: Michael Valdron <[email protected]>

openshift-ci bot removed the lgtm label Aug 31, 2023

johnmcollier approved these changes Aug 31, 2023

View reviewed changes

openshift-ci bot added the lgtm label Aug 31, 2023

michael-valdron merged commit fd4aacc into devfile:main Aug 31, 2023
7 checks passed

michael-valdron mentioned this pull request Aug 31, 2023

Update license header files devfile/api#1004

Closed

4 tasks

michael-valdron mentioned this pull request Mar 7, 2024

Update go projects to v1.19 devfile/api#1237

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updates for operator sdk v1.28 #45

Updates for operator sdk v1.28 #45

michael-valdron commented Aug 24, 2023 •

edited

Loading

openshift-ci bot commented Aug 24, 2023

codecov bot commented Aug 27, 2023 •

edited

Loading

johnmcollier left a comment

michael-valdron commented Aug 28, 2023

michael-valdron commented Aug 28, 2023

michael-valdron commented Aug 29, 2023

michael-valdron commented Aug 29, 2023

michael-valdron commented Aug 29, 2023

michael-valdron commented Aug 29, 2023

michael-valdron commented Aug 30, 2023

michael-valdron commented Aug 30, 2023

openshift-ci bot commented Aug 30, 2023

michael-valdron commented Aug 30, 2023

michael-valdron commented Aug 30, 2023

michael-valdron commented Aug 30, 2023

johnmcollier commented Aug 30, 2023

michael-valdron commented Aug 31, 2023

johnmcollier left a comment

openshift-ci bot commented Aug 31, 2023

Updates for operator sdk v1.28 #45

Updates for operator sdk v1.28 #45

Conversation

michael-valdron commented Aug 24, 2023 • edited Loading

openshift-ci bot commented Aug 24, 2023

codecov bot commented Aug 27, 2023 • edited Loading

Codecov Report

johnmcollier left a comment

Choose a reason for hiding this comment

michael-valdron commented Aug 28, 2023

michael-valdron commented Aug 28, 2023

michael-valdron commented Aug 29, 2023

michael-valdron commented Aug 29, 2023

michael-valdron commented Aug 29, 2023

michael-valdron commented Aug 29, 2023

michael-valdron commented Aug 30, 2023

michael-valdron commented Aug 30, 2023

openshift-ci bot commented Aug 30, 2023

michael-valdron commented Aug 30, 2023

michael-valdron commented Aug 30, 2023

michael-valdron commented Aug 30, 2023

johnmcollier commented Aug 30, 2023

michael-valdron commented Aug 31, 2023

johnmcollier left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Aug 31, 2023

michael-valdron commented Aug 24, 2023 •

edited

Loading

codecov bot commented Aug 27, 2023 •

edited

Loading