Skip to content

OCPBUGS-4950: Bump go and k8s #408

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

Merged
merged 6 commits into from
Dec 15, 2022

Conversation

awgreene
Copy link
Contributor

@awgreene awgreene commented Nov 7, 2022

No description provided.

@openshift-ci 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 Nov 7, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 7, 2022

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

@awgreene awgreene marked this pull request as ready for review November 7, 2022 16:25
@openshift-ci 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 7, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 7, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene

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 Nov 7, 2022
Signed-off-by: timflannagan <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: b833ecb1f4d15f5bf5641c14ba8ef737c793ea92
@awgreene awgreene force-pushed the bump-go-and-k8s branch 5 times, most recently from b4f5112 to cfc8dd8 Compare November 7, 2022 19:38
This commit performs a number of small changes to support upgrading
our kubernetes dependencies to v0.25.3

Signed-off-by: Alexander Greene <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: a67c1155a7751eb00344c918761d9b19a8a493d3
* go.*,vendor: Bump the sigs.k8s.io/kind testing dependency

Signed-off-by: Alexander Greene <[email protected]>

* Fix deprecated installPlan step resource test

Signed-off-by: Alexander Greene <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 49533b50e9d2ccac34e38f278cfebb262a9cb276
@awgreene awgreene force-pushed the bump-go-and-k8s branch 2 times, most recently from a1699e2 to 33be322 Compare November 8, 2022 13:54
Signed-off-by: Alexander Greene <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1f8ccd108548a28973a96605d2c30ec3168cbd33
This downstream only commit also affects one of the downstream only
dependencies in /staging/operator-lifecycle-manager, which will cause
`make verify` to fail.
@awgreene
Copy link
Contributor Author

awgreene commented Nov 9, 2022

/retest

@awgreene
Copy link
Contributor Author

awgreene commented Nov 9, 2022

/test e2e-gcp-olm

Makefile Outdated
@@ -14,7 +14,7 @@ BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
GIT_COMMIT := $(if $(SOURCE_GIT_COMMIT),$(SOURCE_GIT_COMMIT),$(shell git rev-parse HEAD))

GO_BUILD_OPTS := -mod=vendor
GO_BUILD_TAGS := -tags "json1"
GO_BUILD_TAGS := -tags "json1 e2e"
Copy link
Contributor Author

@awgreene awgreene Nov 9, 2022

Choose a reason for hiding this comment

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

/hold
I just want confirm that this is causing e2e failures, we cannot allow this to merge.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 9, 2022
@awgreene
Copy link
Contributor Author

/retest

@awgreene
Copy link
Contributor Author

This is ready to merge.
/unhold

Test is failing as expected given that one of the downstream commits had to modify a staged go dependency.
/override verify

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 17, 2022

@awgreene: Overrode contexts on behalf of awgreene: ci/prow/verify

In response to this:

/override ci/prow/verify

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.

@awgreene
Copy link
Contributor Author

This PR shouldn't require approval from px or docs, it may require approval from qe, but I'll leave that to @jianzhangbjz to decide.
/label px-approved
/label docs-approved

@openshift-ci openshift-ci bot added px-approved Signifies that Product Support has signed off on this PR docs-approved Signifies that Docs has signed off on this PR labels Nov 17, 2022
@jianzhangbjz
Copy link
Contributor

LGTM, create a cluster with this PR via the cluster-bot.

MacBook-Pro:~ jianzhang$ oc get csv -n default
NAME                     DISPLAY                                    VERSION   REPLACES                 PHASE
etcdoperator.v0.9.4      etcd                                       0.9.4     etcdoperator.v0.9.2      Succeeded
rhacs-operator.v3.72.1   Advanced Cluster Security for Kubernetes   3.72.1    rhacs-operator.v3.72.0   Succeeded
MacBook-Pro:~ jianzhang$ oc get clusterversion
NAME      VERSION                                                   AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.12.0-0.ci.test-2022-11-29-015710-ci-ln-icmg8qb-latest   True        False         50m     Cluster version is 4.12.0-0.ci.test-2022-11-29-015710-ci-ln-icmg8qb-latest

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Nov 29, 2022
@jianzhangbjz
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 29, 2022
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 104da7e and 2 for PR HEAD c2bfb36 in total

@jianzhangbjz
Copy link
Contributor

/test e2e-gcp-olm
/test verify

@jianzhangbjz
Copy link
Contributor

/override ci/prow/verify

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 29, 2022

@jianzhangbjz: jianzhangbjz unauthorized: /override is restricted to Repo administrators, approvers in top level OWNERS file, and the following github teams:openshift: openshift-release-oversight.

In response to this:

/override ci/prow/verify

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
Copy link

/retest-required

Remaining retests: 0 against base HEAD f253963 and 1 for PR HEAD c2bfb36 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD b1e1741 and 0 for PR HEAD c2bfb36 in total

@openshift-ci-robot
Copy link

/hold

Revision c2bfb36 was retested 3 times: holding

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 15, 2022
@awgreene
Copy link
Contributor Author

/override ci/prow/verify

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 15, 2022

@awgreene: Overrode contexts on behalf of awgreene: ci/prow/verify

In response to this:

/override ci/prow/verify

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.

@awgreene
Copy link
Contributor Author

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 15, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 15, 2022

@awgreene: 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-merge-robot openshift-merge-robot merged commit b73f64b into openshift:master Dec 15, 2022
@awgreene awgreene changed the title Bump go and k8s OCPBUGS-4950: Bump go and k8s Dec 15, 2022
@openshift-ci-robot
Copy link

@awgreene: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-4950 has been moved to the MODIFIED state.

In response to this:

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.

@awgreene
Copy link
Contributor Author

/cherry-pick release-4.12

@openshift-cherrypick-robot

@awgreene: new pull request created: #424

In response to this:

/cherry-pick release-4.12

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-bot pushed a commit to openshift-bot/operator-framework-olm that referenced this pull request Mar 15, 2025
Upstream-repository: api
Upstream-commit: f522173c0d936ea1904076f1b4abc343e020b806
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. docs-approved Signifies that Docs has signed off on this PR lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants