From 549343c3f5f5725573205c7448d1eb558df24a62 Mon Sep 17 00:00:00 2001 From: Eric Stroczynski Date: Tue, 8 Dec 2020 16:01:10 -0800 Subject: [PATCH] This commit bumps operator-sdk binary dependencies to k8s v1.19 go.mod,go.sum: update controller-runtime, controller-tools, api, operator-lib, and operator-registry to their k8s v1.19 equivalents *: make API changes --- .../fragments/operator-sdk-binary-v1.19.yaml | 4 +++ go.mod | 12 +++---- go.sum | 35 ++++++++----------- .../internal/go/v2/memcached_with_webhooks.go | 11 +++--- .../internal/go/v3/memcached_with_webhooks.go | 10 +++--- internal/ansible/controller/reconcile_test.go | 34 +++++++++--------- internal/olm/client/client_test.go | 17 +++++---- .../registry/configmap/configmap_test.go | 4 +-- .../registry/configmap/registry_test.go | 26 +++++++------- .../olm/operator/registry/configmap_test.go | 6 ++-- .../registry/index/registry_pod_test.go | 2 +- .../registry/operator_installer_test.go | 22 ++++++------ .../api/v1alpha1/memcached_webhook.go | 1 + testdata/go/v3/memcached-operator/Makefile | 2 +- .../api/v1alpha1/memcached_webhook.go | 4 +-- ...cached-operator.clusterserviceversion.yaml | 2 ++ .../config/webhook/manifests.yaml | 2 ++ .../controllers/memcached_controller.go | 2 +- testdata/go/v3/memcached-operator/go.mod | 2 +- testdata/go/v3/memcached-operator/go.sum | 4 +-- 20 files changed, 102 insertions(+), 100 deletions(-) create mode 100644 changelog/fragments/operator-sdk-binary-v1.19.yaml diff --git a/changelog/fragments/operator-sdk-binary-v1.19.yaml b/changelog/fragments/operator-sdk-binary-v1.19.yaml new file mode 100644 index 00000000000..fc2abf0ef19 --- /dev/null +++ b/changelog/fragments/operator-sdk-binary-v1.19.yaml @@ -0,0 +1,4 @@ +entries: + - description: > + Bumped `operator-sdk` binary dependencies to their k8s v1.19 equivalents. + kind: change diff --git a/go.mod b/go.mod index 96e1ac4c81e..b0a0f336604 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,9 @@ require ( github.com/markbates/inflect v1.0.4 github.com/onsi/ginkgo v1.14.1 github.com/onsi/gomega v1.10.2 - github.com/operator-framework/api v0.3.20 - github.com/operator-framework/operator-lib v0.2.1-0.20201119204525-6700ae54da56 - github.com/operator-framework/operator-registry v1.14.3 + github.com/operator-framework/api v0.4.0 + github.com/operator-framework/operator-lib v0.3.0 + github.com/operator-framework/operator-registry v1.15.3 github.com/prometheus/client_golang v1.7.1 github.com/sergi/go-diff v1.0.0 github.com/sirupsen/logrus v1.7.0 @@ -32,9 +32,9 @@ require ( k8s.io/client-go v0.19.4 k8s.io/kubectl v0.19.4 rsc.io/letsencrypt v0.0.3 // indirect - sigs.k8s.io/controller-runtime v0.7.0-alpha.7 - sigs.k8s.io/controller-tools v0.3.0 - sigs.k8s.io/kubebuilder/v2 v2.3.2-0.20201204230216-593f2e80cdf6 + sigs.k8s.io/controller-runtime v0.7.0 + sigs.k8s.io/controller-tools v0.4.1 + sigs.k8s.io/kubebuilder/v2 v2.3.2-0.20201211222127-503ba3b7e4ad sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index 0af03fa6990..c80021a92c1 100644 --- a/go.sum +++ b/go.sum @@ -295,8 +295,6 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.2.1 h1:fV3MLmabKIZ383XifUjFSwcoGee0v9qgPp8wy5svibE= -github.com/go-logr/logr v0.2.1/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs= github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/zapr v0.1.0 h1:h+WVe9j6HAA01niTJPA/kKH0i7e0rLZBCwauQFcRE54= @@ -709,13 +707,13 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxS github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/operator-framework/api v0.3.7-0.20200602203552-431198de9fc2/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q= -github.com/operator-framework/api v0.3.20 h1:2Ks8GXXl/H2sV9ll2iQBUO65ABQ5VuzN3IKEZCJWljo= -github.com/operator-framework/api v0.3.20/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q= -github.com/operator-framework/operator-lib v0.2.1-0.20201119204525-6700ae54da56 h1:RFuLAujDg2trSdvasocuc4MM/QS8eKRYmTerKQxIrv0= -github.com/operator-framework/operator-lib v0.2.1-0.20201119204525-6700ae54da56/go.mod h1:7JYMD1tU8z+dvtttqwPC59lOTEGAQRdGr+VlxkGJW2k= -github.com/operator-framework/operator-registry v1.14.3 h1:WiIYJy9cfnbzvlwoO5ikgqHnj/WwKLqItJlTz5EeEzQ= -github.com/operator-framework/operator-registry v1.14.3/go.mod h1:0x4Kkl/1LaK5g/6XgEiJrHF/jEAW3QKYg91M4sYuN0o= +github.com/operator-framework/api v0.3.22/go.mod h1:GVNiB6AQucwdZz3ZFXNv9HtcLOzcFnr6O/QldzKG93g= +github.com/operator-framework/api v0.4.0 h1:OeuGMXScjwosNKXttH3uorywr7APT5luTNPWy3zvqXs= +github.com/operator-framework/api v0.4.0/go.mod h1:xXYReW8+PpSBHMxsf0e7uhtfQTLqIM1iz4X6zUs20+c= +github.com/operator-framework/operator-lib v0.3.0 h1:eGJv0k7dEHIT9vfArWPo6U4eVurAOqhYUzXiHEaZq9g= +github.com/operator-framework/operator-lib v0.3.0/go.mod h1:LTp5UQd8ivq4MXqm/W/XHulHQ0RRoZXsAj73sNMAQxc= +github.com/operator-framework/operator-registry v1.15.3 h1:C+u+zjDh6yQAKN+DbUvPeLjojZtJftvp/J28rRqiWWU= +github.com/operator-framework/operator-registry v1.15.3/go.mod h1:CI7cu5ANoSQB54XWr/hXefm1PbKNJztSrhGBEDLCNCg= github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= @@ -830,7 +828,6 @@ github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= @@ -898,8 +895,6 @@ github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wK gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg= -go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= @@ -1015,13 +1010,10 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -1141,6 +1133,7 @@ golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200403190813-44a64ad78b9b h1:AFZdJUT7jJYXQEC29hYH/WZkoV7+KhwxQGmdZ19yYoY= golang.org/x/tools v0.0.0-20200403190813-44a64ad78b9b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200616195046-dc31b401abb5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201014231627-1610a49f37af h1:VIUWFyOgzG3c0t9KYop5Ybp4m56LupfOnFYX7Ipnz+I= golang.org/x/tools v0.0.0-20201014231627-1610a49f37af/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1355,14 +1348,14 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9 h1:rusRLrDhjBp6aYtl9sGEvQJr6faoHoDLd0YcUBTZguI= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0= sigs.k8s.io/controller-runtime v0.6.0/go.mod h1:CpYf5pdNY/B352A1TFLAS2JVSlnGQ5O2cftPHndTroo= -sigs.k8s.io/controller-runtime v0.7.0-alpha.6 h1:ieFqEijQyDEZVIGwI5sYkk7VTa8Itim0kU/TCOnCkto= -sigs.k8s.io/controller-runtime v0.7.0-alpha.6/go.mod h1:03b1n6EtlDvuBPPEOHadJUusruwLWgoT4BDCybMibnA= -sigs.k8s.io/controller-runtime v0.7.0-alpha.7 h1:KtMmb2Ef/S38GNbf0Jpa+FWXqnxFYeWAyhipMmmPCcQ= -sigs.k8s.io/controller-runtime v0.7.0-alpha.7/go.mod h1:pJ3YBrJiAqMAZKi6UVGuE98ZrroV1p+pIhoHsMm9wdU= +sigs.k8s.io/controller-runtime v0.7.0 h1:bU20IBBEPccWz5+zXpLnpVsgBYxqclaHu1pVDl/gEt8= +sigs.k8s.io/controller-runtime v0.7.0/go.mod h1:pJ3YBrJiAqMAZKi6UVGuE98ZrroV1p+pIhoHsMm9wdU= sigs.k8s.io/controller-tools v0.3.0 h1:y3YD99XOyWaXkiF1kd41uRvfp/64teWcrEZFuHxPhJ4= sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= -sigs.k8s.io/kubebuilder/v2 v2.3.2-0.20201204230216-593f2e80cdf6 h1:SE+xhj4aauOCSeZKjRizd6VwHgkVfJABJpVk/xqYTiI= -sigs.k8s.io/kubebuilder/v2 v2.3.2-0.20201204230216-593f2e80cdf6/go.mod h1:J/D/179LBZhQOhRvmMRNbje/Bk+PjbN0/fzUupmO7+U= +sigs.k8s.io/controller-tools v0.4.1 h1:VkuV0MxlRPmRu5iTgBZU4UxUX2LiR99n3sdQGRxZF4w= +sigs.k8s.io/controller-tools v0.4.1/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU= +sigs.k8s.io/kubebuilder/v2 v2.3.2-0.20201211222127-503ba3b7e4ad h1:QCCQLxLLZsNKgp49jG0rErcSz9oa/4J5WU7lnaEA99A= +sigs.k8s.io/kubebuilder/v2 v2.3.2-0.20201211222127-503ba3b7e4ad/go.mod h1:J/D/179LBZhQOhRvmMRNbje/Bk+PjbN0/fzUupmO7+U= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= diff --git a/hack/generate/samples/internal/go/v2/memcached_with_webhooks.go b/hack/generate/samples/internal/go/v2/memcached_with_webhooks.go index bb0a6fce02c..9c1afcb68e1 100644 --- a/hack/generate/samples/internal/go/v2/memcached_with_webhooks.go +++ b/hack/generate/samples/internal/go/v2/memcached_with_webhooks.go @@ -59,6 +59,8 @@ func (mh *MemcachedGoWithWebhooks) Prepare() { func (mh *MemcachedGoWithWebhooks) Run() { log.Infof("creating the project") err := mh.ctx.Init( + // TODO(estroz): change this to 3 when stabilized. + "--project-version", "3-alpha", "--plugins", "go/v2", "--repo", "github.com/example/memcached-operator", "--domain", @@ -176,13 +178,8 @@ func (mh *MemcachedGoWithWebhooks) implementingWebhooks() { // Add imports err = kbtestutils.InsertCode(webhookPath, "import (", - "\n\t\"errors\"") - pkg.CheckError("adding errors import", err) - - err = kbtestutils.InsertCode(webhookPath, - "\n\t\"errors\"", - "\n\t\"k8s.io/apimachinery/pkg/runtime\"") - pkg.CheckError("adding k8s.io/apimachinery/pkg/runtime import", err) + "\"errors\"\n\n\"k8s.io/apimachinery/pkg/runtime\"") + pkg.CheckError("adding webhook imports", err) } // implementingController will customize the Controller diff --git a/hack/generate/samples/internal/go/v3/memcached_with_webhooks.go b/hack/generate/samples/internal/go/v3/memcached_with_webhooks.go index ec451b8fe36..57c7ac51ab6 100644 --- a/hack/generate/samples/internal/go/v3/memcached_with_webhooks.go +++ b/hack/generate/samples/internal/go/v3/memcached_with_webhooks.go @@ -59,7 +59,9 @@ func (mh *MemcachedGoWithWebhooks) Prepare() { func (mh *MemcachedGoWithWebhooks) Run() { log.Infof("creating the project") err := mh.ctx.Init( - // TODO(estroz): change this to go/v3 is stabilized. + // TODO(estroz): change this to 3 when stabilized. + "--project-version", "3-alpha", + // TODO(estroz): change this to go/v3 when stabilized. "--plugins", "go/v3-alpha", "--repo", "github.com/example/memcached-operator", "--domain", @@ -168,11 +170,11 @@ func (mh *MemcachedGoWithWebhooks) implementingWebhooks() { err := kbtestutils.InsertCode(webhookPath, "// TODO(user): fill in your defaulting logic.\n}", webhooksFragment) - pkg.CheckError("replacing reconcile", err) + pkg.CheckError("replacing webhook validate implementation", err) err = testutils.ReplaceInFile(webhookPath, "// TODO(user): fill in your defaulting logic.", "if r.Spec.Size == 0 {\n\t\tr.Spec.Size = 3\n\t}") - pkg.CheckError("replacing default webhook implementation", err) + pkg.CheckError("replacing webhook default implementation", err) // Add imports err = kbtestutils.InsertCode(webhookPath, @@ -420,7 +422,7 @@ const watchCustomizedFragment = `return ctrl.NewControllerManagedBy(mgr). const webhooksFragment = ` // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation. -// +kubebuilder:webhook:path=/validate-cache-example-com-v1alpha1-memcached,mutating=false,failurePolicy=fail,sideEffects=None,groups=cache.example.com,resources=memcacheds,verbs=create;update,versions=v1alpha1,name=vmemcached.kb.io,admissionReviewVersions={v1beta1} +// +kubebuilder:webhook:path=/validate-cache-example-com-v1alpha1-memcached,mutating=false,failurePolicy=fail,sideEffects=None,groups=cache.example.com,resources=memcacheds,verbs=create;update,versions=v1alpha1,name=vmemcached.kb.io,admissionReviewVersions={v1,v1beta1} var _ webhook.Validator = &Memcached{} diff --git a/internal/ansible/controller/reconcile_test.go b/internal/ansible/controller/reconcile_test.go index a697aac2839..e60a40bc5fb 100644 --- a/internal/ansible/controller/reconcile_test.go +++ b/internal/ansible/controller/reconcile_test.go @@ -62,7 +62,7 @@ func TestReconcile(t *testing.T) { Runner: &fake.Runner{ JobEvents: []eventapi.JobEvent{}, }, - Client: fakeclient.NewFakeClient(), + Client: fakeclient.NewClientBuilder().Build(), Result: reconcile.Result{}, Request: reconcile.Request{ NamespacedName: types.NamespacedName{ @@ -84,7 +84,7 @@ func TestReconcile(t *testing.T) { }, }, }, - Client: fakeclient.NewFakeClient(&unstructured.Unstructured{ + Client: fakeclient.NewClientBuilder().WithObjects(&unstructured.Unstructured{ Object: map[string]interface{}{ "metadata": map[string]interface{}{ "name": "reconcile", @@ -93,7 +93,7 @@ func TestReconcile(t *testing.T) { "apiVersion": "operator-sdk/v1beta1", "kind": "Testing", }, - }), + }).Build(), Result: reconcile.Result{ RequeueAfter: 5 * time.Second, }, @@ -153,7 +153,7 @@ func TestReconcile(t *testing.T) { }, }, }, - Client: fakeclient.NewFakeClient(&unstructured.Unstructured{ + Client: fakeclient.NewClientBuilder().WithObjects(&unstructured.Unstructured{ Object: map[string]interface{}{ "metadata": map[string]interface{}{ "name": "reconcile", @@ -163,7 +163,7 @@ func TestReconcile(t *testing.T) { "kind": "Testing", "spec": map[string]interface{}{}, }, - }), + }).Build(), Request: reconcile.Request{ NamespacedName: types.NamespacedName{ Name: "reconcile", @@ -227,7 +227,7 @@ func TestReconcile(t *testing.T) { }, }, }, - Client: fakeclient.NewFakeClient(&unstructured.Unstructured{ + Client: fakeclient.NewClientBuilder().WithObjects(&unstructured.Unstructured{ Object: map[string]interface{}{ "metadata": map[string]interface{}{ "name": "reconcile", @@ -237,7 +237,7 @@ func TestReconcile(t *testing.T) { "kind": "Testing", "spec": map[string]interface{}{}, }, - }), + }).Build(), Request: reconcile.Request{ NamespacedName: types.NamespacedName{ Name: "reconcile", @@ -260,7 +260,7 @@ func TestReconcile(t *testing.T) { }, Finalizer: "testing.io", }, - Client: fakeclient.NewFakeClient(&unstructured.Unstructured{ + Client: fakeclient.NewClientBuilder().WithObjects(&unstructured.Unstructured{ Object: map[string]interface{}{ "metadata": map[string]interface{}{ "name": "reconcile", @@ -273,7 +273,7 @@ func TestReconcile(t *testing.T) { "kind": "Testing", "spec": map[string]interface{}{}, }, - }), + }).Build(), Result: reconcile.Result{ RequeueAfter: 3 * time.Second, }, @@ -331,7 +331,7 @@ func TestReconcile(t *testing.T) { }, Finalizer: "testing.io", }, - Client: fakeclient.NewFakeClient(&unstructured.Unstructured{ + Client: fakeclient.NewClientBuilder().WithObjects(&unstructured.Unstructured{ Object: map[string]interface{}{ "metadata": map[string]interface{}{ "name": "reconcile", @@ -345,7 +345,7 @@ func TestReconcile(t *testing.T) { "kind": "Testing", "spec": map[string]interface{}{}, }, - }), + }).Build(), Result: reconcile.Result{}, Request: reconcile.Request{ NamespacedName: types.NamespacedName{ @@ -368,7 +368,7 @@ func TestReconcile(t *testing.T) { }, Finalizer: "testing.io", }, - Client: fakeclient.NewFakeClient(&unstructured.Unstructured{ + Client: fakeclient.NewClientBuilder().WithObjects(&unstructured.Unstructured{ Object: map[string]interface{}{ "metadata": map[string]interface{}{ "name": "reconcile", @@ -399,7 +399,7 @@ func TestReconcile(t *testing.T) { }, }, }, - }), + }).Build(), Result: reconcile.Result{ RequeueAfter: 5 * time.Second, }, @@ -449,7 +449,7 @@ func TestReconcile(t *testing.T) { }, }, }, - Client: fakeclient.NewFakeClient(&unstructured.Unstructured{ + Client: fakeclient.NewClientBuilder().WithObjects(&unstructured.Unstructured{ Object: map[string]interface{}{ "metadata": map[string]interface{}{ "name": "reconcile", @@ -475,7 +475,7 @@ func TestReconcile(t *testing.T) { }, }, }, - }), + }).Build(), Result: reconcile.Result{ RequeueAfter: 5 * time.Second, }, @@ -500,7 +500,7 @@ func TestReconcile(t *testing.T) { }, }, }, - Client: fakeclient.NewFakeClient(&unstructured.Unstructured{ + Client: fakeclient.NewClientBuilder().WithObjects(&unstructured.Unstructured{ Object: map[string]interface{}{ "metadata": map[string]interface{}{ "name": "reconcile", @@ -509,7 +509,7 @@ func TestReconcile(t *testing.T) { "apiVersion": "operator-sdk/v1beta1", "kind": "Testing", }, - }), + }).Build(), Result: reconcile.Result{ RequeueAfter: 5 * time.Second, }, diff --git a/internal/olm/client/client_test.go b/internal/olm/client/client_test.go index b5f0a170ed2..c513f2bb9be 100644 --- a/internal/olm/client/client_test.go +++ b/internal/olm/client/client_test.go @@ -74,8 +74,7 @@ var _ = Describe("Client", func() { }) Context("with a valid csv", func() { It("check error string for pod errors", func() { - fakeClient = fake.NewFakeClient( - + fakeClient = fake.NewClientBuilder().WithObjects( &corev1.Pod{ ObjectMeta: metav1.ObjectMeta{ Name: "test-operator-kc44t", @@ -119,7 +118,7 @@ var _ = Describe("Client", func() { }, }, }, - ) + ).Build() key := types.NamespacedName{ Name: "test.operator", Namespace: "test-operator-system", @@ -130,7 +129,7 @@ var _ = Describe("Client", func() { }) It("check error string for multiple pod failures", func() { - fakeClt := fake.NewFakeClient( + fakeClt := fake.NewClientBuilder().WithObjects( &corev1.Pod{ ObjectMeta: metav1.ObjectMeta{ Name: "test-operator-jjj", @@ -196,7 +195,7 @@ var _ = Describe("Client", func() { }, }, }, - ) + ).Build() key := types.NamespacedName{ Name: "test.operator", Namespace: "test-operator-system", @@ -208,7 +207,7 @@ var _ = Describe("Client", func() { }) It("check error string for deployment errors,when no pods exist", func() { - fakeClient = fake.NewFakeClient( + fakeClient = fake.NewClientBuilder().WithObjects( &appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Name: "test-operator-controller-manager", @@ -227,7 +226,7 @@ var _ = Describe("Client", func() { }, }, }, - ) + ).Build() key := types.NamespacedName{ Name: "test-operator", Namespace: "test-operator-system", @@ -238,7 +237,7 @@ var _ = Describe("Client", func() { }) It("check error string,when no deployments exist for given CSV", func() { - fakeClient = fake.NewFakeClient() + fakeClient = fake.NewClientBuilder().Build() olmclient := Client{KubeClient: fakeClient} key := types.NamespacedName{ Name: "test-operator", @@ -249,7 +248,7 @@ var _ = Describe("Client", func() { Expect(err.Error()).To(ContainSubstring("\"dummy-operator\" not found")) }) It("check error string,when no namespace provided", func() { - fakeClient = fake.NewFakeClient() + fakeClient = fake.NewClientBuilder().Build() olmclient := Client{KubeClient: fakeClient} key := types.NamespacedName{ Name: "test-operator", diff --git a/internal/olm/operator/registry/configmap/configmap_test.go b/internal/olm/operator/registry/configmap/configmap_test.go index b54c86222b3..434e4855555 100644 --- a/internal/olm/operator/registry/configmap/configmap_test.go +++ b/internal/olm/operator/registry/configmap/configmap_test.go @@ -243,7 +243,7 @@ var _ = Describe("ConfigMap", func() { e error ) BeforeEach(func() { - fakeclient := fake.NewFakeClient( + fakeclient := fake.NewClientBuilder().WithObjects( &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Namespace: "testns", @@ -256,7 +256,7 @@ var _ = Describe("ConfigMap", func() { Labels: makeRegistryLabels("test"), }, }, - ) + ).Build() rr = RegistryResources{ Client: &client.Client{ KubeClient: fakeclient, diff --git a/internal/olm/operator/registry/configmap/registry_test.go b/internal/olm/operator/registry/configmap/registry_test.go index e1436c01ae3..7ca7c3d0a02 100644 --- a/internal/olm/operator/registry/configmap/registry_test.go +++ b/internal/olm/operator/registry/configmap/registry_test.go @@ -61,7 +61,7 @@ var _ = Describe("Registry", func() { Describe("DeletePackageManifestsRegistry", func() { It("should delete the package manifest registry", func() { - fakeclient := fake.NewFakeClient( + fakeclient := fake.NewClientBuilder().WithObjects( &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Namespace: "testns", @@ -70,7 +70,7 @@ var _ = Describe("Registry", func() { }, newRegistryDeployment("pkgName", "testns"), newRegistryService("pkgName", "testns"), - ) + ).Build() rr := RegistryResources{ Pkg: &manifests.PackageManifest{ PackageName: "pkgName", @@ -123,7 +123,7 @@ var _ = Describe("Registry", func() { ) BeforeEach(func() { testns = "testns" - fakeclient := fake.NewFakeClient( + fakeclient := fake.NewClientBuilder().WithObjects( &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Namespace: testns, @@ -132,7 +132,7 @@ var _ = Describe("Registry", func() { }, newRegistryDeployment("pkgName", testns), newRegistryService("pkgName", testns), - ) + ).Build() rr = RegistryResources{ Pkg: &manifests.PackageManifest{ PackageName: "pkgName", @@ -196,7 +196,7 @@ var _ = Describe("Registry", func() { ) BeforeEach(func() { testns = "testns" - fakeclient := fake.NewFakeClient( + fakeclient := fake.NewClientBuilder().WithObjects( &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Name: "config1", @@ -213,7 +213,7 @@ var _ = Describe("Registry", func() { }, newRegistryDeployment("pkgName", testns), newRegistryService("pkgName", testns), - ) + ).Build() rr = RegistryResources{ Pkg: &manifests.PackageManifest{ PackageName: "pkgName", @@ -251,7 +251,7 @@ var _ = Describe("Registry", func() { }) It("should return true if there are no registry configmaps", func() { - rr.Client.KubeClient = fake.NewFakeClient() + rr.Client.KubeClient = fake.NewClientBuilder().Build() temp, err := rr.IsRegistryDataStale(context.TODO(), testns) Expect(err).Should(BeNil()) @@ -266,7 +266,7 @@ var _ = Describe("Registry", func() { }) It("should return true if the number of files to be added to the registry don't match the numberof files currently in the registry", func() { - rr.Client.KubeClient = fake.NewFakeClient( + rr.Client.KubeClient = fake.NewClientBuilder().WithObjects( &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Name: getRegistryConfigMapName("pkgName") + "-package", @@ -283,7 +283,7 @@ var _ = Describe("Registry", func() { }, newRegistryDeployment("pkgName", testns), newRegistryService("pkgName", testns), - ) + ).Build() temp, err := rr.IsRegistryDataStale(context.TODO(), testns) Expect(err).Should(BeNil()) @@ -298,7 +298,7 @@ var _ = Describe("Registry", func() { val1: "val1", val2: "val2", }, "userInput") - rr.Client.KubeClient = fake.NewFakeClient( + rr.Client.KubeClient = fake.NewClientBuilder().WithObjects( &corev1.ConfigMap{ BinaryData: binarydata, ObjectMeta: metav1.ObjectMeta{ @@ -316,7 +316,7 @@ var _ = Describe("Registry", func() { }, newRegistryDeployment("pkgName", testns), newRegistryService("pkgName", testns), - ) + ).Build() temp, err := rr.IsRegistryDataStale(context.TODO(), testns) Expect(err).Should(BeNil()) @@ -332,7 +332,7 @@ var _ = Describe("Registry", func() { }, }, }) - rr.Client.KubeClient = fake.NewFakeClient( + rr.Client.KubeClient = fake.NewClientBuilder().WithObjects( &corev1.ConfigMap{ BinaryData: binarydata, ObjectMeta: metav1.ObjectMeta{ @@ -350,7 +350,7 @@ var _ = Describe("Registry", func() { }, newRegistryDeployment("pkgName", testns), newRegistryService("pkgName", testns), - ) + ).Build() temp, err := rr.IsRegistryDataStale(context.TODO(), testns) Expect(err).Should(BeNil()) diff --git a/internal/olm/operator/registry/configmap_test.go b/internal/olm/operator/registry/configmap_test.go index 871cc2ed508..95be3c02642 100644 --- a/internal/olm/operator/registry/configmap_test.go +++ b/internal/olm/operator/registry/configmap_test.go @@ -42,7 +42,9 @@ var _ = Describe("Configmap", func() { ctlog := &ConfigMapCatalogCreator{ cfg: &operator.Configuration{ Namespace: "testns", - Client: fake.NewFakeClient(newCatalogSource("pkgName", "testns", withSDKPublisher("pkgName"))), + Client: fake.NewClientBuilder().WithObjects( + newCatalogSource("pkgName", "testns", withSDKPublisher("pkgName")), + ).Build(), }, Package: &apimanifests.PackageManifest{ PackageName: "pkgName", @@ -61,7 +63,7 @@ var _ = Describe("Configmap", func() { ctlog := &ConfigMapCatalogCreator{ cfg: &operator.Configuration{ Namespace: "testns", - Client: fake.NewFakeClient(cs), + Client: fake.NewClientBuilder().WithObjects(cs).Build(), }, Package: &apimanifests.PackageManifest{ PackageName: "pkgName", diff --git a/internal/olm/operator/registry/index/registry_pod_test.go b/internal/olm/operator/registry/index/registry_pod_test.go index 49ea305e5ea..c306a34d38d 100644 --- a/internal/olm/operator/registry/index/registry_pod_test.go +++ b/internal/olm/operator/registry/index/registry_pod_test.go @@ -32,7 +32,7 @@ import ( // newFakeClient() returns a fake controller runtime client func newFakeClient() client.Client { - return fakeclient.NewFakeClient() + return fakeclient.NewClientBuilder().Build() } func TestCreateRegistryPod(t *testing.T) { diff --git a/internal/olm/operator/registry/operator_installer_test.go b/internal/olm/operator/registry/operator_installer_test.go index 0719600ed99..5d5357d2f0c 100644 --- a/internal/olm/operator/registry/operator_installer_test.go +++ b/internal/olm/operator/registry/operator_installer_test.go @@ -52,7 +52,7 @@ var _ = Describe("OperatorInstaller", func() { sch = runtime.NewScheme() Expect(v1.AddToScheme(sch)).To(Succeed()) Expect(v1alpha1.AddToScheme(sch)).To(Succeed()) - cfg.Client = fake.NewFakeClientWithScheme(sch) + cfg.Client = fake.NewClientBuilder().WithScheme(sch).Build() oi = NewOperatorInstaller(cfg) oi.StartingCSV = "fakeName" @@ -77,7 +77,7 @@ var _ = Describe("OperatorInstaller", func() { It("should pass through any client errors (duplicate)", func() { sub := newSubscription(oi.StartingCSV, oi.cfg.Namespace, withCatalogSource("duplicate", oi.cfg.Namespace)) - oi.cfg.Client = fake.NewFakeClientWithScheme(sch, sub) + oi.cfg.Client = fake.NewClientBuilder().WithScheme(sch).WithObjects(sub).Build() _, err := oi.createSubscription(context.TODO(), "duplicate") Expect(err).To(HaveOccurred()) @@ -98,14 +98,14 @@ var _ = Describe("OperatorInstaller", func() { }) It("should update the install plan", func() { - oi.cfg.Client = fake.NewFakeClientWithScheme(sch, + oi.cfg.Client = fake.NewClientBuilder().WithScheme(sch).WithObjects( &v1alpha1.InstallPlan{ ObjectMeta: metav1.ObjectMeta{ Name: "fakeName", Namespace: "fakeNS", }, }, - ) + ).Build() ip := &v1alpha1.InstallPlan{} ipKey := types.NamespacedName{ @@ -136,7 +136,7 @@ var _ = Describe("OperatorInstaller", func() { Expect(ip.Spec.Approved).To(Equal(true)) }) It("should return an error if the install plan does not exist.", func() { - oi.cfg.Client = fake.NewFakeClientWithScheme(sch) + oi.cfg.Client = fake.NewClientBuilder().WithScheme(sch).Build() sub := &v1alpha1.Subscription{ Status: v1alpha1.SubscriptionStatus{ InstallPlanRef: &corev1.ObjectReference{ @@ -161,7 +161,7 @@ var _ = Describe("OperatorInstaller", func() { cfg := &operator.Configuration{} sch = runtime.NewScheme() Expect(v1alpha1.AddToScheme(sch)).To(Succeed()) - cfg.Client = fake.NewFakeClientWithScheme(sch) + cfg.Client = fake.NewClientBuilder().WithScheme(sch).Build() oi = NewOperatorInstaller(cfg) oi.StartingCSV = "fakeName" @@ -204,7 +204,7 @@ var _ = Describe("OperatorInstaller", func() { BeforeEach(func() { sch := runtime.NewScheme() Expect(v1.AddToScheme(sch)).To(Succeed()) - client = fake.NewFakeClientWithScheme(sch) + client = fake.NewClientBuilder().WithScheme(sch).Build() oi = OperatorInstaller{ cfg: &operator.Configuration{ Scheme: sch, @@ -231,7 +231,7 @@ var _ = Describe("OperatorInstaller", func() { oi.SupportedInstallModes = operator.GetSupportedInstallModes(modes) }) It("should return an error when problems finding OperatorGroup", func() { - oi.cfg.Client = fake.NewFakeClient() + oi.cfg.Client = fake.NewClientBuilder().Build() err := oi.ensureOperatorGroup(context.TODO()) Expect(err).To(HaveOccurred()) }) @@ -382,7 +382,7 @@ var _ = Describe("OperatorInstaller", func() { BeforeEach(func() { sch := runtime.NewScheme() Expect(v1.AddToScheme(sch)).To(Succeed()) - client = fake.NewFakeClientWithScheme(sch) + client = fake.NewClientBuilder().WithScheme(sch).Build() oi = OperatorInstaller{ cfg: &operator.Configuration{ Scheme: sch, @@ -453,7 +453,7 @@ var _ = Describe("OperatorInstaller", func() { BeforeEach(func() { sch := runtime.NewScheme() Expect(v1.AddToScheme(sch)).To(Succeed()) - client = fake.NewFakeClientWithScheme(sch) + client = fake.NewClientBuilder().WithScheme(sch).Build() oi = OperatorInstaller{ cfg: &operator.Configuration{ Scheme: sch, @@ -463,7 +463,7 @@ var _ = Describe("OperatorInstaller", func() { } }) It("should return an error if no OperatorGroups exist", func() { - oi.cfg.Client = fake.NewFakeClient() + oi.cfg.Client = fake.NewClientBuilder().Build() grp, found, err := oi.getOperatorGroup(context.TODO()) Expect(grp).To(BeNil()) Expect(found).To(BeFalse()) diff --git a/testdata/go/v2/memcached-operator/api/v1alpha1/memcached_webhook.go b/testdata/go/v2/memcached-operator/api/v1alpha1/memcached_webhook.go index 99a42b91d10..e2063a6fc66 100644 --- a/testdata/go/v2/memcached-operator/api/v1alpha1/memcached_webhook.go +++ b/testdata/go/v2/memcached-operator/api/v1alpha1/memcached_webhook.go @@ -18,6 +18,7 @@ package v1alpha1 import ( "errors" + "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" logf "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/testdata/go/v3/memcached-operator/Makefile b/testdata/go/v3/memcached-operator/Makefile index 482fa7aebe7..4a517477bf3 100644 --- a/testdata/go/v3/memcached-operator/Makefile +++ b/testdata/go/v3/memcached-operator/Makefile @@ -29,7 +29,7 @@ all: manager ENVTEST_ASSETS_DIR=$(shell pwd)/testbin test: generate fmt vet manifests mkdir -p ${ENVTEST_ASSETS_DIR} - test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.0-alpha.8/hack/setup-envtest.sh + test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.0/hack/setup-envtest.sh source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out # Build manager binary diff --git a/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_webhook.go b/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_webhook.go index 65cafb56d07..b9189aa44af 100644 --- a/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_webhook.go +++ b/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_webhook.go @@ -36,7 +36,7 @@ func (r *Memcached) SetupWebhookWithManager(mgr ctrl.Manager) error { // EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! -// +kubebuilder:webhook:path=/mutate-cache-example-com-v1alpha1-memcached,mutating=true,failurePolicy=fail,sideEffects=None,groups=cache.example.com,resources=memcacheds,verbs=create;update,versions=v1alpha1,name=mmemcached.kb.io,admissionReviewVersions={v1beta1} +// +kubebuilder:webhook:path=/mutate-cache-example-com-v1alpha1-memcached,mutating=true,failurePolicy=fail,sideEffects=None,groups=cache.example.com,resources=memcacheds,verbs=create;update,versions=v1alpha1,name=mmemcached.kb.io,admissionReviewVersions={v1,v1beta1} var _ webhook.Defaulter = &Memcached{} @@ -50,7 +50,7 @@ func (r *Memcached) Default() { } // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation. -// +kubebuilder:webhook:path=/validate-cache-example-com-v1alpha1-memcached,mutating=false,failurePolicy=fail,sideEffects=None,groups=cache.example.com,resources=memcacheds,verbs=create;update,versions=v1alpha1,name=vmemcached.kb.io,admissionReviewVersions={v1beta1} +// +kubebuilder:webhook:path=/validate-cache-example-com-v1alpha1-memcached,mutating=false,failurePolicy=fail,sideEffects=None,groups=cache.example.com,resources=memcacheds,verbs=create;update,versions=v1alpha1,name=vmemcached.kb.io,admissionReviewVersions={v1,v1beta1} var _ webhook.Validator = &Memcached{} diff --git a/testdata/go/v3/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml b/testdata/go/v3/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml index d6ad1d003da..44ab0a69513 100644 --- a/testdata/go/v3/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml +++ b/testdata/go/v3/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml @@ -213,6 +213,7 @@ spec: version: 0.0.1 webhookdefinitions: - admissionReviewVersions: + - v1 - v1beta1 containerPort: 443 deploymentName: memcached-operator-controller-manager @@ -233,6 +234,7 @@ spec: type: ValidatingAdmissionWebhook webhookPath: /validate-cache-example-com-v1alpha1-memcached - admissionReviewVersions: + - v1 - v1beta1 containerPort: 443 deploymentName: memcached-operator-controller-manager diff --git a/testdata/go/v3/memcached-operator/config/webhook/manifests.yaml b/testdata/go/v3/memcached-operator/config/webhook/manifests.yaml index 0ac58a1bd25..2dcfac150f8 100644 --- a/testdata/go/v3/memcached-operator/config/webhook/manifests.yaml +++ b/testdata/go/v3/memcached-operator/config/webhook/manifests.yaml @@ -7,6 +7,7 @@ metadata: name: mutating-webhook-configuration webhooks: - admissionReviewVersions: + - v1 - v1beta1 clientConfig: service: @@ -35,6 +36,7 @@ metadata: name: validating-webhook-configuration webhooks: - admissionReviewVersions: + - v1 - v1beta1 clientConfig: service: diff --git a/testdata/go/v3/memcached-operator/controllers/memcached_controller.go b/testdata/go/v3/memcached-operator/controllers/memcached_controller.go index 4ed03157281..0978d43bd4c 100644 --- a/testdata/go/v3/memcached-operator/controllers/memcached_controller.go +++ b/testdata/go/v3/memcached-operator/controllers/memcached_controller.go @@ -55,7 +55,7 @@ type MemcachedReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.7.0-alpha.8/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.7.0/pkg/reconcile func (r *MemcachedReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { log := r.Log.WithValues("memcached", req.NamespacedName) diff --git a/testdata/go/v3/memcached-operator/go.mod b/testdata/go/v3/memcached-operator/go.mod index 8ea59968a61..64a36fc9214 100644 --- a/testdata/go/v3/memcached-operator/go.mod +++ b/testdata/go/v3/memcached-operator/go.mod @@ -9,5 +9,5 @@ require ( k8s.io/api v0.19.2 k8s.io/apimachinery v0.19.2 k8s.io/client-go v0.19.2 - sigs.k8s.io/controller-runtime v0.7.0-alpha.8 + sigs.k8s.io/controller-runtime v0.7.0 ) diff --git a/testdata/go/v3/memcached-operator/go.sum b/testdata/go/v3/memcached-operator/go.sum index 843c9201519..ed5f385e5f3 100644 --- a/testdata/go/v3/memcached-operator/go.sum +++ b/testdata/go/v3/memcached-operator/go.sum @@ -629,8 +629,8 @@ k8s.io/utils v0.0.0-20200912215256-4140de9c8800 h1:9ZNvfPvVIEsp/T1ez4GQuzCcCTEQW k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0= -sigs.k8s.io/controller-runtime v0.7.0-alpha.8 h1:l8I2KO3xLuNaT0yPP6mtWLw5NuMG3dY2YiaQXEGApXg= -sigs.k8s.io/controller-runtime v0.7.0-alpha.8/go.mod h1:pJ3YBrJiAqMAZKi6UVGuE98ZrroV1p+pIhoHsMm9wdU= +sigs.k8s.io/controller-runtime v0.7.0 h1:bU20IBBEPccWz5+zXpLnpVsgBYxqclaHu1pVDl/gEt8= +sigs.k8s.io/controller-runtime v0.7.0/go.mod h1:pJ3YBrJiAqMAZKi6UVGuE98ZrroV1p+pIhoHsMm9wdU= sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=