github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-02-21 22:57:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #131673 from joshjms/etcd-fix-unit-tests

Browse Source 
etcd: fix kubeadm unit tests
This commit is contained in:
Kubernetes Prow Robot
2025-05-08 14:39:22 -07:00
committed by GitHub
parent 79d1cf301e 77b1236a52
commit 42634e39d3
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/kubeadm/app/images/images_test.go
View File

@@ -27,8 +27,7 @@ import (
)
const (
testversion = "v10.1.2-alpha.1.100+0123456789abcdef"
expected = "v10.1.2-alpha.1.100_0123456789abcdef"
testVersion = "v1.99.0"
gcrPrefix = "registry.k8s.io"
)
@@ -53,34 +52,34 @@ func TestGetKubernetesImage(t *testing.T) {
}{
{
image: constants.KubeAPIServer,
expected: GetGenericImage(gcrPrefix, "kube-apiserver", expected),
expected: GetGenericImage(gcrPrefix, "kube-apiserver", testVersion),
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: gcrPrefix,
KubernetesVersion: testversion,
KubernetesVersion: testVersion,
},
},
{
image: constants.KubeControllerManager,
expected: GetGenericImage(gcrPrefix, "kube-controller-manager", expected),
expected: GetGenericImage(gcrPrefix, "kube-controller-manager", testVersion),
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: gcrPrefix,
KubernetesVersion: testversion,
KubernetesVersion: testVersion,
},
},
{
image: constants.KubeScheduler,
expected: GetGenericImage(gcrPrefix, "kube-scheduler", expected),
expected: GetGenericImage(gcrPrefix, "kube-scheduler", testVersion),
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: gcrPrefix,
KubernetesVersion: testversion,
KubernetesVersion: testVersion,
},
},
{
image: constants.KubeProxy,
expected: GetGenericImage(gcrPrefix, "kube-proxy", expected),
expected: GetGenericImage(gcrPrefix, "kube-proxy", testVersion),
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: gcrPrefix,
KubernetesVersion: testversion,
KubernetesVersion: testVersion,
},
},
}
@@ -97,7 +96,7 @@ func TestGetKubernetesImage(t *testing.T) {
}
func TestGetEtcdImage(t *testing.T) {
testEtcdVer, _, _ := constants.EtcdSupportedVersion(constants.SupportedEtcdVersion, testversion)
testEtcdVer, _, _ := constants.EtcdSupportedVersion(constants.SupportedEtcdVersion, testVersion)
var tests = []struct {
expected string
cfg *kubeadmapi.ClusterConfiguration
@@ -105,7 +104,7 @@ func TestGetEtcdImage(t *testing.T) {
{
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: "real.repo",
KubernetesVersion: testversion,
KubernetesVersion: testVersion,
Etcd: kubeadmapi.Etcd{
Local: &kubeadmapi.LocalEtcd{},
},
@@ -115,7 +114,7 @@ func TestGetEtcdImage(t *testing.T) {
{
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: "real.repo",
KubernetesVersion: testversion,
KubernetesVersion: testVersion,
Etcd: kubeadmapi.Etcd{
Local: &kubeadmapi.LocalEtcd{
ImageMeta: kubeadmapi.ImageMeta{
@@ -129,7 +128,7 @@ func TestGetEtcdImage(t *testing.T) {
{
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: "real.repo",
KubernetesVersion: testversion,
KubernetesVersion: testVersion,
Etcd: kubeadmapi.Etcd{
Local: &kubeadmapi.LocalEtcd{
ImageMeta: kubeadmapi.ImageMeta{
@@ -144,7 +143,7 @@ func TestGetEtcdImage(t *testing.T) {
expected: GetGenericImage(gcrPrefix, "etcd", constants.DefaultEtcdVersion),
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: gcrPrefix,
KubernetesVersion: testversion,
KubernetesVersion: testVersion,
},
},
}

2
cmd/kubeadm/app/phases/etcd/local_test.go
View File

@@ -80,7 +80,7 @@ func TestCreateLocalEtcdStaticPodManifestFile(t *testing.T) {
}{
{
cfg: &kubeadmapi.ClusterConfiguration{
KubernetesVersion: "v1.7.0",
KubernetesVersion: "v1.99.0",
Etcd: kubeadmapi.Etcd{
Local: &kubeadmapi.LocalEtcd{
DataDir: tmpdir + "/etcd",