Skip to content

Commit b45101c

Browse files
Merge pull request #93 from razo7/update-tools-apis
Update Tools Versions
2 parents b644104 + f136645 commit b45101c

File tree

141 files changed

+1312
-976
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+1312
-976
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
# See https://github.com/kubernetes-sigs/kustomize for the last version
44
KUSTOMIZE_VERSION ?= [email protected]
55
# https://github.com/kubernetes-sigs/controller-tools/releases for the last version
6-
CONTROLLER_GEN_VERSION ?= v0.11.3
6+
CONTROLLER_GEN_VERSION ?= v0.12.0
77
# See https://pkg.go.dev/sigs.k8s.io/controller-runtime/tools/setup-envtest?tab=versions for the last version
88
ENVTEST_VERSION ?= v0.0.0-20230307042619-c304e7ec2ee7
99
# See https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions for the last version
10-
GOIMPORTS_VERSION ?= v0.7.0
10+
GOIMPORTS_VERSION ?= v0.10.0
1111
# See https://github.com/onsi/ginkgo/releases for the last version
12-
GINKGO_VERSION ?= v2.9.1
12+
GINKGO_VERSION ?= v2.11.0
1313
# See github.com/operator-framework/operator-registry/releases for the last version
14-
OPM_VERSION ?= v1.26.4
14+
OPM_VERSION ?= v1.28.0
1515
# See github.com/operator-framework/operator-sdk/releases for the last version
16-
OPERATOR_SDK_VERSION ?= v1.26.0
16+
OPERATOR_SDK_VERSION ?= v1.30.0
1717
# GO_VERSION refers to the version of Golang to be downloaded when running dockerized version
1818
GO_VERSION = 1.20
1919
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
@@ -379,7 +379,7 @@ endif
379379

380380
.PHONY: build-tools
381381
build-tools: ## Download & build all the tools locally if necessary.
382-
$(MAKE) kustomize controller-gen opm envtest operator-sdk ginkgo goimports
382+
$(MAKE) kustomize controller-gen envtest goimports ginkgo opm operator-sdk sort-imports
383383

384384
# Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'.
385385
# This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:

bundle.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=node-maintenance-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=stable
99
LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
10-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.26.0
10+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.30.0
1111
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1212
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
1313

bundle/manifests/node-maintenance-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ metadata:
2222
createdAt: ""
2323
description: Node Maintenance Operator for cordoning and draining nodes.
2424
olm.skipRange: '>=0.12.0'
25-
operators.operatorframework.io/builder: operator-sdk-v1.26.0
25+
operators.operatorframework.io/builder: operator-sdk-v1.30.0
2626
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
2727
repository: https://github.com/medik8s/node-maintenance-operator
2828
support: Medik8s

bundle/manifests/nodemaintenance.medik8s.io_nodemaintenances.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.11.3
5+
controller-gen.kubebuilder.io/version: v0.12.0
66
creationTimestamp: null
77
labels:
88
node-maintenance-operator: ""

bundle/metadata/annotations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ annotations:
66
operators.operatorframework.io.bundle.package.v1: node-maintenance-operator
77
operators.operatorframework.io.bundle.channels.v1: stable
88
operators.operatorframework.io.bundle.channel.default.v1: stable
9-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.26.0
9+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.30.0
1010
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1111
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
1212

bundle/tests/scorecard/config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ stages:
88
- entrypoint:
99
- scorecard-test
1010
- basic-check-spec
11-
image: quay.io/operator-framework/scorecard-test:v1.26.0
11+
image: quay.io/operator-framework/scorecard-test:v1.30.0
1212
labels:
1313
suite: basic
1414
test: basic-check-spec-test
@@ -18,7 +18,7 @@ stages:
1818
- entrypoint:
1919
- scorecard-test
2020
- olm-bundle-validation
21-
image: quay.io/operator-framework/scorecard-test:v1.26.0
21+
image: quay.io/operator-framework/scorecard-test:v1.30.0
2222
labels:
2323
suite: olm
2424
test: olm-bundle-validation-test
@@ -28,7 +28,7 @@ stages:
2828
- entrypoint:
2929
- scorecard-test
3030
- olm-crds-have-validation
31-
image: quay.io/operator-framework/scorecard-test:v1.26.0
31+
image: quay.io/operator-framework/scorecard-test:v1.30.0
3232
labels:
3333
suite: olm
3434
test: olm-crds-have-validation-test
@@ -38,7 +38,7 @@ stages:
3838
- entrypoint:
3939
- scorecard-test
4040
- olm-crds-have-resources
41-
image: quay.io/operator-framework/scorecard-test:v1.26.0
41+
image: quay.io/operator-framework/scorecard-test:v1.30.0
4242
labels:
4343
suite: olm
4444
test: olm-crds-have-resources-test
@@ -48,7 +48,7 @@ stages:
4848
- entrypoint:
4949
- scorecard-test
5050
- olm-spec-descriptors
51-
image: quay.io/operator-framework/scorecard-test:v1.26.0
51+
image: quay.io/operator-framework/scorecard-test:v1.30.0
5252
labels:
5353
suite: olm
5454
test: olm-spec-descriptors-test
@@ -58,7 +58,7 @@ stages:
5858
- entrypoint:
5959
- scorecard-test
6060
- olm-status-descriptors
61-
image: quay.io/operator-framework/scorecard-test:v1.26.0
61+
image: quay.io/operator-framework/scorecard-test:v1.30.0
6262
labels:
6363
suite: olm
6464
test: olm-status-descriptors-test

config/crd/bases/nodemaintenance.medik8s.io_nodemaintenances.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.3
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.12.0
87
name: nodemaintenances.nodemaintenance.medik8s.io
98
spec:
109
group: nodemaintenance.medik8s.io

config/rbac/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
5-
creationTimestamp: null
65
name: manager-role
76
rules:
87
- apiGroups:

config/scorecard/patches/basic.config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
entrypoint:
55
- scorecard-test
66
- basic-check-spec
7-
image: quay.io/operator-framework/scorecard-test:v1.26.0
7+
image: quay.io/operator-framework/scorecard-test:v1.30.0
88
labels:
99
suite: basic
1010
test: basic-check-spec-test

config/scorecard/patches/olm.config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
entrypoint:
55
- scorecard-test
66
- olm-bundle-validation
7-
image: quay.io/operator-framework/scorecard-test:v1.26.0
7+
image: quay.io/operator-framework/scorecard-test:v1.30.0
88
labels:
99
suite: olm
1010
test: olm-bundle-validation-test
@@ -14,7 +14,7 @@
1414
entrypoint:
1515
- scorecard-test
1616
- olm-crds-have-validation
17-
image: quay.io/operator-framework/scorecard-test:v1.26.0
17+
image: quay.io/operator-framework/scorecard-test:v1.30.0
1818
labels:
1919
suite: olm
2020
test: olm-crds-have-validation-test
@@ -24,7 +24,7 @@
2424
entrypoint:
2525
- scorecard-test
2626
- olm-crds-have-resources
27-
image: quay.io/operator-framework/scorecard-test:v1.26.0
27+
image: quay.io/operator-framework/scorecard-test:v1.30.0
2828
labels:
2929
suite: olm
3030
test: olm-crds-have-resources-test
@@ -34,7 +34,7 @@
3434
entrypoint:
3535
- scorecard-test
3636
- olm-spec-descriptors
37-
image: quay.io/operator-framework/scorecard-test:v1.26.0
37+
image: quay.io/operator-framework/scorecard-test:v1.30.0
3838
labels:
3939
suite: olm
4040
test: olm-spec-descriptors-test
@@ -44,7 +44,7 @@
4444
entrypoint:
4545
- scorecard-test
4646
- olm-status-descriptors
47-
image: quay.io/operator-framework/scorecard-test:v1.26.0
47+
image: quay.io/operator-framework/scorecard-test:v1.30.0
4848
labels:
4949
suite: olm
5050
test: olm-status-descriptors-test

0 commit comments

Comments
 (0)