From 8bf08237f77ca9dfb60ac275028f56c962e5cd9e Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Wed, 2 Oct 2019 12:32:43 +0100 Subject: [PATCH] Migrate acmechallenges and acmeorders to use UpdateStatus Signed-off-by: James Munnelly --- pkg/controller/acmechallenges/sync.go | 2 +- pkg/controller/acmechallenges/sync_test.go | 18 ++++++++++++------ pkg/controller/acmeorders/sync.go | 2 +- pkg/controller/acmeorders/sync_test.go | 12 ++++++++---- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pkg/controller/acmechallenges/sync.go b/pkg/controller/acmechallenges/sync.go index f18d9e160..24ddc4820 100644 --- a/pkg/controller/acmechallenges/sync.go +++ b/pkg/controller/acmechallenges/sync.go @@ -70,7 +70,7 @@ func (c *controller) Sync(ctx context.Context, ch *cmacme.Challenge) (err error) if reflect.DeepEqual(oldChal.Status, ch.Status) && len(oldChal.Finalizers) == len(ch.Finalizers) { return } - _, updateErr := c.cmClient.AcmeV1alpha2().Challenges(ch.Namespace).Update(ch) + _, updateErr := c.cmClient.AcmeV1alpha2().Challenges(ch.Namespace).UpdateStatus(ch) if err != nil { err = utilerrors.NewAggregate([]error{err, updateErr}) } diff --git a/pkg/controller/acmechallenges/sync_test.go b/pkg/controller/acmechallenges/sync_test.go index e3df6d3d1..b3f4fe482 100644 --- a/pkg/controller/acmechallenges/sync_test.go +++ b/pkg/controller/acmechallenges/sync_test.go @@ -98,7 +98,8 @@ func TestSyncHappyPath(t *testing.T) { ), testIssuerHTTP01Enabled}, ExpectedActions: []testpkg.Action{ testpkg.NewAction( - coretesting.NewUpdateAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + coretesting.NewUpdateSubresourceAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + "status", gen.DefaultTestNamespace, gen.ChallengeFrom(baseChallenge, gen.SetChallengeProcessing(true), @@ -136,7 +137,8 @@ func TestSyncHappyPath(t *testing.T) { gen.SetChallengeType("http-01"), ), testIssuerHTTP01Enabled}, ExpectedActions: []testpkg.Action{ - testpkg.NewAction(coretesting.NewUpdateAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + testpkg.NewAction(coretesting.NewUpdateSubresourceAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + "status", gen.DefaultTestNamespace, gen.ChallengeFrom(baseChallenge, gen.SetChallengeProcessing(true), @@ -179,7 +181,8 @@ func TestSyncHappyPath(t *testing.T) { gen.SetChallengePresented(true), ), testIssuerHTTP01Enabled}, ExpectedActions: []testpkg.Action{ - testpkg.NewAction(coretesting.NewUpdateAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + testpkg.NewAction(coretesting.NewUpdateSubresourceAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + "status", gen.DefaultTestNamespace, gen.ChallengeFrom(baseChallenge, gen.SetChallengeProcessing(true), @@ -232,7 +235,8 @@ func TestSyncHappyPath(t *testing.T) { gen.SetChallengePresented(true), ), testIssuerHTTP01Enabled}, ExpectedActions: []testpkg.Action{ - testpkg.NewAction(coretesting.NewUpdateAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + testpkg.NewAction(coretesting.NewUpdateSubresourceAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + "status", gen.DefaultTestNamespace, gen.ChallengeFrom(baseChallenge, gen.SetChallengeProcessing(true), @@ -288,7 +292,8 @@ func TestSyncHappyPath(t *testing.T) { gen.SetChallengePresented(true), ), testIssuerHTTP01Enabled}, ExpectedActions: []testpkg.Action{ - testpkg.NewAction(coretesting.NewUpdateAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + testpkg.NewAction(coretesting.NewUpdateSubresourceAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + "status", gen.DefaultTestNamespace, gen.ChallengeFrom(baseChallenge, gen.SetChallengeProcessing(false), @@ -322,7 +327,8 @@ func TestSyncHappyPath(t *testing.T) { gen.SetChallengePresented(true), ), testIssuerHTTP01Enabled}, ExpectedActions: []testpkg.Action{ - testpkg.NewAction(coretesting.NewUpdateAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + testpkg.NewAction(coretesting.NewUpdateSubresourceAction(cmacme.SchemeGroupVersion.WithResource("challenges"), + "status", gen.DefaultTestNamespace, gen.ChallengeFrom(baseChallenge, gen.SetChallengeProcessing(false), diff --git a/pkg/controller/acmeorders/sync.go b/pkg/controller/acmeorders/sync.go index 8cd68c82e..1390e0ccf 100644 --- a/pkg/controller/acmeorders/sync.go +++ b/pkg/controller/acmeorders/sync.go @@ -54,7 +54,7 @@ func (c *controller) Sync(ctx context.Context, o *cmacme.Order) (err error) { return } log.Info("updating Order resource status") - _, updateErr := c.cmClient.AcmeV1alpha2().Orders(o.Namespace).Update(o) + _, updateErr := c.cmClient.AcmeV1alpha2().Orders(o.Namespace).UpdateStatus(o) if err != nil { log.Error(err, "failed to update status") err = utilerrors.NewAggregate([]error{err, updateErr}) diff --git a/pkg/controller/acmeorders/sync_test.go b/pkg/controller/acmeorders/sync_test.go index 2a8cdd941..4bb7d91f7 100644 --- a/pkg/controller/acmeorders/sync_test.go +++ b/pkg/controller/acmeorders/sync_test.go @@ -153,7 +153,8 @@ dGVzdA== builder: &testpkg.Builder{ CertManagerObjects: []runtime.Object{testIssuerHTTP01TestCom, testOrder}, ExpectedActions: []testpkg.Action{ - testpkg.NewAction(coretesting.NewUpdateAction(cmacme.SchemeGroupVersion.WithResource("orders"), + testpkg.NewAction(coretesting.NewUpdateSubresourceAction(cmacme.SchemeGroupVersion.WithResource("orders"), + "status", testOrderPending.Namespace, gen.OrderFrom(testOrder, gen.SetOrderStatus(cmacme.OrderStatus{ State: cmacme.Pending, @@ -217,7 +218,8 @@ dGVzdA== builder: &testpkg.Builder{ CertManagerObjects: []runtime.Object{testIssuerHTTP01TestCom, testOrderPending, testAuthorizationChallengeValid}, ExpectedActions: []testpkg.Action{ - testpkg.NewAction(coretesting.NewUpdateAction(cmacme.SchemeGroupVersion.WithResource("orders"), + testpkg.NewAction(coretesting.NewUpdateSubresourceAction(cmacme.SchemeGroupVersion.WithResource("orders"), + "status", testOrderReady.Namespace, testOrderReady)), }, }, @@ -236,7 +238,8 @@ dGVzdA== builder: &testpkg.Builder{ CertManagerObjects: []runtime.Object{testIssuerHTTP01TestCom, testOrderReady, testAuthorizationChallengeValid}, ExpectedActions: []testpkg.Action{ - testpkg.NewAction(coretesting.NewUpdateAction(cmacme.SchemeGroupVersion.WithResource("orders"), + testpkg.NewAction(coretesting.NewUpdateSubresourceAction(cmacme.SchemeGroupVersion.WithResource("orders"), + "status", testOrderValid.Namespace, testOrderValid)), }, ExpectedEvents: []string{ @@ -262,7 +265,8 @@ dGVzdA== builder: &testpkg.Builder{ CertManagerObjects: []runtime.Object{testIssuerHTTP01TestCom, testOrderPending, testAuthorizationChallengeInvalid}, ExpectedActions: []testpkg.Action{ - testpkg.NewAction(coretesting.NewUpdateAction(cmacme.SchemeGroupVersion.WithResource("orders"), + testpkg.NewAction(coretesting.NewUpdateSubresourceAction(cmacme.SchemeGroupVersion.WithResource("orders"), + "status", testOrderInvalid.Namespace, testOrderInvalid)), }, },