github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

address PR comments

Browse Source 
- make convertImageTagMetadataToSemver private
- s/the\ the/the/
This commit is contained in:
Jared Rodriguez 2021-03-18 11:07:33 -05:00
parent 5f9a44e1e6
commit c68db41a7a
No known key found for this signature in database
GPG Key ID: 3C8DEA318799B055
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/kubeadm/app/phases/upgrade/staticpods.go
View File

@ -288,7 +288,7 @@ func performEtcdStaticPodUpgrade(certsRenewMgr *renewal.Manager, client clientse
var desiredEtcdVersion *version.Version var desiredEtcdVersion *version.Version
if cfg.Etcd.Local.ImageTag != "" { if cfg.Etcd.Local.ImageTag != "" {
desiredEtcdVersion, err = version.ParseSemantic( desiredEtcdVersion, err = version.ParseSemantic(
ConvertImageTagMetadataToSemver(cfg.Etcd.Local.ImageTag)) convertImageTagMetadataToSemver(cfg.Etcd.Local.ImageTag))
if err != nil { if err != nil {
return true, errors.Wrapf(err, "failed to parse tag %q as a semantic version", cfg.Etcd.Local.ImageTag) 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 "", 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 // convertImageTagMetadataToSemver converts imagetag in the format of semver_metadata to semver+metadata
func ConvertImageTagMetadataToSemver(tag string) string { func convertImageTagMetadataToSemver(tag string) string {
// Container registries do not support `+` characters in tag names. This prevents imagetags from // 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. // 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. // build metadata information in imagetags.
return strings.Replace(tag, "_", "+", 1) return strings.Replace(tag, "_", "+", 1)
} }