From 0c4df6409203f190051629d37896df00e59f9f25 Mon Sep 17 00:00:00 2001 From: carlory Date: Thu, 22 Feb 2024 10:39:30 +0800 Subject: [PATCH] fix api --- cmd/kubeadm/app/apis/output/types.go | 6 ++--- cmd/kubeadm/app/apis/output/v1alpha3/types.go | 6 ++--- .../v1alpha3/zz_generated.conversion.go | 4 ++-- .../output/v1alpha3/zz_generated.deepcopy.go | 1 - .../app/apis/output/zz_generated.deepcopy.go | 1 - cmd/kubeadm/app/cmd/certs.go | 23 ++++++++++--------- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/cmd/kubeadm/app/apis/output/types.go b/cmd/kubeadm/app/apis/output/types.go index 9482250228f..4f4fa33d845 100644 --- a/cmd/kubeadm/app/apis/output/types.go +++ b/cmd/kubeadm/app/apis/output/types.go @@ -88,11 +88,11 @@ type Certificate struct { // Name of the certificate. Name string - // ExpirationDate defines certificate expiration date. + // ExpirationDate defines certificate expiration date in UTC following the RFC3339 format. ExpirationDate metav1.Time - // ResidualTime represents the residual time before expiration. - ResidualTime metav1.Duration + // ResidualTimeSeconds represents the duration in seconds relative to the residual time before expiration. + ResidualTimeSeconds int64 // ExternallyManaged defines if the certificate is externally managed. ExternallyManaged bool diff --git a/cmd/kubeadm/app/apis/output/v1alpha3/types.go b/cmd/kubeadm/app/apis/output/v1alpha3/types.go index d94a4b14b51..0311de1e95c 100644 --- a/cmd/kubeadm/app/apis/output/v1alpha3/types.go +++ b/cmd/kubeadm/app/apis/output/v1alpha3/types.go @@ -88,11 +88,11 @@ type Certificate struct { // Name of the certificate. Name string `json:"name"` - // ExpirationDate defines certificate expiration date. + // ExpirationDate defines certificate expiration date in UTC following the RFC3339 format. ExpirationDate metav1.Time `json:"expirationDate"` - // ResidualTime represents the residual time before expiration. - ResidualTime metav1.Duration `json:"residualTime"` + // ResidualTimeSeconds represents the duration in seconds relative to the residual time before expiration. + ResidualTimeSeconds int64 `json:"residualTime"` // ExternallyManaged defines if the certificate is externally managed. ExternallyManaged bool `json:"externallyManaged"` diff --git a/cmd/kubeadm/app/apis/output/v1alpha3/zz_generated.conversion.go b/cmd/kubeadm/app/apis/output/v1alpha3/zz_generated.conversion.go index d2fb65b9ec8..6c4915c74ba 100644 --- a/cmd/kubeadm/app/apis/output/v1alpha3/zz_generated.conversion.go +++ b/cmd/kubeadm/app/apis/output/v1alpha3/zz_generated.conversion.go @@ -132,7 +132,7 @@ func Convert_output_BootstrapToken_To_v1alpha3_BootstrapToken(in *output.Bootstr func autoConvert_v1alpha3_Certificate_To_output_Certificate(in *Certificate, out *output.Certificate, s conversion.Scope) error { out.Name = in.Name out.ExpirationDate = in.ExpirationDate - out.ResidualTime = in.ResidualTime + out.ResidualTimeSeconds = in.ResidualTimeSeconds out.ExternallyManaged = in.ExternallyManaged out.CAName = in.CAName out.Missing = in.Missing @@ -147,7 +147,7 @@ func Convert_v1alpha3_Certificate_To_output_Certificate(in *Certificate, out *ou func autoConvert_output_Certificate_To_v1alpha3_Certificate(in *output.Certificate, out *Certificate, s conversion.Scope) error { out.Name = in.Name out.ExpirationDate = in.ExpirationDate - out.ResidualTime = in.ResidualTime + out.ResidualTimeSeconds = in.ResidualTimeSeconds out.ExternallyManaged = in.ExternallyManaged out.CAName = in.CAName out.Missing = in.Missing diff --git a/cmd/kubeadm/app/apis/output/v1alpha3/zz_generated.deepcopy.go b/cmd/kubeadm/app/apis/output/v1alpha3/zz_generated.deepcopy.go index c3f32ee9795..f8a93667bb6 100644 --- a/cmd/kubeadm/app/apis/output/v1alpha3/zz_generated.deepcopy.go +++ b/cmd/kubeadm/app/apis/output/v1alpha3/zz_generated.deepcopy.go @@ -55,7 +55,6 @@ func (in *BootstrapToken) DeepCopyObject() runtime.Object { func (in *Certificate) DeepCopyInto(out *Certificate) { *out = *in in.ExpirationDate.DeepCopyInto(&out.ExpirationDate) - out.ResidualTime = in.ResidualTime return } diff --git a/cmd/kubeadm/app/apis/output/zz_generated.deepcopy.go b/cmd/kubeadm/app/apis/output/zz_generated.deepcopy.go index 701bff28a84..098e52697ef 100644 --- a/cmd/kubeadm/app/apis/output/zz_generated.deepcopy.go +++ b/cmd/kubeadm/app/apis/output/zz_generated.deepcopy.go @@ -55,7 +55,6 @@ func (in *BootstrapToken) DeepCopyObject() runtime.Object { func (in *Certificate) DeepCopyInto(out *Certificate) { *out = *in in.ExpirationDate.DeepCopyInto(&out.ExpirationDate) - out.ResidualTime = in.ResidualTime return } diff --git a/cmd/kubeadm/app/cmd/certs.go b/cmd/kubeadm/app/cmd/certs.go index c21dfd76f89..3c12fd58e28 100644 --- a/cmd/kubeadm/app/cmd/certs.go +++ b/cmd/kubeadm/app/cmd/certs.go @@ -20,6 +20,7 @@ import ( "fmt" "io" "text/tabwriter" + "time" "github.com/lithammer/dedent" "github.com/pkg/errors" @@ -379,11 +380,11 @@ func fetchCertificateExpirationInfo(rm *renewal.Manager) (*outputapiv1alpha3.Cer return nil, err } info.Certificates = append(info.Certificates, outputapiv1alpha3.Certificate{ - Name: e.Name, - ExpirationDate: metav1.Time{Time: e.ExpirationDate}, - ResidualTime: metav1.Duration{Duration: e.ResidualTime()}, - CAName: handler.CAName, - ExternallyManaged: e.ExternallyManaged, + Name: e.Name, + ExpirationDate: metav1.Time{Time: e.ExpirationDate}, + ResidualTimeSeconds: int64(e.ResidualTime() / time.Second), + CAName: handler.CAName, + ExternallyManaged: e.ExternallyManaged, }) } else { // the certificate does not exist (for any reason) @@ -401,10 +402,10 @@ func fetchCertificateExpirationInfo(rm *renewal.Manager) (*outputapiv1alpha3.Cer return nil, err } info.CertificateAuthorities = append(info.CertificateAuthorities, outputapiv1alpha3.Certificate{ - Name: e.Name, - ExpirationDate: metav1.Time{Time: e.ExpirationDate}, - ResidualTime: metav1.Duration{Duration: e.ResidualTime()}, - ExternallyManaged: e.ExternallyManaged, + Name: e.Name, + ExpirationDate: metav1.Time{Time: e.ExpirationDate}, + ResidualTimeSeconds: int64(e.ResidualTime() / time.Second), + ExternallyManaged: e.ExternallyManaged, }) } else { // the CA does not exist (for any reason) @@ -515,7 +516,7 @@ func (p *certTextPrinter) PrintObj(obj runtime.Object, writer io.Writer) error { s := fmt.Sprintf("%s\t%s\t%s\t%s\t%-8v", cert.Name, cert.ExpirationDate.Format("Jan 02, 2006 15:04 MST"), - duration.ShortHumanDuration(cert.ResidualTime.Duration), + duration.ShortHumanDuration(time.Duration(cert.ResidualTimeSeconds)*time.Second), cert.CAName, yesNo(cert.ExternallyManaged), ) @@ -534,7 +535,7 @@ func (p *certTextPrinter) PrintObj(obj runtime.Object, writer io.Writer) error { s := fmt.Sprintf("%s\t%s\t%s\t%-8v", ca.Name, ca.ExpirationDate.Format("Jan 02, 2006 15:04 MST"), - duration.ShortHumanDuration(ca.ResidualTime.Duration), + duration.ShortHumanDuration(time.Duration(ca.ResidualTimeSeconds)*time.Second), yesNo(ca.ExternallyManaged), ) fmt.Fprintln(tabw, s)