Skip to content

OCPBUGS-13965: Bump vendors k8s libraries to 0.27.2 #368

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 1 commit into from
May 26, 2023

Conversation

gcs278
Copy link
Contributor

@gcs278 gcs278 commented May 17, 2023

Bump openshift-api, client-go, controller-runtime, kubectl for k8s 0.27.2. Need to bump Controller-runtime to v0.15.0 because it is a dependency of client-go v0.27.2.

go get github.com/openshift/api@8bbcb7ca71836dc87cce3ef63647403dc9d0fbea
go get k8s.io/[email protected]
go get sigs.k8s.io/[email protected]
go get k8s.io/[email protected]
go mod tidy
go mod vendor

pkg/operator/client/client.go,
pkg/operator/controller/controller.go,
pkg/operator/controller/status/controller.go: Updates for source.Kind conversion from type to function, MapFunc definition update to add context argument, handler.EnqueueRequestForOwner definition update for scheme and mapper.
pkg/operator/operator.go: Removed deprecated MultiNamespacedCacheBuilder for cache.Options{}. Added override to client.Options.Cache in NewClient function so client won't use cache. Removed deprecated Namespace manager.Options{} field.

@openshift-ci openshift-ci bot requested review from knobunc and rfredette May 17, 2023 15:23
@gcs278
Copy link
Contributor Author

gcs278 commented May 17, 2023

/hold
There's an issue: controller-runtime latest version is v0.14.6, and it looks like it doesn't support K8S client-go's bump to 1.27. Looks like the issue is being tracked here: operator-framework/operator-sdk#6396, at least that's the error message I'm getting when bumping openshift/API which bumps client-go, which breaks controller runtime@latest. So I think we are stuck for a bit until kubernetes-sigs/controller-runtime#2223 gets into a release of controller-runtime.

@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 May 17, 2023
@gcs278
Copy link
Contributor Author

gcs278 commented May 19, 2023

I found https://github.com/openshift/machine-api-operator/blob/master/go.mod which uses an alpha release version of controller-runtime: sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230509061743-4d3244f28eef
Will attempt to use this for now.

@alebedev87
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 22, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 23, 2023
@gcs278 gcs278 changed the title Bump vendors k8s libraries to 0.27.1 Bump vendors k8s libraries to 0.27.2 May 23, 2023
@gcs278 gcs278 changed the title Bump vendors k8s libraries to 0.27.2 OCPBUGS-13965: Bump vendors k8s libraries to 0.27.2 May 23, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels May 23, 2023
@openshift-ci-robot
Copy link
Contributor

@gcs278: This pull request references Jira Issue OCPBUGS-13965, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @ShudiLi

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Bump openshift-api, client-go, controller-runtime, kubectl for k8s 0.27.2

go get github.com/openshift/api@8bbcb7ca71836dc87cce3ef63647403dc9d0fbea
go get k8s.io/[email protected]
go get sigs.k8s.io/[email protected]
go get k8s.io/[email protected]
go mod tidy
go mod vendor

pkg/operator/client/client.go:
pkg/operator/controller/controller.go
pkg/operator/controller/status/controller.go:
pkg/operator/operator.go: Updates for controller-runtime v0.15.0

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 openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 23, 2023
@gcs278
Copy link
Contributor Author

gcs278 commented May 23, 2023

/unhold
controller-runtime has released v0.15

@openshift-ci openshift-ci bot requested a review from ShudiLi May 23, 2023 15:13
@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 May 23, 2023
@openshift-ci-robot
Copy link
Contributor

@gcs278: This pull request references Jira Issue OCPBUGS-13965, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @ShudiLi

In response to this:

Bump openshift-api, client-go, controller-runtime, kubectl for k8s 0.27.2. Need to bump Controller-runtime to v0.15.0 because it is a dependency of client-go v0.27.2.

go get github.com/openshift/api@8bbcb7ca71836dc87cce3ef63647403dc9d0fbea
go get k8s.io/[email protected]
go get sigs.k8s.io/[email protected]
go get k8s.io/[email protected]
go mod tidy
go mod vendor

pkg/operator/client/client.go:
pkg/operator/controller/controller.go
pkg/operator/controller/status/controller.go:
pkg/operator/operator.go: Updates for controller-runtime v0.15.0

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.

@ShudiLi
Copy link
Member

ShudiLi commented May 24, 2023

From QE side, tested it with 4.13.0-0.ci.test-2023-05-24-010829-ci-ln-iwq70g2-latest, see all the changes except " github.com/stretchr/testify v1.8.1"

% oc get clusterversion
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.13.0-0.ci.test-2023-05-24-010829-ci-ln-iwq70g2-latest True False 23m Cluster version is 4.13.0-0.ci.test-2023-05-24-010829-ci-ln-iwq70g2-latest
%

%oc -n openshift-dns-operator rsync dns-operator-7f7d76974f-qx7lp:/usr/bin/dns-operator .
% go version -m dns-operator
dns-operator: go1.20.3
path github.com/openshift/cluster-dns-operator/cmd/dns-operator
mod github.com/openshift/cluster-dns-operator (devel)
dep github.com/apparentlymart/go-cidr v1.0.0
dep github.com/beorn7/perks v1.0.1
dep github.com/cespare/xxhash/v2 v2.2.0
dep github.com/davecgh/go-spew v1.1.1
dep github.com/emicklei/go-restful/v3 v3.9.0
dep github.com/evanphx/json-patch/v5 v5.6.0
dep github.com/fsnotify/fsnotify v1.6.0
dep github.com/go-logr/logr v1.2.4
dep github.com/go-openapi/jsonpointer v0.19.6
dep github.com/go-openapi/jsonreference v0.20.1
dep github.com/go-openapi/swag v0.22.3
dep github.com/gogo/protobuf v1.3.2
dep github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
dep github.com/golang/protobuf v1.5.3
dep github.com/google/gnostic v0.5.7-v3refs
dep github.com/google/go-cmp v0.5.9
dep github.com/google/gofuzz v1.2.0
dep github.com/google/uuid v1.3.0
dep github.com/imdario/mergo v0.3.12
dep github.com/josharian/intern v1.0.0
dep github.com/json-iterator/go v1.1.12
dep github.com/mailru/easyjson v0.7.7
dep github.com/matttproud/golang_protobuf_extensions v1.0.4
dep github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
dep github.com/modern-go/reflect2 v1.0.2
dep github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
dep github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183
dep github.com/pkg/errors v0.9.1
dep github.com/prometheus/client_golang v1.15.1
dep github.com/prometheus/client_model v0.4.0
dep github.com/prometheus/common v0.42.0
dep github.com/prometheus/procfs v0.9.0
dep github.com/sirupsen/logrus v1.9.0
dep github.com/spf13/pflag v1.0.5
dep golang.org/x/net v0.10.0
dep golang.org/x/oauth2 v0.5.0
dep golang.org/x/sys v0.8.0
dep golang.org/x/term v0.8.0
dep golang.org/x/text v0.9.0
dep golang.org/x/time v0.3.0
dep gomodules.xyz/jsonpatch/v2 v2.3.0
dep google.golang.org/protobuf v1.30.0
dep gopkg.in/inf.v0 v0.9.1
dep gopkg.in/yaml.v2 v2.4.0
dep gopkg.in/yaml.v3 v3.0.1
dep k8s.io/api v0.27.2
dep k8s.io/apimachinery v0.27.2
dep k8s.io/client-go v0.27.2
dep k8s.io/component-base v0.27.2
dep k8s.io/klog/v2 v2.90.1
dep k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
dep k8s.io/kubectl v0.27.2
dep k8s.io/utils v0.0.0-20230209194617-a36077c30491
dep sigs.k8s.io/controller-runtime v0.15.0
dep sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
dep sigs.k8s.io/structured-merge-diff/v4 v4.2.3
dep sigs.k8s.io/yaml v1.3.0
build -buildmode=exe
build -compiler=gc
build CGO_ENABLED=0
build GOARCH=amd64
build GOOS=linux
build GOAMD64=v1
build vcs=git
build vcs.revision=f3272515c4ded285178670d8d6e045843436848c
build vcs.time=2023-05-05T15:53:14Z
build vcs.modified=true
%

  1. can't see "github.com/stretchr/testify v1.8.1"
    % go version -m dns-operator | grep github.com/stretchr/testify
    %

@alebedev87
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 24, 2023
@ShudiLi
Copy link
Member

ShudiLi commented May 24, 2023

/label qe-approved
thanks

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label May 24, 2023
@gcs278
Copy link
Contributor Author

gcs278 commented May 24, 2023

install failed
/retest-required

@gcs278
Copy link
Contributor Author

gcs278 commented May 24, 2023

/hold
MultiNamespacedCacheBuilder has been deprecated. I feel like I should address new deprecations in this bump.

@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 May 24, 2023
@candita
Copy link
Contributor

candita commented May 24, 2023

/assign @alebedev87

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 24, 2023
@gcs278
Copy link
Contributor Author

gcs278 commented May 24, 2023

/unhold
Removed call to deprecated MultiNamespacedCacheBuilder and fixed client using cache when we are intended to keep them separate.

@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 May 24, 2023
@gcs278 gcs278 force-pushed the k8s-1.27-bump branch 2 times, most recently from eee53eb to 7837ff9 Compare May 25, 2023 21:45
@openshift-ci-robot
Copy link
Contributor

@gcs278: This pull request references Jira Issue OCPBUGS-13965, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @ShudiLi

In response to this:

Bump openshift-api, client-go, controller-runtime, kubectl for k8s 0.27.2. Need to bump Controller-runtime to v0.15.0 because it is a dependency of client-go v0.27.2.

go get github.com/openshift/api@8bbcb7ca71836dc87cce3ef63647403dc9d0fbea
go get k8s.io/[email protected]
go get sigs.k8s.io/[email protected]
go get k8s.io/[email protected]
go mod tidy
go mod vendor

pkg/operator/client/client.go,
pkg/operator/controller/controller.go,
pkg/operator/controller/status/controller.go: Updates for source.Kind conversion from type to function, MapFunc definition update to add context argument, handler.EnqueueRequestForOwner definition update for scheme and mapper.
pkg/operator/operator.go: Removed deprecated MultiNamespacedCacheBuilder for cache.Options{}. Added override to client.Options.Cache in NewClient function so client won't use cache. Removed deprecated Namespace manager.Options{} field.

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.

…ectl for k8s 0.27.2

go get github.com/openshift/api@8bbcb7ca71836dc87cce3ef63647403dc9d0fbea
go get k8s.io/[email protected]
go get sigs.k8s.io/[email protected]
go get k8s.io/[email protected]
go mod tidy
go mod vendor

`pkg/operator/client/client.go`,
`pkg/operator/controller/controller.go`,
`pkg/operator/controller/status/controller.go`: Updates for source.Kind conversion
   from type to function, MapFunc definition update to add context argument,
   handler.EnqueueRequestForOwner definition update for scheme and mapper.
`pkg/operator/operator.go`: Removed deprecated MultiNamespacedCacheBuilder for
   cache.Options{}. Added override to client.Options.Cache in NewClient function so client
   won't use cache. Removed deprecated Namespace manager.Options{} field.
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 26, 2023

@gcs278: 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.

@alebedev87
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 26, 2023
@alebedev87
Copy link
Contributor

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 26, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alebedev87

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 May 26, 2023
@openshift-merge-robot openshift-merge-robot merged commit 8d84af3 into openshift:master May 26, 2023
@openshift-ci-robot
Copy link
Contributor

@gcs278: Jira Issue OCPBUGS-13965: All pull requests linked via external trackers have merged:

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

In response to this:

Bump openshift-api, client-go, controller-runtime, kubectl for k8s 0.27.2. Need to bump Controller-runtime to v0.15.0 because it is a dependency of client-go v0.27.2.

go get github.com/openshift/api@8bbcb7ca71836dc87cce3ef63647403dc9d0fbea
go get k8s.io/[email protected]
go get sigs.k8s.io/[email protected]
go get k8s.io/[email protected]
go mod tidy
go mod vendor

pkg/operator/client/client.go,
pkg/operator/controller/controller.go,
pkg/operator/controller/status/controller.go: Updates for source.Kind conversion from type to function, MapFunc definition update to add context argument, handler.EnqueueRequestForOwner definition update for scheme and mapper.
pkg/operator/operator.go: Removed deprecated MultiNamespacedCacheBuilder for cache.Options{}. Added override to client.Options.Cache in NewClient function so client won't use cache. Removed deprecated Namespace manager.Options{} field.

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.

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. 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