Update Dockerfile and github workflow to use golang 1.22

Also update CONTROLLER_GEN_VERSION to v0.13.0 as earlier versions fail with golang 1.22 on github actions. Signed-off-by: Malay Kumar Parida <[email protected]>
red-hat-storage · Jul 3, 2024 · deb0d1c · deb0d1c
1 parent b14e735
commit deb0d1c
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 41 deletions.
diff --git a/.github/workflows/ocs-operator-ci.yaml b/.github/workflows/ocs-operator-ci.yaml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.21"]
+        go: ["1.22"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.21"]
+        go: ["1.22"]
     steps:
       - uses: actions/setup-go@v5
         with:
@@ -66,7 +66,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.21"]
+        go: ["1.22"]
     steps:
       - uses: actions/setup-go@v5
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Build stage 1
 
-FROM golang:1.21 as builder
+FROM docker.io/library/golang:1.22 as builder
 
 WORKDIR /workspace
 

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ LOCALBIN=$(shell pwd)/bin
 
 KUSTOMIZE_VERSION=v4.5.5
 KUSTOMIZE=$(LOCALBIN)/kustomize
-CONTROLLER_GEN_VERSION=v0.9.2
+CONTROLLER_GEN_VERSION=v0.13.0
 CONTROLLER_GEN=$(LOCALBIN)/controller-gen
 
 

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/ocs.openshift.io_ocsinitializations.yaml b/config/crd/bases/ocs.openshift.io_ocsinitializations.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: ocsinitializations.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/config/crd/bases/ocs.openshift.io_storageclusters.yaml b/config/crd/bases/ocs.openshift.io_storageclusters.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storageclusters.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/config/crd/bases/ocs.openshift.io_storageconsumers.yaml b/config/crd/bases/ocs.openshift.io_storageconsumers.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storageconsumers.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/config/crd/bases/ocs.openshift.io_storageprofiles.yaml b/config/crd/bases/ocs.openshift.io_storageprofiles.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storageprofiles.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/config/crd/bases/ocs.openshift.io_storagerequests.yaml b/config/crd/bases/ocs.openshift.io_storagerequests.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storagerequests.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_ocsinitializations.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_ocsinitializations.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: ocsinitializations.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusters.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusters.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storageclusters.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storageconsumers.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageprofiles.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageprofiles.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storageprofiles.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storagerequests.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storagerequests.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storagerequests.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/deploy/ocs-operator/manifests/ocsinitialization.crd.yaml b/deploy/ocs-operator/manifests/ocsinitialization.crd.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: ocsinitializations.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/deploy/ocs-operator/manifests/storagecluster.crd.yaml b/deploy/ocs-operator/manifests/storagecluster.crd.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storageclusters.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/deploy/ocs-operator/manifests/storageconsumer.crd.yaml b/deploy/ocs-operator/manifests/storageconsumer.crd.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storageconsumers.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/deploy/ocs-operator/manifests/storageprofile.crd.yaml b/deploy/ocs-operator/manifests/storageprofile.crd.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storageprofiles.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/deploy/ocs-operator/manifests/storagerequest.crd.yaml b/deploy/ocs-operator/manifests/storagerequest.crd.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: storagerequests.ocs.openshift.io
 spec:
   group: ocs.openshift.io

diff --git a/metrics/Dockerfile b/metrics/Dockerfile
@@ -1,6 +1,6 @@
 # Build stage 1
 
-FROM golang:1.21 as builder
+FROM docker.io/library/golang:1.22 as builder
 
 WORKDIR /workspace
 

diff --git a/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go b/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go
diff --git a/...s/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/zz_generated.deepcopy.go b/...s/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/zz_generated.deepcopy.go
diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go
diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/zz_generated.deepcopy.go