Skip to content
This repository was archived by the owner on May 24, 2023. It is now read-only.

Commit 9ca1adb

Browse files
lucacomelucacome
committed
Update Operator SDK to v1.15.0
1 parent 3f85fa6 commit 9ca1adb

File tree

12 files changed

+158
-110
lines changed

12 files changed

+158
-110
lines changed

‎Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
3737

3838
# Image URL to use all building/pushing image targets
3939
IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
40-
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
41-
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
40+
4241
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
43-
ENVTEST_K8S_VERSION = 1.21
42+
ENVTEST_K8S_VERSION = 1.22
4443

4544
# Change DOCKERFILE tp openshift.Dockerfile to build Openshift image
4645
DOCKERFILE ?= Dockerfile
@@ -80,7 +79,7 @@ help: ## Display this help.
8079
##@ Development
8180

8281
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
83-
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
82+
$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
8483

8584
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
8685
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
@@ -137,7 +136,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
137136

138137
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
139138
controller-gen: ## Download controller-gen locally if necessary.
140-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.1)
139+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)
141140

142141
KUSTOMIZE = $(shell pwd)/bin/kustomize
143142
kustomize: ## Download kustomize locally if necessary.

‎api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bundle.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=nginx-ingress-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
9-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.11.0
9+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.15.0
1010
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1111
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
1212

‎bundle/manifests/k8s.nginx.org_nginxingresscontrollers.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.4.1
5+
controller-gen.kubebuilder.io/version: v0.7.0
66
creationTimestamp: null
77
name: nginxingresscontrollers.k8s.nginx.org
88
spec:

‎bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ metadata:
2424
}
2525
]
2626
capabilities: Basic Install
27-
operators.operatorframework.io/builder: operator-sdk-v1.11.0
27+
operators.operatorframework.io/builder: operator-sdk-v1.15.0
2828
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
2929
name: nginx-ingress-operator.v0.4.0
3030
namespace: placeholder
@@ -359,7 +359,7 @@ spec:
359359
- --leader-elect
360360
command:
361361
- /manager
362-
image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.4.0
362+
image: nginx/nginx-ingress-operator:0.4.0
363363
livenessProbe:
364364
httpGet:
365365
path: /healthz

‎bundle/metadata/annotations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ annotations:
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: nginx-ingress-operator
77
operators.operatorframework.io.bundle.channels.v1: alpha
8-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.11.0
8+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.15.0
99
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1010
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
1111

‎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.11.0
11+
image: quay.io/operator-framework/scorecard-test:v1.15.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.11.0
21+
image: quay.io/operator-framework/scorecard-test:v1.15.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.11.0
31+
image: quay.io/operator-framework/scorecard-test:v1.15.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.11.0
41+
image: quay.io/operator-framework/scorecard-test:v1.15.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.11.0
51+
image: quay.io/operator-framework/scorecard-test:v1.15.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.11.0
61+
image: quay.io/operator-framework/scorecard-test:v1.15.0
6262
labels:
6363
suite: olm
6464
test: olm-status-descriptors-test

‎config/crd/bases/k8s.nginx.org_nginxingresscontrollers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: nginxingresscontrollers.k8s.nginx.org
1010
spec:

‎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.11.0
7+
image: quay.io/operator-framework/scorecard-test:v1.15.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.11.0
7+
image: quay.io/operator-framework/scorecard-test:v1.15.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.11.0
17+
image: quay.io/operator-framework/scorecard-test:v1.15.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.11.0
27+
image: quay.io/operator-framework/scorecard-test:v1.15.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.11.0
37+
image: quay.io/operator-framework/scorecard-test:v1.15.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.11.0
47+
image: quay.io/operator-framework/scorecard-test:v1.15.0
4848
labels:
4949
suite: olm
5050
test: olm-status-descriptors-test

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ require (
99
github.com/onsi/gomega v1.17.0
1010
github.com/openshift/api v0.0.0-20201013121701-9d5ee23b507d
1111
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
12-
k8s.io/api v0.21.2
13-
k8s.io/apiextensions-apiserver v0.21.2
14-
k8s.io/apimachinery v0.21.2
15-
k8s.io/client-go v0.21.2
16-
sigs.k8s.io/controller-runtime v0.9.2
12+
k8s.io/api v0.22.1
13+
k8s.io/apiextensions-apiserver v0.22.1
14+
k8s.io/apimachinery v0.22.1
15+
k8s.io/client-go v0.22.1
16+
sigs.k8s.io/controller-runtime v0.10.0
1717
)

0 commit comments

Comments
 (0)