chore: upgrade operator-sdk to v1.14.0

install/operator/.lib.sh

@@ -268,16 +268,16 @@ build_image()
 
 openapi_gen() {
     if hash openapi-gen 2>/dev/null; then
-        openapi-gen --logtostderr=true -o "" \
+        openapi-gen --logtostderr=true -o "" --go-header-file config/boilerplate.go.txt \
             -i ./pkg/apis/syndesis/v1alpha1 -O zz_generated.openapi -p ./pkg/apis/syndesis/v1alpha1
 
-        openapi-gen --logtostderr=true -o "" \
+        openapi-gen --logtostderr=true -o "" --go-header-file config/boilerplate.go.txt \
             -i ./pkg/apis/syndesis/v1beta1 -O zz_generated.openapi -p ./pkg/apis/syndesis/v1beta1
 
-        openapi-gen --logtostderr=true -o "" \
+        openapi-gen --logtostderr=true -o "" --go-header-file config/boilerplate.go.txt \
             -i ./pkg/apis/syndesis/v1beta2 -O zz_generated.openapi -p ./pkg/apis/syndesis/v1beta2
 
-        openapi-gen --logtostderr=true -o "" \
+        openapi-gen --logtostderr=true -o "" --go-header-file config/boilerplate.go.txt \
             -i ./pkg/apis/syndesis/v1beta3 -O zz_generated.openapi -p ./pkg/apis/syndesis/v1beta3
     else
         echo "skipping go openapi generation"

install/operator/config/boilerplate.go.txt

@@ -0,0 +1,15 @@
+/*
+Copyright (C) 2016 Red Hat, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/

install/operator/config/vars/Makefile

@@ -1,5 +1,5 @@
 CONTROLLER_GEN_VERSION := v0.4.1
-OPERATOR_SDK_VERSION := v1.5.0
+OPERATOR_SDK_VERSION := v1.14.0
 KUSTOMIZE_VERSION := v4.1.2
 
 DEFAULT_VERSION := 1.14.0

install/operator/go.mod

@@ -14,66 +14,63 @@ require (
 	github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
 	github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
-	github.com/go-logr/logr v0.4.0
-	github.com/go-openapi/spec v0.20.3
+	github.com/go-logr/logr v1.2.0
 	github.com/imdario/mergo v0.3.12
 	github.com/lib/pq v1.9.0
 	github.com/openshift/api v3.9.1-0.20190927182313-d4a64ec2cbd8+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0
-	github.com/prometheus/client_golang v1.10.0
+	github.com/prometheus/client_golang v1.11.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
 	github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
 	github.com/spf13/cast v1.3.1
-	github.com/spf13/cobra v1.1.3
+	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	github.com/testcontainers/testcontainers-go v0.3.1
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.21.1
-	k8s.io/apiextensions-apiserver v0.21.1
-	k8s.io/apimachinery v0.21.1
+	k8s.io/api v0.22.3
+	k8s.io/apiextensions-apiserver v0.22.3
+	k8s.io/apimachinery v0.22.3
 	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/code-generator v0.21.0
-	k8s.io/gengo v0.0.0-20210203185629-de9496dff47b
-	k8s.io/kube-openapi v0.0.0-20210323165736-1a6458611d18
-	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10 // indirect
-	sigs.k8s.io/controller-runtime v0.9.0
-	sigs.k8s.io/yaml v1.2.0
+	k8s.io/code-generator v0.22.3
+	k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c
+	k8s.io/kube-openapi v0.0.0-20211029090450-ec1f4c89925a
+	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
+	sigs.k8s.io/controller-runtime v0.10.0
+	sigs.k8s.io/yaml v1.3.0
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.20.6
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.20.6
-	k8s.io/client-go => k8s.io/client-go v0.20.6
-	k8s.io/code-generator => k8s.io/code-generator v0.20.6
-	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.7.0
+	k8s.io/client-go => k8s.io/client-go v0.22.3
+	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.10.2
 )
 
 require (
 	github.com/blang/semver/v4 v4.0.0
 	github.com/coreos/prometheus-operator v0.39.0 // indirect
 	github.com/emicklei/go-restful v2.15.0+incompatible // indirect
-	github.com/go-logr/zapr v0.2.0
+	github.com/go-logr/zapr v0.4.0
+	github.com/go-openapi/jsonreference v0.19.6 // indirect
 	github.com/go-openapi/swag v0.19.15 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.2.0 // indirect
-	github.com/googleapis/gnostic v0.5.4 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/leanovate/gopter v0.2.9
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/operator-framework/api v0.8.0
+	github.com/operator-framework/api v0.10.7
 	github.com/operator-framework/operator-lifecycle-manager v0.18.2
-	github.com/operator-framework/operator-sdk v0.19.4
-	github.com/prometheus/common v0.20.0 // indirect
+	github.com/operator-framework/operator-sdk v1.14.0
 	github.com/rogpeppe/go-internal v1.8.0
-	github.com/spf13/afero v1.2.2
-	go.uber.org/zap v1.16.0
-	golang.org/x/mod v0.4.2 // indirect
-	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
+	github.com/spf13/afero v1.6.0
+	go.uber.org/zap v1.19.0
+	golang.org/x/mod v0.5.1 // indirect
+	golang.org/x/net v0.0.0-20211101193420-4a448f8816b3 // indirect
+	golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect
+	golang.org/x/tools v0.1.7 // indirect
+	k8s.io/klog/v2 v2.30.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
 )
 
 replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.19.4
@@ -85,4 +82,10 @@ replace (
 	github.com/openshift/api => github.com/openshift/api v0.0.0-20200205145930-e9d93e317dd1
 )
 
+replace github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
+
+replace k8s.io/klog/v2 => k8s.io/klog/v2 v2.10.0
+
+exclude github.com/pkg/sftp v1.10.1
+
 go 1.14