Update go to 1.18, k8s to 0.24.2 (#393)

codeready-toolchain · Dec 5, 2022 · 490f9c3 · 490f9c3
1 parent c0c031f
commit 490f9c3
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 349 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -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
@@ -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
@@ -55,10 +55,10 @@ 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
+        token: ${{ secrets.CODECOV_TOKEN }}
+        version: v1.45.0
         skip-pkg-cache: true
         skip-build-cache: true
         args: --config=./.golangci.yml --verbose

diff --git a/.github/workflows/operator-cd.yml b/.github/workflows/operator-cd.yml
@@ -7,7 +7,7 @@ on:
       - '*.*'
 env:
   GOPATH: /tmp/go
-  GO_VERSION: 1.17.x
+  GO_VERSION: 1.18.x
 
 jobs:
   binary:

diff --git a/.github/workflows/publish-operators-for-e2e-tests.yml b/.github/workflows/publish-operators-for-e2e-tests.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   GOPATH: /tmp/go
-  GO_VERSION: 1.17.x
+  GO_VERSION: 1.18.x
 
 jobs:
   binary:

diff --git a/.gitignore b/.gitignore
@@ -93,3 +93,4 @@ bundle.Dockerfile
 
 /bin
 
+database
diff --git a/README.adoc b/README.adoc
@@ -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].
 

diff --git a/config/crd/bases/toolchain.dev.openshift.com_idlers.yaml b/config/crd/bases/toolchain.dev.openshift.com_idlers.yaml
@@ -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:
@@ -118,9 +118,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml b/config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml
@@ -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:
@@ -149,9 +149,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml b/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml
@@ -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:
@@ -328,9 +328,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml b/config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml
@@ -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:
@@ -91,6 +91,7 @@ spec:
                       items:
                         type: string
                       type: array
+                      x-kubernetes-list-type: atomic
                   required:
                   - templateRef
                   - usernames
@@ -149,9 +150,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml b/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml
@@ -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:
@@ -124,9 +124,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/toolchain.dev.openshift.com_useraccounts.yaml b/config/crd/bases/toolchain.dev.openshift.com_useraccounts.yaml
@@ -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:
@@ -119,9 +119,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/go.mod b/go.mod
@@ -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/toolchain-common v0.0.0-20221117081323-252a38460fa1
+	github.com/codeready-toolchain/api v0.0.0-20221205081558-245f157cb403
+	github.com/codeready-toolchain/toolchain-common v0.0.0-20221205082814-2dbd788a5e87
 	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
@@ -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 (
@@ -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
@@ -91,13 +91,13 @@ 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
-Original file 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 @@