From 315a14ff70bb365fda2d7cae7a74860969b31f28 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 8 Nov 2018 17:13:36 +0000 Subject: [PATCH] Add more Events to Orders and Challenges Signed-off-by: James Munnelly --- pkg/controller/acmechallenges/scheduler/BUILD.bazel | 1 + pkg/controller/acmechallenges/scheduler/sync.go | 5 ++++- pkg/controller/acmeorders/BUILD.bazel | 1 + pkg/controller/acmeorders/sync.go | 7 +++++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkg/controller/acmechallenges/scheduler/BUILD.bazel b/pkg/controller/acmechallenges/scheduler/BUILD.bazel index ea4d7f5c3..300836707 100644 --- a/pkg/controller/acmechallenges/scheduler/BUILD.bazel +++ b/pkg/controller/acmechallenges/scheduler/BUILD.bazel @@ -15,6 +15,7 @@ go_library( "//pkg/controller:go_default_library", "//pkg/util:go_default_library", "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", diff --git a/pkg/controller/acmechallenges/scheduler/sync.go b/pkg/controller/acmechallenges/scheduler/sync.go index 2cee03402..dbfd65362 100644 --- a/pkg/controller/acmechallenges/scheduler/sync.go +++ b/pkg/controller/acmechallenges/scheduler/sync.go @@ -20,6 +20,7 @@ import ( "context" "fmt" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" @@ -78,11 +79,13 @@ func (c *Controller) Sync(ctx context.Context, ch *cmapi.Challenge) error { // if there are no 'conflicts' detected above, then we can mark this challenge // as processing. ch.Status.Processing = true - _, err = c.CMClient.CertmanagerV1alpha1().Challenges(ch.Namespace).Update(ch) + ch, err = c.CMClient.CertmanagerV1alpha1().Challenges(ch.Namespace).Update(ch) if err != nil { return err } + c.Recorder.Event(ch, corev1.EventTypeNormal, "Started", "Challenge scheduled for processing") + // we ignore the return value from waitForCacheSync - if it is false, the // controller will shutdown anyway. _ = c.waitForCacheSync() diff --git a/pkg/controller/acmeorders/BUILD.bazel b/pkg/controller/acmeorders/BUILD.bazel index e0194510b..b43d3355a 100644 --- a/pkg/controller/acmeorders/BUILD.bazel +++ b/pkg/controller/acmeorders/BUILD.bazel @@ -18,6 +18,7 @@ go_library( "//pkg/util:go_default_library", "//third_party/crypto/acme:go_default_library", "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/pkg/controller/acmeorders/sync.go b/pkg/controller/acmeorders/sync.go index c905dc1d5..9e6783849 100644 --- a/pkg/controller/acmeorders/sync.go +++ b/pkg/controller/acmeorders/sync.go @@ -21,6 +21,7 @@ import ( "fmt" "reflect" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/selection" @@ -186,6 +187,12 @@ func (c *Controller) Sync(ctx context.Context, o *cmapi.Order) (err error) { continue } + domainName := spec.DNSName + if spec.Wildcard { + domainName = "*." + domainName + } + c.Recorder.Eventf(ch, corev1.EventTypeNormal, "Created", "Created Challenge resource %q for domain %q", ch.Name, ch.Spec.DNSName) + existingChallenges = append(existingChallenges, ch) }