From 998ec01f4648c9586ac1a45995c549dd48364878 Mon Sep 17 00:00:00 2001 From: Alison Burgess Date: Fri, 19 Jan 2024 13:23:46 -0800 Subject: [PATCH] fixing more comments --- pkg/client/kubeconfig.go | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkg/client/kubeconfig.go b/pkg/client/kubeconfig.go index fe82ce6..819c023 100644 --- a/pkg/client/kubeconfig.go +++ b/pkg/client/kubeconfig.go @@ -48,44 +48,32 @@ func isKubeConfigStillValid(kubeConfigPath string, logger *zap.Logger) (bool, er func isClientConfigStillValid(kubeconfigPath string, logger *zap.Logger) (bool, error) { bootstrapClientConfig, err := loadRESTClientConfig(kubeconfigPath) if err != nil { - logger.Error("unable to read existing bootstrap client config from ", - zap.String("kubeconfigPath", kubeconfigPath), - zap.Error(err)) + logger.Error("unable to read existing kubeconfig.") return false, err } transportConfig, err := bootstrapClientConfig.TransportConfig() if err != nil { - logger.Error("unable to load transport configuration from existing bootstrap client config read from ", - zap.String("kubeconfigPath", kubeconfigPath), - zap.Error(err)) + logger.Error("unable to load transport configuration from existing kubeconfig.") return false, err } // has side effect of populating transport config data fields if _, err := transport.TLSConfigFor(transportConfig); err != nil { - logger.Error("unable to load TLS configuration from existing bootstrap client config read from ", - zap.String("kubeconfigPath", kubeconfigPath), - zap.Error(err)) + logger.Error("unable to load TLS configuration from existing kubeconfig.") return false, err } certs, err := certutil.ParseCertsPEM(transportConfig.TLS.CertData) if err != nil { - logger.Error("unable to load TLS certificates from existing bootstrap client config read from ", - zap.String("kubeconfigPath", kubeconfigPath), - zap.Error(err)) + logger.Error("unable to load TLS certificates from existing kubeconfig.") return false, err } if len(certs) == 0 { - logger.Error("unable to read TLS certificates from existing bootstrap client config read from ", - zap.String("kubeconfigPath", kubeconfigPath), - zap.Error(err)) + logger.Error("unable to read TLS certificates from existing kubeconfig.") return false, err } now := time.Now() for _, cert := range certs { if now.After(cert.NotAfter) { - logger.Error("part of the existing bootstrap client certificate in %s is expired: %v", - zap.String("kubeconfigPath", kubeconfigPath), - zap.String("expirationTime", cert.NotAfter.String())) + logger.Error("part of the existing kubeconfig certificate is expire.") return false, err } }