Upgrade GO 1.22.0 (#386)

* Upgrade GO 1.22.0 * Update CHANGELOG * Update controller tools to v0.14.0
konpyutaika · Feb 9, 2024 · 72d3a83 · 72d3a83
1 parent cb89242
commit 72d3a83
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 22 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,7 +31,7 @@ orbs:
     executors:
       operator-build:
         docker:
-          - image: ghcr.io/konpyutaika/docker-images/nifikop-build:1.21.7
+          - image: ghcr.io/konpyutaika/docker-images/nifikop-build:1.22.0
     # Define jobs list
     jobs:
       # Build job, which build operator docker image (with operator-sdk build)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - [PR #382](https://github.com/konpyutaika/nifikop/pull/382) - **[Operator/NifiCluster]** Changed `nifi.content.viewer.url` property default value.
 - [PR #387](https://github.com/konpyutaika/nifikop/pull/387) - **[Operator]** Upgrade golang to 1.21.7.
 - [PR #366](https://github.com/konpyutaika/nifikop/pull/366) - **[Operator]** Migrated nifikop to KubeBuilder go/v4 and operator-sdk to v1.33.0.
+- [PR #386](https://github.com/konpyutaika/nifikop/pull/386) - **[Operator]** Upgrade golang to 1.22.0.
 
 ### Fixed Bugs
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21.7 as builder
+FROM golang:1.22.0 as builder
 
 WORKDIR /workspace
 

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ DOCKER_REGISTRY_BASE 	?= ghcr.io/konpyutaika/docker-images
 IMAGE_TAG				?= $(shell git describe --tags --abbrev=0 --match '[0-9].*[0-9].*[0-9]' 2>/dev/null)
 IMAGE_NAME 				?= $(SERVICE_NAME)
 BUILD_IMAGE				?= ghcr.io/konpyutaika/docker-images/nifikop-build
-GOLANG_VERSION          ?= 1.21.7
+GOLANG_VERSION          ?= 1.22.0
 IMAGE_TAG_BASE ?= <registry>/<operator name>
 OS = $(shell go env GOOS)
 ARCH = $(shell go env GOARCH)
@@ -34,7 +34,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.2.1
-CONTROLLER_TOOLS_VERSION ?= v0.13.0
+CONTROLLER_TOOLS_VERSION ?= v0.14.0
 ENVTEST_K8S_VERSION = 1.28.0
 GOLANGCI_VERSION = 1.55.2
 

diff --git a/config/crd/bases/nifi.konpyutaika.com_nificlusters.yaml b/config/crd/bases/nifi.konpyutaika.com_nificlusters.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nificlusters.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com
@@ -1932,6 +1932,7 @@ spec:
               nodeUserIdentityTemplate:
                 type: string
               nodes:
+                default: []
                 items:
                   properties:
                     id:

diff --git a/config/crd/bases/nifi.konpyutaika.com_nificonnections.yaml b/config/crd/bases/nifi.konpyutaika.com_nificonnections.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nificonnections.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/config/crd/bases/nifi.konpyutaika.com_nifidataflows.yaml b/config/crd/bases/nifi.konpyutaika.com_nifidataflows.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifidataflows.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/config/crd/bases/nifi.konpyutaika.com_nifinodegroupautoscalers.yaml b/config/crd/bases/nifi.konpyutaika.com_nifinodegroupautoscalers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifinodegroupautoscalers.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/config/crd/bases/nifi.konpyutaika.com_nifiparametercontexts.yaml b/config/crd/bases/nifi.konpyutaika.com_nifiparametercontexts.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifiparametercontexts.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/config/crd/bases/nifi.konpyutaika.com_nifiregistryclients.yaml b/config/crd/bases/nifi.konpyutaika.com_nifiregistryclients.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifiregistryclients.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/config/crd/bases/nifi.konpyutaika.com_nifiusergroups.yaml b/config/crd/bases/nifi.konpyutaika.com_nifiusergroups.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifiusergroups.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/config/crd/bases/nifi.konpyutaika.com_nifiusers.yaml b/config/crd/bases/nifi.konpyutaika.com_nifiusers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifiusers.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/konpyutaika/nifikop
 
-go 1.21.7
+go 1.22.0
 
 require (
 	emperror.dev/errors v0.8.1

diff --git a/helm/nifikop/crds/nifi.konpyutaika.com_nificlusters.yaml b/helm/nifikop/crds/nifi.konpyutaika.com_nificlusters.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nificlusters.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com
@@ -1932,6 +1932,7 @@ spec:
               nodeUserIdentityTemplate:
                 type: string
               nodes:
+                default: []
                 items:
                   properties:
                     id:

diff --git a/helm/nifikop/crds/nifi.konpyutaika.com_nificonnections.yaml b/helm/nifikop/crds/nifi.konpyutaika.com_nificonnections.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nificonnections.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/helm/nifikop/crds/nifi.konpyutaika.com_nifidataflows.yaml b/helm/nifikop/crds/nifi.konpyutaika.com_nifidataflows.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifidataflows.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/helm/nifikop/crds/nifi.konpyutaika.com_nifinodegroupautoscalers.yaml b/helm/nifikop/crds/nifi.konpyutaika.com_nifinodegroupautoscalers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifinodegroupautoscalers.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/helm/nifikop/crds/nifi.konpyutaika.com_nifiparametercontexts.yaml b/helm/nifikop/crds/nifi.konpyutaika.com_nifiparametercontexts.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifiparametercontexts.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/helm/nifikop/crds/nifi.konpyutaika.com_nifiregistryclients.yaml b/helm/nifikop/crds/nifi.konpyutaika.com_nifiregistryclients.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifiregistryclients.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/helm/nifikop/crds/nifi.konpyutaika.com_nifiusergroups.yaml b/helm/nifikop/crds/nifi.konpyutaika.com_nifiusergroups.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifiusergroups.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/helm/nifikop/crds/nifi.konpyutaika.com_nifiusers.yaml b/helm/nifikop/crds/nifi.konpyutaika.com_nifiusers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: nifiusers.nifi.konpyutaika.com
 spec:
   group: nifi.konpyutaika.com

diff --git a/site/docs/6_contributing/1_developer_guide.md b/site/docs/6_contributing/1_developer_guide.md
@@ -10,7 +10,7 @@ sidebar_label: Developer guide
 
 NiFiKop has been validated with:
 
-- [go](https://golang.org/doc/install) version v1.21+.
+- [go](https://golang.org/doc/install) version v1.22+.
 - [docker](https://docs.docker.com/get-docker/) version 18.09+
 - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version v1.16+
 - [Helm](https://helm.sh/) version v3.4.2