Skip to content

Commit

Permalink
deps: bump operator-sdk deps to k8s v1.19 (operator-framework#4294)
Browse files Browse the repository at this point in the history 
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
Signed-off-by: rearl <rearl@secureworks.com>
  • Loading branch information
@rearl-scwx
Eric Stroczynski authored and rearl-scwx committed Feb 5, 2021
1 parent 84f907c commit 69a78c6
Show file tree
Hide file tree
Showing 20 changed files with 102 additions and 100 deletions.
4 changes: 4 additions & 0 deletions changelog/fragments/operator-sdk-binary-v1.19.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
entries:
- description: >
Bumped `operator-sdk` binary dependencies to their k8s v1.19 equivalents.
kind: change
12 changes: 6 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
)

Expand Down
35 changes: 14 additions & 21 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
11 changes: 4 additions & 7 deletions hack/generate/samples/internal/go/v2/memcached_with_webhooks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions hack/generate/samples/internal/go/v3/memcached_with_webhooks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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{}
Expand Down
34 changes: 17 additions & 17 deletions internal/ansible/controller/reconcile_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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",
Expand All @@ -93,7 +93,7 @@ func TestReconcile(t *testing.T) {
"apiVersion": "operator-sdk/v1beta1",
"kind": "Testing",
},
}),
}).Build(),
Result: reconcile.Result{
RequeueAfter: 5 * time.Second,
},
Expand Down Expand Up @@ -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",
Expand All @@ -163,7 +163,7 @@ func TestReconcile(t *testing.T) {
"kind": "Testing",
"spec": map[string]interface{}{},
},
}),
}).Build(),
Request: reconcile.Request{
NamespacedName: types.NamespacedName{
Name: "reconcile",
Expand Down Expand Up @@ -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",
Expand All @@ -237,7 +237,7 @@ func TestReconcile(t *testing.T) {
"kind": "Testing",
"spec": map[string]interface{}{},
},
}),
}).Build(),
Request: reconcile.Request{
NamespacedName: types.NamespacedName{
Name: "reconcile",
Expand All @@ -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",
Expand All @@ -273,7 +273,7 @@ func TestReconcile(t *testing.T) {
"kind": "Testing",
"spec": map[string]interface{}{},
},
}),
}).Build(),
Result: reconcile.Result{
RequeueAfter: 3 * time.Second,
},
Expand Down Expand Up @@ -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",
Expand All @@ -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{
Expand All @@ -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",
Expand Down Expand Up @@ -399,7 +399,7 @@ func TestReconcile(t *testing.T) {
},
},
},
}),
}).Build(),
Result: reconcile.Result{
RequeueAfter: 5 * time.Second,
},
Expand Down Expand Up @@ -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",
Expand All @@ -475,7 +475,7 @@ func TestReconcile(t *testing.T) {
},
},
},
}),
}).Build(),
Result: reconcile.Result{
RequeueAfter: 5 * time.Second,
},
Expand All @@ -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",
Expand All @@ -509,7 +509,7 @@ func TestReconcile(t *testing.T) {
"apiVersion": "operator-sdk/v1beta1",
"kind": "Testing",
},
}),
}).Build(),
Result: reconcile.Result{
RequeueAfter: 5 * time.Second,
},
Expand Down
Loading

0 comments on commit 69a78c6

Please sign in to comment.