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.

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

Upgrade GO 1.22.0 #386

Merged
merged 6 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.21.7 as builder
FROM golang:1.22.0 as builder

WORKDIR /workspace

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion config/crd/bases/nifi.konpyutaika.com_nificlusters.yaml
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nificlusters.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down Expand Up @@ -1932,6 +1932,7 @@ spec:
nodeUserIdentityTemplate:
type: string
nodes:
default: []
juldrixx marked this conversation as resolved.
Show resolved Hide resolved
items:
properties:
id:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/nifi.konpyutaika.com_nificonnections.yaml
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nificonnections.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/nifi.konpyutaika.com_nifidataflows.yaml
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifidataflows.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifinodegroupautoscalers.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifiparametercontexts.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifiregistryclients.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/nifi.konpyutaika.com_nifiusergroups.yaml
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifiusergroups.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/nifi.konpyutaika.com_nifiusers.yaml
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifiusers.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/konpyutaika/nifikop

go 1.21.7
go 1.22.0

require (
emperror.dev/errors v0.8.1
Expand Down
3 changes: 2 additions & 1 deletion helm/nifikop/crds/nifi.konpyutaika.com_nificlusters.yaml
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nificlusters.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down Expand Up @@ -1932,6 +1932,7 @@ spec:
nodeUserIdentityTemplate:
type: string
nodes:
default: []
items:
properties:
id:
Expand Down
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nificonnections.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
2 changes: 1 addition & 1 deletion helm/nifikop/crds/nifi.konpyutaika.com_nifidataflows.yaml
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifidataflows.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifinodegroupautoscalers.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifiparametercontexts.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifiregistryclients.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
2 changes: 1 addition & 1 deletion helm/nifikop/crds/nifi.konpyutaika.com_nifiusergroups.yaml
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifiusergroups.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
2 changes: 1 addition & 1 deletion helm/nifikop/crds/nifi.konpyutaika.com_nifiusers.yaml
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.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: nifiusers.nifi.konpyutaika.com
spec:
group: nifi.konpyutaika.com
Expand Down
2 changes: 1 addition & 1 deletion site/docs/6_contributing/1_developer_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down