From 1268f76690c7ac8a089fa4f37c0ced700897bbaf Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 2 May 2019 14:41:36 +0100 Subject: [PATCH] Make lastTransitionTime a pointer Signed-off-by: James Munnelly --- pkg/api/util/conditions.go | 4 ++-- pkg/apis/certmanager/v1alpha1/types_certificate.go | 2 +- pkg/apis/certmanager/v1alpha1/types_issuer.go | 2 +- pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go | 10 ++++++++-- pkg/controller/certificates/sync_test.go | 10 +++++----- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkg/api/util/conditions.go b/pkg/api/util/conditions.go index e572c6721..57ee21e60 100644 --- a/pkg/api/util/conditions.go +++ b/pkg/api/util/conditions.go @@ -63,7 +63,7 @@ func SetIssuerCondition(i cmapi.GenericIssuer, conditionType cmapi.IssuerConditi } nowTime := metav1.NewTime(Clock.Now()) - newCondition.LastTransitionTime = nowTime + newCondition.LastTransitionTime = &nowTime // Search through existing conditions for idx, cond := range i.GetStatus().Conditions { @@ -126,7 +126,7 @@ func SetCertificateCondition(crt *cmapi.Certificate, conditionType cmapi.Certifi } nowTime := metav1.NewTime(Clock.Now()) - newCondition.LastTransitionTime = nowTime + newCondition.LastTransitionTime = &nowTime // Search through existing conditions for idx, cond := range crt.Status.Conditions { diff --git a/pkg/apis/certmanager/v1alpha1/types_certificate.go b/pkg/apis/certmanager/v1alpha1/types_certificate.go index e649e570a..6ca2b08ef 100644 --- a/pkg/apis/certmanager/v1alpha1/types_certificate.go +++ b/pkg/apis/certmanager/v1alpha1/types_certificate.go @@ -151,7 +151,7 @@ type CertificateCondition struct { // LastTransitionTime is the timestamp corresponding to the last status // change of this condition. // +optional - LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` // Reason is a brief machine readable explanation for the condition's last // transition. diff --git a/pkg/apis/certmanager/v1alpha1/types_issuer.go b/pkg/apis/certmanager/v1alpha1/types_issuer.go index ed98968e8..0356e81d9 100644 --- a/pkg/apis/certmanager/v1alpha1/types_issuer.go +++ b/pkg/apis/certmanager/v1alpha1/types_issuer.go @@ -540,7 +540,7 @@ type IssuerCondition struct { // LastTransitionTime is the timestamp corresponding to the last status // change of this condition. // +optional - LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` // Reason is a brief machine readable explanation for the condition's last // transition. diff --git a/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go index 25aaf94f2..f1ffdd53a 100644 --- a/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go @@ -539,7 +539,10 @@ func (in *Certificate) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CertificateCondition) DeepCopyInto(out *CertificateCondition) { *out = *in - in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime) + if in.LastTransitionTime != nil { + in, out := &in.LastTransitionTime, &out.LastTransitionTime + *out = (*in).DeepCopy() + } return } @@ -947,7 +950,10 @@ func (in *Issuer) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IssuerCondition) DeepCopyInto(out *IssuerCondition) { *out = *in - in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime) + if in.LastTransitionTime != nil { + in, out := &in.LastTransitionTime, &out.LastTransitionTime + *out = (*in).DeepCopy() + } return } diff --git a/pkg/controller/certificates/sync_test.go b/pkg/controller/certificates/sync_test.go index a78367917..4cf3f16c1 100644 --- a/pkg/controller/certificates/sync_test.go +++ b/pkg/controller/certificates/sync_test.go @@ -114,7 +114,7 @@ func TestSync(t *testing.T) { Status: cmapi.ConditionFalse, Reason: "NotFound", Message: "Certificate does not exist", - LastTransitionTime: nowMetaTime, + LastTransitionTime: &nowMetaTime, }), ) exampleCertTemporaryCondition := gen.CertificateFrom(exampleCert, @@ -123,7 +123,7 @@ func TestSync(t *testing.T) { Status: cmapi.ConditionFalse, Reason: "TemporaryCertificate", Message: "Certificate issuance in progress. Temporary certificate issued.", - LastTransitionTime: nowMetaTime, + LastTransitionTime: &nowMetaTime, }), ) @@ -479,7 +479,7 @@ func TestSync(t *testing.T) { Status: cmapi.ConditionFalse, Reason: "DoesNotMatch", Message: "Certificate private key does not match certificate", - LastTransitionTime: nowMetaTime, + LastTransitionTime: &nowMetaTime, }), gen.SetCertificateNotAfter(metav1.NewTime(cert2.NotAfter)), ), @@ -568,7 +568,7 @@ func TestSync(t *testing.T) { Status: cmapi.ConditionTrue, Reason: "Ready", Message: "Certificate is up to date and has not expired", - LastTransitionTime: nowMetaTime, + LastTransitionTime: &nowMetaTime, }), gen.SetCertificateNotAfter(metav1.NewTime(cert1.NotAfter)), ), @@ -705,7 +705,7 @@ func TestSync(t *testing.T) { Status: cmapi.ConditionFalse, Reason: "DoesNotMatch", Message: "Issuer of the certificate is not up to date: \"not-test\"", - LastTransitionTime: nowMetaTime, + LastTransitionTime: &nowMetaTime, }), gen.SetCertificateNotAfter(metav1.NewTime(cert1.NotAfter)), ),