From 544b435348eaab7fe0a4a140bb9e4f8c6a8179e6 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Tue, 23 May 2023 09:50:53 -0400 Subject: [PATCH] Update controller-runtime to 0.15.0 Signed-off-by: Scott Andrews --- go.mod | 8 ++++---- go.sum | 19 +++++++++---------- reconcilers/reconcilers_test.go | 12 ++++++++++++ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index e7e11fd..1afbb41 100644 --- a/go.mod +++ b/go.mod @@ -8,13 +8,13 @@ require ( github.com/go-logr/logr v1.2.4 github.com/google/go-cmp v0.5.9 golang.org/x/net v0.10.0 - gomodules.xyz/jsonpatch/v2 v2.2.0 + gomodules.xyz/jsonpatch/v2 v2.3.0 gomodules.xyz/jsonpatch/v3 v3.0.1 k8s.io/api v0.27.2 k8s.io/apimachinery v0.27.2 k8s.io/client-go v0.27.2 k8s.io/utils v0.0.0-20230209194617-a36077c30491 - sigs.k8s.io/controller-runtime v0.15.0-alpha.1 + sigs.k8s.io/controller-runtime v0.15.0 sigs.k8s.io/yaml v1.3.0 ) @@ -59,8 +59,8 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.27.1 // indirect - k8s.io/component-base v0.27.1 // indirect + k8s.io/apiextensions-apiserver v0.27.2 // indirect + k8s.io/component-base v0.27.2 // indirect k8s.io/klog/v2 v2.90.1 // indirect k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/go.sum b/go.sum index 0e32e8d..ed11e31 100644 --- a/go.sum +++ b/go.sum @@ -17,7 +17,6 @@ github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhF github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -98,7 +97,7 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= -github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= +github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -191,8 +190,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= -gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= +gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc= +gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= gomodules.xyz/jsonpatch/v3 v3.0.1 h1:Te7hKxV52TKCbNYq3t84tzKav3xhThdvSsSp/W89IyI= gomodules.xyz/jsonpatch/v3 v3.0.1/go.mod h1:CBhndykehEwTOlEfnsfJwvkFQbSN8YZFr9M+cIHAJto= gomodules.xyz/orderedmap v0.1.0 h1:fM/+TGh/O1KkqGR5xjTKg6bU8OKBkg7p0Y+x/J9m8Os= @@ -238,22 +237,22 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo= k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4= -k8s.io/apiextensions-apiserver v0.27.1 h1:Hp7B3KxKHBZ/FxmVFVpaDiXI6CCSr49P1OJjxKO6o4g= -k8s.io/apiextensions-apiserver v0.27.1/go.mod h1:8jEvRDtKjVtWmdkhOqE84EcNWJt/uwF8PC4627UZghY= +k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo= +k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ= k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg= k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE= k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ= -k8s.io/component-base v0.27.1 h1:kEB8p8lzi4gCs5f2SPU242vOumHJ6EOsOnDM3tTuDTM= -k8s.io/component-base v0.27.1/go.mod h1:UGEd8+gxE4YWoigz5/lb3af3Q24w98pDseXcXZjw+E0= +k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo= +k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.15.0-alpha.1 h1:phsX0u7xY/9zCJnxFTXLWCRXgp7jkIOfT+cVwkQrz84= -sigs.k8s.io/controller-runtime v0.15.0-alpha.1/go.mod h1:EdI5r/x+MzEtPhduK7s3ZAN9z/Ro6gidKsktEj/kIXo= +sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU= +sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= diff --git a/reconcilers/reconcilers_test.go b/reconcilers/reconcilers_test.go index 239afb5..d417f42 100644 --- a/reconcilers/reconcilers_test.go +++ b/reconcilers/reconcilers_test.go @@ -597,6 +597,7 @@ func TestResourceReconciler_Unstructured(t *testing.T) { func TestResourceReconciler(t *testing.T) { testNamespace := "test-namespace" testName := "test-resource" + testFinalizer := "test.finalizer" testRequest := reconcilers.Request{ NamespacedName: types.NamespacedName{Namespace: testNamespace, Name: testName}, } @@ -641,6 +642,7 @@ func TestResourceReconciler(t *testing.T) { GivenObjects: []client.Object{ resource.MetadataDie(func(d *diemetav1.ObjectMetaDie) { d.DeletionTimestamp(&deletedAt) + d.Finalizers(testFinalizer) }), }, Metadata: map[string]interface{}{ @@ -998,6 +1000,7 @@ func TestResourceReconciler(t *testing.T) { func TestAggregateReconciler(t *testing.T) { testNamespace := "test-namespace" testName := "test-resource" + testFinalizer := "test.finalizer" request := reconcilers.Request{ NamespacedName: types.NamespacedName{Namespace: testNamespace, Name: testName}, } @@ -1064,6 +1067,7 @@ func TestAggregateReconciler(t *testing.T) { configMapGiven. MetadataDie(func(d *diemetav1.ObjectMetaDie) { d.DeletionTimestamp(&now) + d.Finalizers(testFinalizer) }), }, Metadata: map[string]interface{}{ @@ -1443,6 +1447,7 @@ func TestAggregateReconciler(t *testing.T) { func TestSyncReconciler(t *testing.T) { testNamespace := "test-namespace" testName := "test-resource" + testFinalizer := "test.finalizer" now := metav1.Now() @@ -1518,6 +1523,7 @@ func TestSyncReconciler(t *testing.T) { Resource: resource. MetadataDie(func(d *diemetav1.ObjectMetaDie) { d.DeletionTimestamp(&now) + d.Finalizers(testFinalizer) }). DieReleasePtr(), Metadata: map[string]interface{}{ @@ -1539,6 +1545,7 @@ func TestSyncReconciler(t *testing.T) { Resource: resource. MetadataDie(func(d *diemetav1.ObjectMetaDie) { d.DeletionTimestamp(&now) + d.Finalizers(testFinalizer) }). DieReleasePtr(), Metadata: map[string]interface{}{ @@ -1560,6 +1567,7 @@ func TestSyncReconciler(t *testing.T) { Resource: resource. MetadataDie(func(d *diemetav1.ObjectMetaDie) { d.DeletionTimestamp(&now) + d.Finalizers(testFinalizer) }). DieReleasePtr(), Metadata: map[string]interface{}{ @@ -1581,6 +1589,7 @@ func TestSyncReconciler(t *testing.T) { Resource: resource. MetadataDie(func(d *diemetav1.ObjectMetaDie) { d.DeletionTimestamp(&now) + d.Finalizers(testFinalizer) }). DieReleasePtr(), Metadata: map[string]interface{}{ @@ -1597,6 +1606,7 @@ func TestSyncReconciler(t *testing.T) { Resource: resource. MetadataDie(func(d *diemetav1.ObjectMetaDie) { d.DeletionTimestamp(&now) + d.Finalizers(testFinalizer) }). DieReleasePtr(), Metadata: map[string]interface{}{ @@ -2203,6 +2213,7 @@ func TestChildReconciler(t *testing.T) { MetadataDie(func(d *diemetav1.ObjectMetaDie) { d.OwnerReferences() d.DeletionTimestamp(&now) + d.Finalizers(testFinalizer) }), }, Metadata: map[string]interface{}{ @@ -3201,6 +3212,7 @@ func TestChildReconciler_Unstructured(t *testing.T) { MetadataDie(func(d *diemetav1.ObjectMetaDie) { d.OwnerReferences() d.DeletionTimestamp(&now) + d.Finalizers(testFinalizer) }), }, Metadata: map[string]interface{}{