Skip to content
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.

Sign up for GitHub

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

Update controller-runtime to v0.15 #409

Merged
merged 26 commits into from
Nov 14, 2024
Merged

Update controller-runtime to v0.15 #409

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1955603
update k8s deps
ranakan19 Dec 21, 2023
53e3829
update readme
ranakan19 Dec 21, 2023
2c85d99
revert controller runtime and tools version
ranakan19 Dec 21, 2023
5ff6b12
api version match
ranakan19 Dec 21, 2023
847807a
Merge branch 'master' of github.com:codeready-toolchain/api into k8s_…
ranakan19 Jan 2, 2024
4121d74
downgrade to k8s 0.26
ranakan19 Jan 5, 2024
2645f04
update controller tools
ranakan19 Jan 18, 2024
9b7492d
Merge branch 'master' of github.com:codeready-toolchain/api into k8s_…
Feb 4, 2024
fb48d72
Merge branch 'master' of github.com:codeready-toolchain/api into k8s_…
ranakan19 Feb 29, 2024
c956ba7
merge master, merge conflict resolved
ranakan19 Mar 18, 2024
cb53e68
Merge branch 'master' into k8s_1_27_api
mfrancisc Mar 25, 2024
77e70e4
update api version and comment
ranakan19 Jun 20, 2024
1f7ce66
merge conflict resolve
ranakan19 Jun 20, 2024
2c02e5c
Merge branch 'k8s_1_27_api' of github.com:ranakan19/api into k8s_1_27…
ranakan19 Jun 20, 2024
c88be11
revert to 4.14
ranakan19 Jun 26, 2024
3f2cb1d
Merge branch 'master' of github.com:codeready-toolchain/api into k8s_…
ranakan19 Jun 27, 2024
f4fdf28
update k8s version of crdrefdocs
ranakan19 Jun 27, 2024
2146811
Merge branch 'master' into k8s_1_27_api
ranakan19 Aug 2, 2024
30e09d1
Merge branch 'master' of github.com:codeready-toolchain/api into k8s_…
ranakan19 Aug 21, 2024
431999a
Merge branch 'master' into k8s_1_27_api
ranakan19 Aug 27, 2024
51aef59
Merge branch 'master' into k8s_1_27_api
mfrancisc Sep 12, 2024
647d61b
Merge branch 'master' of github.com:codeready-toolchain/api into k8s_…
ranakan19 Sep 23, 2024
7e72582
Merge branch 'master' into k8s_1_27_api
mfrancisc Sep 25, 2024
6a9cb22
Merge branch 'master' into k8s_1_27_api
ranakan19 Oct 30, 2024
9384210
update openshift api latest commit, upgrade k8s to v0.27.7
ranakan19 Nov 8, 2024
253cdb1
run make generate
ranakan19 Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ image:https://codecov.io/gh/codeready-toolchain/api/branch/master/graph/badge.sv
== Building
Requires:

* Go version 1.18.x (1.18.8 or higher) - download for your development environment https://golang.org/dl/[here].
* Operator SDK v1.23.0 - download for your development environment https://v1-23-x.sdk.operatorframework.io/docs/installation/#install-from-github-release[here]
* Go version 1.20.x (1.20.11 or higher) - download for your development environment https://golang.org/dl/[here].
Copy link
Contributor Author

Choose a reason for hiding this comment

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

readme was outdated - this just fixes that. Not related to the documentation of the changes introduced in this PR

* Operator SDK v1.25.0 - download for your development environment https://v1-25-x.sdk.operatorframework.io/docs/installation/#install-from-github-release[here]

CodeReady ToolChain API is built using https://github.com/golang/go/wiki/Modules[Go modules].

Expand Down
59 changes: 29 additions & 30 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,53 @@ go 1.20

require (
github.com/go-bindata/go-bindata v3.1.2+incompatible
// using latest commit from 'github.com/openshift/api branch release-4.12'
github.com/openshift/api v0.0.0-20230213134911-7ba313770556
k8s.io/api v0.25.0
k8s.io/apimachinery v0.25.0
k8s.io/code-generator v0.25.0
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
sigs.k8s.io/controller-runtime v0.13.0
sigs.k8s.io/controller-tools v0.10.0
// using latest commit from 'github.com/openshift/api branch release-4.14'
github.com/openshift/api v0.0.0-20231117205818-971e4ba78c9a
k8s.io/api v0.27.2
k8s.io/apimachinery v0.27.2
k8s.io/code-generator v0.27.2
Copy link
Contributor

Choose a reason for hiding this comment

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

I thought that we wanted to support OpenShift 4.15 right away, or is the upgrade to OpenShift 4.15 supposed to be done in the following PR(s)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

correct, upgrade to 4.15 would be in the following ones so it is easy to update and review

k8s.io/gengo v0.0.0-20220902162205-c0856e24416d
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
Copy link
Contributor

Choose a reason for hiding this comment

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

Just a Thought , Do we need to discuss resolve the update to kube-openapi version as i see PR from francesco https://github.com/codeready-toolchain/api/pull/421/files updating it to the latest , and here it updates to some previous versions ? wont that be conflicting or may be just duplication of work?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @fbm3307 - I checked the version for the kube-openapi for controller-runtime v0.15 is https://github.com/kubernetes-sigs/controller-runtime/blob/release-0.15/go.mod#L71 the same as here.
I've responded on the other PR to know what is the reason to update to the latest version. I'd like to keep the dependencies in sync unless there is a need otherwise.

sigs.k8s.io/controller-runtime v0.15.0
sigs.k8s.io/controller-tools v0.12.0
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gobuffalo/flect v0.2.5 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gobuffalo/flect v1.0.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/spf13/cobra v1.4.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.6.0 // indirect
golang.org/x/tools v0.9.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.25.0 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
k8s.io/apiextensions-apiserver v0.27.2 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading
Loading