PODAUTO-199: Updates for 4.17 #167

maxcao13 · 2024-07-04T22:08:40Z

Updates for 4.17

Update deps
- edit (update to 4.17/0.30.2) and run hack/update-vendor.sh
Update code and build to match updated deps
Update go version to go 1.22 (go.mod, Dockerfile, images/ci/Dockerfile, Makefile)
Switched from old images to updated ci tooling images registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 in go-fmt, go-vet, Makefile, etc...
Rev version from 4.16 -> 4.17: sed -i 's/4.16/4.17/g' $(git grep -l 4.16 manifests/) images/ci/bundle.Dockerfile hack/manifest-diff-upstream.sh hack/e2e.sh Makefile
Verify that Dockerfile.rhel7 & .ci-operator.yaml are up to date (they are. Thanks, ART team!)
Update manifests to match upstream
Updated ci + release images to FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 (images/ci/Dockerfile,images/operator-registry/Dockerfile.registry.ci, Dockerfile, Dockerfile.rhel)
Updated ci base image from openshift/origin-v4.0 to registry.ci.openshift.org/ocp/4.17:base-rhel9

Had to update some struct initialization and func arguments because of a controller-runtime upgrade to v18.4 from v17.0 kubernetes-sigs/controller-runtime#2783

openshift-ci-robot · 2024-07-04T22:08:43Z

@maxcao13: This pull request references PODAUTO-199 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.17.0" version, but no target version was set.

In response to this:

Updates for 4.16

Update deps

edit (update to 4.17/0.30.2) and run hack/update-vendor.sh

Update code and build to match updated deps

Update go version to go 1.22 (go.mod, Dockerfile, images/ci/Dockerfile, Makefile) (cannot update vet/lint/upstream-manifest because openshift/release doesnt seem to have 1.22 tag yet)

Rev version from 4.16 -> 4.17: sed -i 's/4.16/4.17/g' $(git grep -l 4.15 manifests/) images/ci/bundle.Dockerfile hack/manifest-diff-upstream.sh hack/e2e.sh Makefile

Verify that Dockerfile.rhel7 & .ci-operator.yaml are up to date (they are. Thanks, ART team!)

Update manifests to match upstream

Had to update some struct initialization and func arguments because of a controller-runtime upgrade to v18.4 from v17.0 kubernetes-sigs/controller-runtime#2783

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 openshift-eng/jira-lifecycle-plugin repository.

joelsmith · 2024-07-08T21:09:24Z

As discussed on Slack, sed -i 's/4.16/4.17/g' $(git grep -l 4.15 manifests/) should have been sed -i 's/4.16/4.17/g' $(git grep -l 4.16 manifests/)

Nice work on the controller runtime related updates!

I think maybe it's time to move off of the openshift/origin-release:golang-1.XX and registry.ci.openshift.org/openshift/release:golang-1.XX images and use the registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.XX-openshift-4.YY images since those seem to be updated regularly while the others don't.

Would you mind switching the images in the following files as part of this update?

Makefile
hack/go-fmt.sh
hack/go-lint.sh
hack/go-vet.sh
hack/manifest-diff-upstream.sh
hack/manifest-diff.sh

maxcao13 · 2024-07-09T17:11:33Z

I was looking at it, should golint and its scripts + ci yamls still exist? It seems to be deprecated in favour of go vet and Staticcheck https://github.com/golang/lint

openshift-ci-robot · 2024-07-10T00:08:12Z

@maxcao13: This pull request references PODAUTO-199 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.17.0" version, but no target version was set.

In response to this:

Updates for 4.17

Update deps

edit (update to 4.17/0.30.2) and run hack/update-vendor.sh

Update code and build to match updated deps

Update go version to go 1.22 (go.mod, Dockerfile, images/ci/Dockerfile, Makefile) (cannot update vet/lint/upstream-manifest because openshift/release doesnt seem to have 1.22 tag yet)

Rev version from 4.16 -> 4.17: sed -i 's/4.16/4.17/g' $(git grep -l 4.16 manifests/) images/ci/bundle.Dockerfile hack/manifest-diff-upstream.sh hack/e2e.sh Makefile

Verify that Dockerfile.rhel7 & .ci-operator.yaml are up to date (they are. Thanks, ART team!)

Update manifests to match upstream

Had to update some struct initialization and func arguments because of a controller-runtime upgrade to v18.4 from v17.0 kubernetes-sigs/controller-runtime#2783

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2024-07-10T15:29:08Z

@maxcao13: This pull request references PODAUTO-199 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.17.0" version, but no target version was set.

In response to this:

Updates for 4.17

Update deps

edit (update to 4.17/0.30.2) and run hack/update-vendor.sh

Update code and build to match updated deps

Update go version to go 1.22 (go.mod, Dockerfile, images/ci/Dockerfile, Makefile)

Switched from old images to updated registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 in go-fmt, go-vet, Makefile, etc...

Rev version from 4.16 -> 4.17: sed -i 's/4.16/4.17/g' $(git grep -l 4.16 manifests/) images/ci/bundle.Dockerfile hack/manifest-diff-upstream.sh hack/e2e.sh Makefile

Verify that Dockerfile.rhel7 & .ci-operator.yaml are up to date (they are. Thanks, ART team!)

Update manifests to match upstream

Had to update some struct initialization and func arguments because of a controller-runtime upgrade to v18.4 from v17.0 kubernetes-sigs/controller-runtime#2783

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 openshift-eng/jira-lifecycle-plugin repository.

maxcao13 · 2024-07-10T19:52:42Z

Seems like registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 doesn't include jq and that causes manifest-diff*.sh scripts to fail.

maxcao13 · 2024-07-11T15:41:25Z

Updated with new release images.

openshift-ci-robot · 2024-07-11T15:42:10Z

@maxcao13: This pull request references PODAUTO-199 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.17.0" version, but no target version was set.

In response to this:

Updates for 4.17

Update deps

edit (update to 4.17/0.30.2) and run hack/update-vendor.sh

Update code and build to match updated deps

Update go version to go 1.22 (go.mod, Dockerfile, images/ci/Dockerfile, Makefile)

Switched from old images to updated ci tooling images registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 in go-fmt, go-vet, Makefile, etc...

Rev version from 4.16 -> 4.17: sed -i 's/4.16/4.17/g' $(git grep -l 4.16 manifests/) images/ci/bundle.Dockerfile hack/manifest-diff-upstream.sh hack/e2e.sh Makefile

Verify that Dockerfile.rhel7 & .ci-operator.yaml are up to date (they are. Thanks, ART team!)

Update manifests to match upstream

Had to update some struct initialization and func arguments because of a controller-runtime upgrade to v18.4 from v17.0 kubernetes-sigs/controller-runtime#2783

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2024-07-22T21:08:49Z

@maxcao13: This pull request references PODAUTO-199 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.17.0" version, but no target version was set.

In response to this:

Updates for 4.17

Update deps

edit (update to 4.17/0.30.2) and run hack/update-vendor.sh

Update code and build to match updated deps

Update go version to go 1.22 (go.mod, Dockerfile, images/ci/Dockerfile, Makefile)

Switched from old images to updated ci tooling images registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 in go-fmt, go-vet, Makefile, etc...

Rev version from 4.16 -> 4.17: sed -i 's/4.16/4.17/g' $(git grep -l 4.16 manifests/) images/ci/bundle.Dockerfile hack/manifest-diff-upstream.sh hack/e2e.sh Makefile

Verify that Dockerfile.rhel7 & .ci-operator.yaml are up to date (they are. Thanks, ART team!)

Update manifests to match upstream

Updated ci + release images to FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17

Updated ci base image from openshift/origin-v4.0 to registry.ci.openshift.org/ocp/4.17:base-rhel9

Had to update some struct initialization and func arguments because of a controller-runtime upgrade to v18.4 from v17.0 kubernetes-sigs/controller-runtime#2783

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 openshift-eng/jira-lifecycle-plugin repository.

maxcao13 · 2024-07-22T21:09:44Z

Included PODAUTO-202 changes in this PR.

EDIT: Although, I'm not sure if the Dockerfile in images/ci/Dockerfile is actually being used anywhere. Here's the current config in openshift/release: https://github.com/openshift/release/blob/17ca3ef1f06212c127e5ea483b9a4d825370aeeb/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-master.yaml
Does anyone happen to know?

openshift-ci-robot · 2024-07-22T22:44:09Z

@maxcao13: This pull request references PODAUTO-199 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.17.0" version, but no target version was set.

In response to this:

Updates for 4.17

Update deps

edit (update to 4.17/0.30.2) and run hack/update-vendor.sh

Update code and build to match updated deps

Update go version to go 1.22 (go.mod, Dockerfile, images/ci/Dockerfile, Makefile)

Switched from old images to updated ci tooling images registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 in go-fmt, go-vet, Makefile, etc...

Rev version from 4.16 -> 4.17: sed -i 's/4.16/4.17/g' $(git grep -l 4.16 manifests/) images/ci/bundle.Dockerfile hack/manifest-diff-upstream.sh hack/e2e.sh Makefile

Verify that Dockerfile.rhel7 & .ci-operator.yaml are up to date (they are. Thanks, ART team!)

Update manifests to match upstream

Updated ci + release images to FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 (images/ci/Dockerfile,images/operator-registry/Dockerfile.registry.ci, Dockerfile, Dockerfile.rhel)

Updated ci base image from openshift/origin-v4.0 to registry.ci.openshift.org/ocp/4.17:base-rhel9

Had to update some struct initialization and func arguments because of a controller-runtime upgrade to v18.4 from v17.0 kubernetes-sigs/controller-runtime#2783

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 openshift-eng/jira-lifecycle-plugin repository.

joelsmith

I only see one issue with the manifest diff test. Everything else looks great! I'll watch for that to get updated then I'll add the LGTM label.

/approve

Edit: that failing E2E operator test looks like it is actually succeeding. I'm not quite sure why it is tricking CI into thinking it's failing.

hack/manifest-diff.sh

joelsmith

/lgtm

openshift-ci · 2024-07-23T15:42:16Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelsmith, maxcao13

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

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

openshift-ci · 2024-07-23T17:06:30Z

@maxcao13: 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-sigs/prow repository. I understand the commands that are listed here.

openshift-bot · 2024-07-23T23:17:06Z

[ART PR BUILD NOTIFIER]

Distgit: vertical-pod-autoscaler-operator
This PR has been included in build ose-vertical-pod-autoscaler-operator-container-v4.18.0-202407232010.p0.gd0b168e.assembly.stream.el9.
All builds following this will include this PR.

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

openshift-ci bot requested review from joelsmith and wangchen615 July 4, 2024 22:09

maxcao13 force-pushed the 4.17-release-chores branch from 41bc4d6 to 38cf093 Compare July 10, 2024 00:07

maxcao13 force-pushed the 4.17-release-chores branch from 38cf093 to f1f5ebb Compare July 11, 2024 15:41

maxcao13 force-pushed the 4.17-release-chores branch from 18c7a9e to fcb4ea5 Compare July 22, 2024 22:42

maxcao13 mentioned this pull request Jul 22, 2024

PODAUTO-202: Update ocp/builder images to openshift/release images for VPA and CRO openshift/release#54656

Merged

joelsmith suggested changes Jul 23, 2024

View reviewed changes

hack/manifest-diff.sh Outdated Show resolved Hide resolved

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 23, 2024

maxcao13 and others added 2 commits July 23, 2024 08:26

Updates for 4.17

f25ceaf

Update ocp/builder ci/release builder images to openshift/release

3f44f38

maxcao13 force-pushed the 4.17-release-chores branch from fcb4ea5 to 3f44f38 Compare July 23, 2024 15:27

joelsmith approved these changes Jul 23, 2024

View reviewed changes

openshift-ci bot assigned joelsmith Jul 23, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2024

openshift-merge-bot bot merged commit d0b168e into openshift:master Jul 23, 2024
10 checks passed

maxcao13 deleted the 4.17-release-chores branch August 6, 2024 23:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PODAUTO-199: Updates for 4.17 #167

PODAUTO-199: Updates for 4.17 #167

maxcao13 commented Jul 4, 2024 •

edited

Loading

openshift-ci-robot commented Jul 4, 2024 •

edited by openshift-ci bot

Loading

joelsmith commented Jul 8, 2024 •

edited

Loading

maxcao13 commented Jul 9, 2024

openshift-ci-robot commented Jul 10, 2024 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jul 10, 2024 •

edited by openshift-ci bot

Loading

maxcao13 commented Jul 10, 2024

maxcao13 commented Jul 11, 2024

openshift-ci-robot commented Jul 11, 2024 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jul 22, 2024 •

edited by openshift-ci bot

Loading

maxcao13 commented Jul 22, 2024 •

edited

Loading

openshift-ci-robot commented Jul 22, 2024 •

edited by openshift-ci bot

Loading

joelsmith left a comment •

edited

Loading

joelsmith left a comment

openshift-ci bot commented Jul 23, 2024

openshift-ci bot commented Jul 23, 2024

openshift-bot commented Jul 23, 2024

PODAUTO-199: Updates for 4.17 #167

PODAUTO-199: Updates for 4.17 #167

Conversation

maxcao13 commented Jul 4, 2024 • edited Loading

openshift-ci-robot commented Jul 4, 2024 • edited by openshift-ci bot Loading

joelsmith commented Jul 8, 2024 • edited Loading

maxcao13 commented Jul 9, 2024

openshift-ci-robot commented Jul 10, 2024 • edited by openshift-ci bot Loading

openshift-ci-robot commented Jul 10, 2024 • edited by openshift-ci bot Loading

maxcao13 commented Jul 10, 2024

maxcao13 commented Jul 11, 2024

openshift-ci-robot commented Jul 11, 2024 • edited by openshift-ci bot Loading

openshift-ci-robot commented Jul 22, 2024 • edited by openshift-ci bot Loading

maxcao13 commented Jul 22, 2024 • edited Loading

openshift-ci-robot commented Jul 22, 2024 • edited by openshift-ci bot Loading

joelsmith left a comment • edited Loading

Choose a reason for hiding this comment

joelsmith left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Jul 23, 2024

openshift-ci bot commented Jul 23, 2024

openshift-bot commented Jul 23, 2024

maxcao13 commented Jul 4, 2024 •

edited

Loading

openshift-ci-robot commented Jul 4, 2024 •

edited by openshift-ci bot

Loading

joelsmith commented Jul 8, 2024 •

edited

Loading

openshift-ci-robot commented Jul 10, 2024 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jul 10, 2024 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jul 11, 2024 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jul 22, 2024 •

edited by openshift-ci bot

Loading

maxcao13 commented Jul 22, 2024 •

edited

Loading

openshift-ci-robot commented Jul 22, 2024 •

edited by openshift-ci bot

Loading

joelsmith left a comment •

edited

Loading