Skip to content

Conversation

adambkaplan
Copy link
Member

Changes

Upgrade to operator-sdk v1.17.0, along with dependencies for controller-runtime and kubernetes:

  • Update golang dependencies:
    • k8s.io/* packages to v1.23.0
    • controller-runtime to v0.11.0
    • ginkgo to v1.16.5
    • gomega to v1.17.0
    • manifestival to v0.7.1
  • Update tooling used for manifest generation and testing:
    • Upgrade controller-gen to v0.8.0
    • Upgrade opm to v1.19.1
    • Upgrade operator-sdk to v1.17.0
  • Upgrade envtest to the latest version that runs as a go binary. Fix test setup to use a cancellable context. Removed our custom script to run envtest.
  • Refactored the Makefile so it aligns with what is generated by operator-sdk and controller-runtime.
  • Added upstream bug fixes to the operator deployment manifest.

Fixes #56

/kind cleanup

Submitter Checklist

  • Includes tests if functionality changed/was added
  • Includes docs if changes are user-facing
  • Set a kind label on this PR
  • Release notes block has been filled in, or marked NONE

See the contributor guide
for details on coding conventions, github and prow interactions, and the code review process.

Release Notes

Upgrade operator-sdk to v1.17.0, controller-runtime to v0.8.0, and k8s.io/* to v1.23.0

@openshift-ci openshift-ci bot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. release-note labels Feb 17, 2022
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 12, 2022
- Update k8s to v1.23.0
- Update controller-runtime to v0.11.0
- Update ginkgo to v1.16.5
- Update gomega to v1.17.0
- Update manifestival to v0.7.1

Per upgrade instructions in
https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.17.0/
- Add target to set up envtest with latest version. Remove script to
  test with envtest.
- Use cancellable context when running tests. This fixes an issue that
  causes the kube-apiserver process to hang during teardown.
- Update Makefile so it conforms to newer defaults for operator-sdk and
  controller-runtime.
- Upgrade controller-gen to v0.8.0
- Upgrade opm to v1.19.1
- Upgrade operator-sdk to v1.17.0
- Regenerate manifests and bundle
Assign resource requests and limits to the kube-rbac-proxy sidecar, per
upgrade instructions.

See https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.17.0/
Add the kubectl default container annotation to the operator deployment,
per the upgrade instructions for v1.16.0.

See https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.16.0/#add-annotation-to-specify-the-default-container
@adambkaplan adambkaplan force-pushed the upgrade-osdk-1.17.0 branch from 824c8ed to dfd8d63 Compare March 14, 2022 17:52
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 14, 2022
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=shipwright-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.13.0+git
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.16.0+git
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR title says 1.17.0, but I only see references to 1.16.0 instead.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this seems to be a bug in operator-sdk. The version of the label and the sdk version are always off by 1.

@gabemontero
Copy link
Member

LGTM aside from @otaviof 's question at #59 (comment)

if there is an explanation for that @adambkaplan go ahead and post a comment in that thread; otherwise, it does seem like it should be consistent and go to 17 instead of 16

@adambkaplan
Copy link
Member Author

Filed operator-framework/operator-sdk#5612 to report the semantic version issue.

@gabemontero
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 21, 2022
Copy link
Member Author

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

Self-approving

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 22, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 22, 2022
@openshift-merge-robot openshift-merge-robot merged commit 006d31c into shipwright-io:main Mar 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm Indicates that a PR is ready to be merged. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade operator-sdk to v1.17.0
4 participants