github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 04:03:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81990 from tedyu/bld-metadata

Browse Source 
Correct func name WithBuildMetadata
This commit is contained in:
Kubernetes Prow Robot
2019-08-29 07:28:23 -07:00
committed by GitHub
parent fd6c380047 8efa1c2a8f
commit 85602f26d7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/phases/upgrade/policy_test.go
View File

@@ -196,9 +196,9 @@ func TestEnforceVersionPolicies(t *testing.T) {
vg: &fakeVersionGetter{
clusterVersion: constants.MinimumControlPlaneVersion.String(),
kubeletVersion: constants.MinimumControlPlaneVersion.String(),
kubeadmVersion: constants.MinimumControlPlaneVersion.WithBuildeMetadata("build").String(),
kubeadmVersion: constants.MinimumControlPlaneVersion.WithBuildMetadata("build").String(),
},
newK8sVersion: constants.MinimumControlPlaneVersion.WithBuildeMetadata("build").String(),
newK8sVersion: constants.MinimumControlPlaneVersion.WithBuildMetadata("build").String(),
},
}

4
staging/src/k8s.io/apimachinery/pkg/util/version/version.go
View File

@@ -183,8 +183,8 @@ func (v *Version) WithPreRelease(preRelease string) *Version {
return &result
}
// WithBuildeMetadata returns copy of the version object with requested buildMetadata
func (v *Version) WithBuildeMetadata(buildMetadata string) *Version {
// WithBuildMetadata returns copy of the version object with requested buildMetadata
func (v *Version) WithBuildMetadata(buildMetadata string) *Version {
result := *v
result.components = []uint{v.Major(), v.Minor(), v.Patch()}
result.buildMetadata = buildMetadata