From c68db41a7a043b84ffe7fa8bdc50f5d030e37437 Mon Sep 17 00:00:00 2001 From: Jared Rodriguez Date: Thu, 18 Mar 2021 11:07:33 -0500 Subject: [PATCH] address PR comments - make convertImageTagMetadataToSemver private - s/the\ the/the/ --- cmd/kubeadm/app/phases/upgrade/staticpods.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods.go b/cmd/kubeadm/app/phases/upgrade/staticpods.go index a9b3cd98882..450a54a0910 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods.go @@ -288,7 +288,7 @@ func performEtcdStaticPodUpgrade(certsRenewMgr *renewal.Manager, client clientse var desiredEtcdVersion *version.Version if cfg.Etcd.Local.ImageTag != "" { desiredEtcdVersion, err = version.ParseSemantic( - ConvertImageTagMetadataToSemver(cfg.Etcd.Local.ImageTag)) + convertImageTagMetadataToSemver(cfg.Etcd.Local.ImageTag)) if err != nil { return true, errors.Wrapf(err, "failed to parse tag %q as a semantic version", cfg.Etcd.Local.ImageTag) } @@ -645,14 +645,14 @@ func GetEtcdImageTagFromStaticPod(manifestDir string) (string, error) { return "", err } - return ConvertImageTagMetadataToSemver(image.TagFromImage(pod.Spec.Containers[0].Image)), nil + return convertImageTagMetadataToSemver(image.TagFromImage(pod.Spec.Containers[0].Image)), nil } -// ConvertImageTagMetadataToSemver converts imagetag in the format of semver_metadata to semver+metadata -func ConvertImageTagMetadataToSemver(tag string) string { +// convertImageTagMetadataToSemver converts imagetag in the format of semver_metadata to semver+metadata +func convertImageTagMetadataToSemver(tag string) string { // Container registries do not support `+` characters in tag names. This prevents imagetags from // correctly representing semantic versions which use the plus symbol to delimit build metadata. - // Kubernetes uses the the convention of using an underscore in image registries to preserve + // Kubernetes uses the convention of using an underscore in image registries to preserve // build metadata information in imagetags. return strings.Replace(tag, "_", "+", 1) }