Skip to content

Commit

Permalink
Merge pull request konpyutaika#244 from r65535/upgrade-to-go-1-20
Browse files Browse the repository at this point in the history 
Upgraded nifikop to go 1.20, and upgraded all dependencies
  • Loading branch information
@mh013370
mh013370 authored Mar 29, 2023
2 parents 4403b66 + 5245dd3 commit 147bd77
Show file tree
Hide file tree
Showing 22 changed files with 1,004 additions and 885 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
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.19
- image: ghcr.io/konpyutaika/docker-images/nifikop-build:1.20
# 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
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## Unreleased

### Added
- [PR #244](https://github.com/konpyutaika/nifikop/pull/244) - **[Operator]** Updated the go version in nifikop to 1.20.

### Changed

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

WORKDIR /workspace

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
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.19
GOLANG_VERSION ?= 1.20
IMAGE_TAG_BASE ?= <registry>/<operator name>
OS = $(shell go env GOOS)
ARCH = $(shell go env GOARCH)
Expand Down
344 changes: 343 additions & 1 deletion config/crd/bases/nifi.konpyutaika.com_nificlusters.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/crd/bases/nifi.konpyutaika.com_nifidataflows.yaml
View file
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.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: nifidataflows.nifi.konpyutaika.com
spec:
Expand Down
70 changes: 69 additions & 1 deletion config/crd/bases/nifi.konpyutaika.com_nifinodegroupautoscalers.yaml
View file
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.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: nifinodegroupautoscalers.nifi.konpyutaika.com
spec:
Expand Down Expand Up @@ -108,6 +108,7 @@ spec:
name:
type: string
type: object
x-kubernetes-map-type: atomic
user:
type: string
required:
Expand All @@ -124,6 +125,7 @@ spec:
name:
type: string
type: object
x-kubernetes-map-type: atomic
volumeID:
type: string
required:
Expand Down Expand Up @@ -154,6 +156,7 @@ spec:
optional:
type: boolean
type: object
x-kubernetes-map-type: atomic
csi:
properties:
driver:
Expand All @@ -165,6 +168,7 @@ spec:
name:
type: string
type: object
x-kubernetes-map-type: atomic
readOnly:
type: boolean
volumeAttributes:
Expand All @@ -191,6 +195,7 @@ spec:
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
mode:
format: int32
type: integer
Expand All @@ -211,6 +216,7 @@ spec:
required:
- resource
type: object
x-kubernetes-map-type: atomic
required:
- path
type: object
Expand Down Expand Up @@ -251,6 +257,7 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
dataSourceRef:
properties:
apiGroup:
Expand All @@ -259,12 +266,26 @@ spec:
type: string
name:
type: string
namespace:
type: string
required:
- kind
- name
type: object
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -305,6 +326,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
storageClassName:
type: string
volumeMode:
Expand Down Expand Up @@ -351,6 +373,7 @@ spec:
name:
type: string
type: object
x-kubernetes-map-type: atomic
required:
- driver
type: object
Expand Down Expand Up @@ -435,6 +458,7 @@ spec:
name:
type: string
type: object
x-kubernetes-map-type: atomic
targetPortal:
type: string
required:
Expand Down Expand Up @@ -519,6 +543,7 @@ spec:
optional:
type: boolean
type: object
x-kubernetes-map-type: atomic
downwardAPI:
properties:
items:
Expand All @@ -533,6 +558,7 @@ spec:
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
mode:
format: int32
type: integer
Expand All @@ -553,6 +579,7 @@ spec:
required:
- resource
type: object
x-kubernetes-map-type: atomic
required:
- path
type: object
Expand Down Expand Up @@ -580,6 +607,7 @@ spec:
optional:
type: boolean
type: object
x-kubernetes-map-type: atomic
serviceAccountToken:
properties:
audience:
Expand Down Expand Up @@ -634,6 +662,7 @@ spec:
name:
type: string
type: object
x-kubernetes-map-type: atomic
user:
type: string
required:
Expand All @@ -657,6 +686,7 @@ spec:
name:
type: string
type: object
x-kubernetes-map-type: atomic
sslEnabled:
type: boolean
storageMode:
Expand Down Expand Up @@ -708,6 +738,7 @@ spec:
name:
type: string
type: object
x-kubernetes-map-type: atomic
volumeName:
type: string
volumeNamespace:
Expand Down Expand Up @@ -760,6 +791,7 @@ spec:
name:
type: string
type: object
x-kubernetes-map-type: atomic
type: array
isNode:
type: boolean
Expand Down Expand Up @@ -803,6 +835,7 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
weight:
format: int32
type: integer
Expand Down Expand Up @@ -849,10 +882,12 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
type: array
required:
- nodeSelectorTerms
type: object
x-kubernetes-map-type: atomic
type: object
nodeSelector:
additionalProperties:
Expand All @@ -875,6 +910,18 @@ spec:
type: string
resourcesRequirements:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -924,6 +971,7 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
dataSourceRef:
properties:
apiGroup:
Expand All @@ -932,12 +980,26 @@ spec:
type: string
name:
type: string
namespace:
type: string
required:
- kind
- name
type: object
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -978,6 +1040,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
storageClassName:
type: string
volumeMode:
Expand Down Expand Up @@ -1035,6 +1098,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
readOnlyConfig:
properties:
additionalSharedEnvs:
Expand All @@ -1057,6 +1121,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
properties:
apiVersion:
Expand All @@ -1066,6 +1131,7 @@ spec:
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
properties:
containerName:
Expand All @@ -1081,6 +1147,7 @@ spec:
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
Expand All @@ -1092,6 +1159,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/nifi.konpyutaika.com_nifiparametercontexts.yaml
View file
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.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: nifiparametercontexts.nifi.konpyutaika.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/nifi.konpyutaika.com_nifiregistryclients.yaml
View file
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.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: nifiregistryclients.nifi.konpyutaika.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/nifi.konpyutaika.com_nifiusergroups.yaml
View file
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.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: nifiusergroups.nifi.konpyutaika.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/nifi.konpyutaika.com_nifiusers.yaml
View file
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.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: nifiusers.nifi.konpyutaika.com
spec:
Expand Down
5 changes: 1 addition & 4 deletions controllers/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

Expand All @@ -43,9 +42,7 @@ var testEnv *envtest.Environment
func TestAPIs(t *testing.T) {
RegisterFailHandler(Fail)

RunSpecsWithDefaultAndCustomReporters(t,
"Controller Suite",
[]Reporter{printer.NewlineReporter{}})
RunSpecs(t, "Controller Suite")
}

var _ = BeforeSuite(func() {
Expand Down
Loading

0 comments on commit 147bd77

Please sign in to comment.