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 Golang to 1.18 and k8s to 0.24.2 #329

Merged
merged 11 commits into from
Dec 5, 2022
Merged

Update Golang to 1.18 and k8s to 0.24.2 #329

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
718aa6c
merge conflict
ranakan19 Nov 18, 2022
52baecb
add changes to k8s 0.24
ranakan19 Oct 6, 2022
0dea239
update to go1.18 and operator-sdk v1.23
ranakan19 Nov 21, 2022
d79549a
leftover changes for go1.18
ranakan19 Nov 21, 2022
406cc22
correct kube-openapi for sdk 23
ranakan19 Nov 22, 2022
348ea61
fixing running controller-gen with right version
ranakan19 Nov 23, 2022
2b42876
Merge branch 'master' into golang-18
ranakan19 Nov 24, 2022
a5cf94b
update readme golang version
ranakan19 Dec 1, 2022
ce60ef1
update lint to v3
ranakan19 Dec 1, 2022
51b2b4a
revert version
ranakan19 Dec 1, 2022
57fc665
try version v1.45
ranakan19 Dec 1, 2022
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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.17.x
go-version: 1.18.x

- name: Checkout code
uses: actions/checkout@v2
Expand Down
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.17.x (1.17.9 or higher) - download for your development environment https://golang.org/dl/[here].
* Operator SDK v1.21.0 - download for your development environment https://v1-21-x.sdk.operatorframework.io/docs/installation/#install-from-github-release[here]
* Go version 1.18.x (1.18.6 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]

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

Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/groupversion_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Package v1alpha1 contains API Schema definitions for the toolchain.dev.openshift.com v1alpha1 API group
//+kubebuilder:object:generate=true
//+groupName=toolchain.dev.openshift.com
// +kubebuilder:object:generate=true
// +groupName=toolchain.dev.openshift.com
package v1alpha1

import (
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/nstemplateset_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ type NSTemplateSetSpaceRole struct {
TemplateRef string `json:"templateRef"`

// Usernames the usernames to which the template applies
// +listType=atomic
Copy link
Contributor Author

Choose a reason for hiding this comment

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

added to avoid the following in make generate:
API rule violation: list_type_missing,github.com/codeready-toolchain/api/api/v1alpha1,NSTemplateSetSpaceRole,Usernames

Usernames []string `json:"usernames"`
}

Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/space_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ type SpaceStatus struct {
Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
}

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// Space is the Schema for the spaces API
// +k8s:openapi-gen=true
// +kubebuilder:resource:scope=Namespaced
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/spacebinding_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ type SpaceBindingSpec struct {
type SpaceBindingStatus struct {
}

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// SpaceBinding is the Schema for the spacebindings API which defines relationship between Spaces and MasterUserRecords
// +k8s:openapi-gen=true
// +kubebuilder:resource:scope=Namespaced
Expand Down
5 changes: 5 additions & 0 deletions api/v1alpha1/zz_generated.openapi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 12 additions & 13 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
module github.com/codeready-toolchain/api

go 1.17
go 1.18

require (
github.com/go-bindata/go-bindata v3.1.2+incompatible
// using latest commit from 'github.com/openshift/api branch release-4.11'
github.com/openshift/api v0.0.0-20220912161038-458ad9ca9ca5
k8s.io/api v0.24.0
k8s.io/apimachinery v0.24.0
k8s.io/code-generator v0.24.0
k8s.io/api v0.24.2
k8s.io/apimachinery v0.24.2
k8s.io/code-generator v0.24.2
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
sigs.k8s.io/controller-runtime v0.12.0
sigs.k8s.io/controller-tools v0.9.0
sigs.k8s.io/controller-runtime v0.12.2
sigs.k8s.io/controller-tools v0.9.2
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/go-logr/logr v1.2.0 // 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/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -39,18 +38,18 @@ require (
github.com/spf13/cobra v1.4.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiextensions-apiserver v0.24.0 // indirect
k8s.io/apiextensions-apiserver v0.24.2 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading