WINC-751: Upgrade sdk-operator to 1.32.0 #1912

alinaryan · 2023-10-19T20:38:25Z

Updates the OSDK version to latest v1.32.0.

Added updates required for Golang/v3 based operators following https://sdk.operatorframework.io/docs/upgrading-sdk-version/ starting from version 1.16.0 to latest 1.32.0.
Updates the OSDK version in our pre-release.sh script and the hacking script.
Skipped anything that did not apply to our operator (helm/ansible/non-Go-v3 based operators)

openshift-ci-robot · 2023-10-19T20:38:29Z

@alinaryan: This pull request references WINC-751 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

WIP PR for sdk upgrade

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.

openshift-ci · 2023-10-19T20:38:42Z

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

alinaryan · 2023-11-01T16:26:01Z

/test build

alinaryan · 2023-11-01T16:50:51Z

/test aws-e2e-operator

openshift-ci-robot · 2023-11-01T18:09:33Z

@alinaryan: This pull request references WINC-751 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

Updates the OSDK version from 1.15.0 to the latest 1.32.0.
Followed https://sdk.operatorframework.io/docs/upgrading-sdk-version/ from version 1.16.0 to 1.32.0 and added updates required for Go/v3 based operators.

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.

openshift-ci-robot · 2023-11-01T18:10:38Z

@alinaryan: This pull request references WINC-751 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

Updates the OSDK version from 1.15.0 to the latest 1.32.0.
Followed https://sdk.operatorframework.io/docs/upgrading-sdk-version/ from version 1.16.0 to 1.32.0 and added updates required for Go/v3 based operators.

Updates the OSDK version in our pre-release.sh hack script and the README.md

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.

openshift-ci-robot · 2023-11-01T18:11:15Z

@alinaryan: This pull request references WINC-751 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

Updates the OSDK version from 1.15.0 to the latest 1.32.0.
Followed https://sdk.operatorframework.io/docs/upgrading-sdk-version/ from version 1.16.0 to 1.32.0 and added updates required for Go/v3 based operators.

Updates the OSDK version in our pre-release.sh script and the hacking script.

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.

openshift-ci-robot · 2023-11-01T18:13:15Z

@alinaryan: This pull request references WINC-751 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

Updates the OSDK version from v1.15.0 to the latest v1.32.0.

Added updates required for Golang/v3 based operators following https://sdk.operatorframework.io/docs/upgrading-sdk-version/ starting from version 1.16.0 to latest 1.32.0.

Updates the OSDK version in our pre-release.sh script and the hacking script.

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.

openshift-ci-robot · 2023-11-01T18:13:50Z

@alinaryan: This pull request references WINC-751 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

Updates the OSDK version to latest v1.32.0.

Added updates required for Golang/v3 based operators following https://sdk.operatorframework.io/docs/upgrading-sdk-version/ starting from version 1.16.0 to latest 1.32.0.

Updates the OSDK version in our pre-release.sh script and the hacking script.

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.

aravindhp · 2023-11-01T18:18:56Z

/test images
/test aws-e2e-operator
/test aws-e2e-upgrade

aravindhp

I did not do a full review but noticed that you missed updating get_operator_sdk(). Please fix and kick off an e2e that exercises that function.

aravindhp · 2023-11-01T21:46:50Z

hack/pre-release.sh

@@ -227,7 +227,7 @@ github_update() {

  # remove make bundle artifacts
  sed -i 's/REPLACE_IMAGE:latest/REPLACE_IMAGE/' bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
-  sed -i 's/operator-sdk-v1.14.0+git/operator-sdk-v1.15.0+git/' bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
+  sed -i 's/operator-sdk-v1.14.0+git/operator-sdk-v1.32.0+git/' bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml


Please use the OPERATOR_SDK_VERSION variable here so that we don't need to update this line for future SKD version changes

jrvaldes · 2023-11-02T13:32:40Z

@alinaryan consider mentioning explicitly the version you are updating to i.e. 1.32 in the PR title instead of "latest"

jrvaldes · 2023-11-02T13:35:46Z

Makefile

@@ -47,6 +47,7 @@ else
 GOBIN=$(shell go env GOBIN)
 endif

+.PHONY: all


Are these changes required for the sdk-operator upgrade? If so, please mention why in the commit message; otherwise, I recommend moving them to a separate PR.

Yes, they are required as part of the OSDK upgrade. See https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.16.0/#add-phony-targets-to-makefile

It does not specify why the change is needed so I'm not sure what I'd put in the commit message other than "required by OSDK upgrade" which feels redundant since that's the purpose of almost all the commits in the PR.

Please add such links to your commit message. This will explain WHY you are making the change.

Will add links to this and the rest of the commits

saifshaikh48

Thanks for doing this, just a few minor comments

saifshaikh48 · 2023-11-02T14:52:52Z

Makefile

@@ -108,6 +108,9 @@ build-daemon:
 run: manifests generate fmt vet ## Run a controller from your host.
 	go run cmd/operator/main.go

+ifndef ignore-not-found
+  ignore-not-found = false


consider making this all caps like out other make constants

saifshaikh48 · 2023-11-02T14:55:59Z

config/default/manager_auth_proxy_patch.yaml

@@ -15,7 +15,7 @@ spec:
        - "--secure-listen-address=0.0.0.0:8443"
        - "--upstream=http://127.0.0.1:8080/"
        - "--logtostderr=true"
-        - "--v=10"
+        - "--v=0"


did they give any reason why this change is recommended?

No, but I'll add the link to the doc in commit message

saifshaikh48 · 2023-11-02T14:57:59Z

Makefile

+# You can enable this value if you would like to use SHA Based Digests
+# To enable set flag to true


IMO this should go in the commit message to explain why this change is made

saifshaikh48 · 2023-11-02T15:03:01Z

Makefile

+KUSTOMIZE_VERSION ?= v4.5.5
+CONTROLLER_TOOLS_VERSION ?= v0.10.0


since these were introduced in the last commit, I recommend squashing this commit

saifshaikh48 · 2023-11-02T15:06:11Z

Makefile

@@ -154,17 +154,17 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
 $(KUSTOMIZE): $(LOCALBIN)
-	curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN)
+	test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }


Same as previous comment, I recommend squashing this commit into [build] Replace go-get with go-install

Reduces the debug log level for the sidecar container kube-rbac-proxy from 10 to 0. https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.17.0/#reduce-debug-log-level-for-the-sidecar-container-kube-rbac-proxy-from-10-to-0 Signed-off-by: Alina Ryan <aliryan@redhat.com>

Adds resource requests and limits to kube-rbac-proxy. https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.17.0/#add-resource-requests-and-limits-to-kube-rbac-proxy Signed-off-by: Alina Ryan <aliryan@redhat.com>

https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.18.0/#support-image-digests-instead-of-tags Signed-off-by: Alina Ryan <aliryan@redhat.com>

This commit updates the Makefile with the changed targets: kustomize, controller-gen, and envtest. https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.21.0/#for-golang-based-operators--change-makefile-targets-to-replace-go-get-with-go-install https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.23.0/#gov3-update-controller-tools-from-090-to-092 https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.23.0/#gov3-fix-makefile-targets-to-not-download-binaries-when-they-are-found-already Signed-off-by: Alina Ryan <aliryan@redhat.com>

Bumps OPM version from 1.19.1 to 1.23.0. https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.22.0/#for-go-gov3-gov2-ansible-ansiblev1-helm-helmv1-and-helm-hybrid-hybridhelmv1-alpha-language-based-operators---bump-opm-version-from-v1191-to-v1230-more-infohttpsgithubcomoperator-frameworkoperator-registryreleases Signed-off-by: Alina Ryan <aliryan@redhat.com>

https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.23.0/#upgrade-kube-proxy-image-gcriokubebuilderkube-rbac-proxy-from-v0110-to-v013 https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.28.0/#upgrade-k8s-versions-to-use-126 Signed-off-by: Alina Ryan <aliryan@redhat.com>

https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.23.0/#ansiblev1helmv1-upgrade-kustomize-versions-from-v387-to-v455 Signed-off-by: Alina Ryan <aliryan@redhat.com>

When using a custom ServiceAccount for deployment, the watch role is now required. https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.31.0/#require-watch-on-secrets Manually added ServiceAccount permissions to cmd/operator/main.go Ran: 'make bundle' Removed: 'latest:' tag from REPLACE_IMAGE Added back required LABELS in the bundle.Dockerfile that were removed when 'make bundle' was run. Added back 'com.redhat.openshift.versions:' line to bundle/metadata/annotations.yaml Signed-off-by: Alina Ryan <aliryan@redhat.com>

Updates the OSDK version from 1.15.0 to 1.32.0 in common.sh and pre-release.sh Signed-off-by: Alina Ryan <aliryan@redhat.com>

Adjusts the recommended OSDK install version from 1.15.0 to 1.32.0 in the prerequisites. Signed-off-by: Alina Ryan <aliryan@redhat.com>

The controller gen tool considers every file in the directory tree by default when generating CRDs and RBAC. This caused an issue when running 'make bundle' with the new OSDK version as the CONTROLLER_GEN tool was also generating files for our submodules. This commit fixes the problem by only specifying the cmd, controllers, and pkg paths in the 'make manifests' and 'make generate' commands. Signed-off-by: Alina Ryan <aliryan@redhat.com>

jrvaldes · 2023-11-08T13:34:40Z

/lgtm

sebsoto · 2023-11-08T14:06:18Z

/approve

openshift-ci · 2023-11-08T14:06:46Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alinaryan, sebsoto

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~~ [sebsoto]

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

openshift-ci-robot · 2023-11-08T15:37:18Z

/test remaining-required

openshift-ci-robot · 2023-11-08T18:15:41Z

/retest-required

Remaining retests: 0 against base HEAD 4e31915 and 2 for PR HEAD 82c730e in total

alinaryan · 2023-11-08T19:13:15Z

/test aws-e2e-upgrade

sebsoto · 2023-11-08T23:27:40Z

/override ci/prow/nutanix-e2e-operator

openshift-ci · 2023-11-08T23:28:03Z

@sebsoto: Overrode contexts on behalf of sebsoto: ci/prow/nutanix-e2e-operator

In response to this:

/override ci/prow/nutanix-e2e-operator

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.

openshift-ci · 2023-11-08T23:28:07Z

@alinaryan: all tests passed!

Full PR test history. Your PR dashboard.

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.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 19, 2023

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 19, 2023

alinaryan changed the title ~~WIP: WINC-751: Upgrade sdk-operator to v1.23.0~~ WIP: WINC-751: Upgrade sdk-operator to latest Oct 19, 2023

alinaryan force-pushed the OSDK-UPGRADE branch from 4c374d5 to e737cad Compare October 20, 2023 20:27

alinaryan force-pushed the OSDK-UPGRADE branch 9 times, most recently from 576026a to 03db602 Compare November 1, 2023 15:11

alinaryan changed the title ~~WIP: WINC-751: Upgrade sdk-operator to latest~~ WINC-751: Upgrade sdk-operator to latest Nov 1, 2023

aravindhp suggested changes Nov 1, 2023

View reviewed changes

jrvaldes reviewed Nov 2, 2023

View reviewed changes

saifshaikh48 reviewed Nov 2, 2023

View reviewed changes

alinaryan changed the title ~~WINC-751: Upgrade sdk-operator to latest~~ WINC-751: Upgrade sdk-operator to 1.32.0 Nov 2, 2023

alinaryan added 11 commits November 7, 2023 17:06

[config] Add resource requests and limits

3d9c51a

Adds resource requests and limits to kube-rbac-proxy. https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.17.0/#add-resource-requests-and-limits-to-kube-rbac-proxy Signed-off-by: Alina Ryan <aliryan@redhat.com>

[build] Support image digests instead of tags

d133b80

https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.18.0/#support-image-digests-instead-of-tags Signed-off-by: Alina Ryan <aliryan@redhat.com>

[build] Upgrade kustomize versions

8c251ee

https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.23.0/#ansiblev1helmv1-upgrade-kustomize-versions-from-v387-to-v455 Signed-off-by: Alina Ryan <aliryan@redhat.com>

[hack] Update OSDK version

22d5a56

Updates the OSDK version from 1.15.0 to 1.32.0 in common.sh and pre-release.sh Signed-off-by: Alina Ryan <aliryan@redhat.com>

[docs] Adjust OSDK version

07efa0a

Adjusts the recommended OSDK install version from 1.15.0 to 1.32.0 in the prerequisites. Signed-off-by: Alina Ryan <aliryan@redhat.com>

alinaryan force-pushed the OSDK-UPGRADE branch from 2306266 to 82c730e Compare November 7, 2023 22:08

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 7, 2023

openshift-ci bot assigned jrvaldes Nov 8, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 8, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 8, 2023

alinaryan marked this pull request as ready for review November 8, 2023 14:54

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 8, 2023

openshift-ci bot requested review from aravindhp and mansikulkarni96 November 8, 2023 15:04

openshift-merge-bot bot merged commit c8a5199 into openshift:master Nov 8, 2023
17 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WINC-751: Upgrade sdk-operator to 1.32.0 #1912

WINC-751: Upgrade sdk-operator to 1.32.0 #1912

alinaryan commented Oct 19, 2023 •

edited

Loading

openshift-ci-robot commented Oct 19, 2023 •

edited by openshift-ci bot

Loading

openshift-ci bot commented Oct 19, 2023

alinaryan commented Nov 1, 2023

alinaryan commented Nov 1, 2023

openshift-ci-robot commented Nov 1, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 1, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 1, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 1, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 1, 2023 •

edited by openshift-ci bot

Loading

aravindhp commented Nov 1, 2023

aravindhp left a comment

aravindhp Nov 1, 2023

jrvaldes commented Nov 2, 2023

jrvaldes Nov 2, 2023

alinaryan Nov 2, 2023 •

edited

Loading

aravindhp Nov 2, 2023

alinaryan Nov 2, 2023

saifshaikh48 left a comment

saifshaikh48 Nov 2, 2023

saifshaikh48 Nov 2, 2023

alinaryan Nov 6, 2023

saifshaikh48 Nov 2, 2023

alinaryan Nov 6, 2023

saifshaikh48 Nov 2, 2023

saifshaikh48 Nov 2, 2023

jrvaldes commented Nov 8, 2023

sebsoto commented Nov 8, 2023

openshift-ci bot commented Nov 8, 2023

openshift-ci-robot commented Nov 8, 2023

openshift-ci-robot commented Nov 8, 2023

alinaryan commented Nov 8, 2023

sebsoto commented Nov 8, 2023

openshift-ci bot commented Nov 8, 2023

openshift-ci bot commented Nov 8, 2023

		# You can enable this value if you would like to use SHA Based Digests
		# To enable set flag to true

		KUSTOMIZE_VERSION ?= v4.5.5
		CONTROLLER_TOOLS_VERSION ?= v0.10.0

WINC-751: Upgrade sdk-operator to 1.32.0 #1912

WINC-751: Upgrade sdk-operator to 1.32.0 #1912

Conversation

alinaryan commented Oct 19, 2023 • edited Loading

openshift-ci-robot commented Oct 19, 2023 • edited by openshift-ci bot Loading

openshift-ci bot commented Oct 19, 2023

alinaryan commented Nov 1, 2023

alinaryan commented Nov 1, 2023

openshift-ci-robot commented Nov 1, 2023 • edited by openshift-ci bot Loading

openshift-ci-robot commented Nov 1, 2023 • edited by openshift-ci bot Loading

openshift-ci-robot commented Nov 1, 2023 • edited by openshift-ci bot Loading

openshift-ci-robot commented Nov 1, 2023 • edited by openshift-ci bot Loading

openshift-ci-robot commented Nov 1, 2023 • edited by openshift-ci bot Loading

aravindhp commented Nov 1, 2023

aravindhp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes commented Nov 2, 2023

Choose a reason for hiding this comment

alinaryan Nov 2, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

saifshaikh48 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes commented Nov 8, 2023

sebsoto commented Nov 8, 2023

openshift-ci bot commented Nov 8, 2023

openshift-ci-robot commented Nov 8, 2023

openshift-ci-robot commented Nov 8, 2023

alinaryan commented Nov 8, 2023

sebsoto commented Nov 8, 2023

openshift-ci bot commented Nov 8, 2023

openshift-ci bot commented Nov 8, 2023

alinaryan commented Oct 19, 2023 •

edited

Loading

openshift-ci-robot commented Oct 19, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 1, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 1, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 1, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 1, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 1, 2023 •

edited by openshift-ci bot

Loading

alinaryan Nov 2, 2023 •

edited

Loading