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 go to 1.18, k8s to 0.24.2 #393

Merged
merged 16 commits into from
Dec 5, 2022
Merged

Update go to 1.18, k8s to 0.24.2 #393

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
db793dc
changes from make generate in api
ranakan19 Oct 11, 2022
535a9ab
upgrade kube 0.23 to 0.24
ranakan19 Oct 24, 2022
ee76035
Merge branch 'master' into k8s_024_member
ranakan19 Oct 27, 2022
ed9dbfa
Merge branch 'master' into k8s_024_member
ranakan19 Nov 2, 2022
99b9c6b
remove replace
ranakan19 Nov 2, 2022
ce576e4
update golang to 1.18
ranakan19 Nov 22, 2022
e2b1e00
update dockerfile tools, and tool version for operator sdk 1.23, upda…
ranakan19 Nov 23, 2022
edec0c6
update golang to 1.18
ranakan19 Nov 22, 2022
f41c31e
update dockerfile tools, and tool version for operator sdk 1.23, upda…
ranakan19 Nov 23, 2022
05dcc00
merge conflict after upstream rebase
ranakan19 Nov 23, 2022
74c4195
running mod tidy
ranakan19 Nov 23, 2022
f34f8fd
changes from make generate
ranakan19 Nov 24, 2022
de7a036
Merge branch 'master' into k8s_024_2_member
ranakan19 Dec 1, 2022
82e8ed4
update golangcli version
ranakan19 Dec 1, 2022
5cc0105
correct replace versions
ranakan19 Dec 1, 2022
627a824
go mod update/replace + codecov token
xcoulon Dec 5, 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
11 changes: 5 additions & 6 deletions .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 All @@ -43,9 +43,9 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: 1.17.x
go-version: 1.18.x

- name: Checkout code
uses: actions/checkout@v2
Expand All @@ -55,10 +55,9 @@ jobs:
make generate-assets

- name: Lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
version: v1.43.0
skip-go-installation: true # we already installed Go with `actions/setup-go@v2` above
version: v1.45.0
skip-pkg-cache: true
skip-build-cache: true
args: --config=./.golangci.yml --verbose
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/operator-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- '*.*'
env:
GOPATH: /tmp/go
GO_VERSION: 1.17.x
GO_VERSION: 1.18.x

jobs:
binary:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-operators-for-e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
GOPATH: /tmp/go
GO_VERSION: 1.17.x
GO_VERSION: 1.18.x

jobs:
binary:
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This is the CodeReady Toolchain Member Operator repository. It contains the Open

== Build

Requires Go version 1.17.x (1.17.9 or higher) - download for your development environment https://golang.org/dl/[here].
Requires Go version 1.18.x (1.18.8 or higher) - download for your development environment https://golang.org/dl/[here].

This repository uses https://github.com/golang/go/wiki/Modules[Go modules].

Expand Down
8 changes: 1 addition & 7 deletions config/crd/bases/toolchain.dev.openshift.com_idlers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: idlers.toolchain.dev.openshift.com
spec:
Expand Down Expand Up @@ -118,9 +118,3 @@ spec:
storage: true
subresources:
status: {}
status:
Copy link
Contributor

@xcoulon xcoulon Nov 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I wonder why all the status sections have been removed by controller-gen in these YAML files 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@xcoulon yes, i was thinking the same. For reference - kubernetes-sigs/controller-tools#630 - explains a bit more about the choice of removing status.

acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
8 changes: 1 addition & 7 deletions config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: memberoperatorconfigs.toolchain.dev.openshift.com
spec:
Expand Down Expand Up @@ -149,9 +149,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
8 changes: 1 addition & 7 deletions config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: memberstatuses.toolchain.dev.openshift.com
spec:
Expand Down Expand Up @@ -328,9 +328,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
9 changes: 2 additions & 7 deletions config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: nstemplatesets.toolchain.dev.openshift.com
spec:
Expand Down Expand Up @@ -91,6 +91,7 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- templateRef
- usernames
Expand Down Expand Up @@ -149,9 +150,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
8 changes: 1 addition & 7 deletions config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: toolchainclusters.toolchain.dev.openshift.com
spec:
Expand Down Expand Up @@ -124,9 +124,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
8 changes: 1 addition & 7 deletions config/crd/bases/toolchain.dev.openshift.com_useraccounts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: useraccounts.toolchain.dev.openshift.com
spec:
Expand Down Expand Up @@ -119,9 +119,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
29 changes: 17 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/codeready-toolchain/member-operator

require (
github.com/codeready-toolchain/api v0.0.0-20221121081259-4f672e808b89
github.com/codeready-toolchain/api v0.0.0-20221122101422-7c02c4c86dc7
github.com/codeready-toolchain/toolchain-common v0.0.0-20221117081323-252a38460fa1
github.com/go-logr/logr v1.2.0
github.com/google/go-cmp v0.5.6
github.com/google/go-cmp v0.5.7
// using latest commit from 'github.com/openshift/api branch release-4.11'
github.com/openshift/api v0.0.0-20220912161038-458ad9ca9ca5
github.com/pkg/errors v0.9.1
Expand All @@ -13,14 +13,14 @@ require (
github.com/stretchr/testify v1.8.0
go.uber.org/zap v1.19.1
gopkg.in/h2non/gock.v1 v1.0.14
k8s.io/api v0.24.0
k8s.io/apiextensions-apiserver v0.24.0
k8s.io/apimachinery v0.24.0
k8s.io/client-go v0.24.0
k8s.io/api v0.24.2
k8s.io/apiextensions-apiserver v0.24.2
k8s.io/apimachinery v0.24.2
k8s.io/client-go v0.24.2
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.60.1
k8s.io/metrics v0.24.0
sigs.k8s.io/controller-runtime v0.12.0
sigs.k8s.io/controller-runtime v0.12.2
)

require (
Expand Down Expand Up @@ -79,9 +79,9 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
Expand All @@ -91,13 +91,18 @@ require (
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/component-base v0.24.0 // indirect
k8s.io/component-base v0.24.2 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/kubectl v0.24.0 // 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
)

go 1.17
go 1.18

replace (
github.com/codeready-toolchain/api v0.0.0-20221121081259-4f672e808b89 => github.com/ranakan19/api v0.0.0-20221201091806-57fc665ce345
github.com/codeready-toolchain/toolchain-common v0.0.0-20221117081323-252a38460fa1 => github.com/ranakan19/toolchain-common v0.0.0-20221201182049-e9ceb160687f
Copy link
Contributor

Choose a reason for hiding this comment

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

friendly reminder!

)
Loading