diff --git a/pkg/cluster/fetch_test.go b/pkg/cluster/fetch_test.go index 6292d9a8af90..a4f08e5923c9 100644 --- a/pkg/cluster/fetch_test.go +++ b/pkg/cluster/fetch_test.go @@ -293,14 +293,6 @@ func wantKubeDistroForEksdRelease() (*eksdv1.Release, *cluster.KubeDistro) { { Name: "etcd", GitTag: "v3.4.14", - Assets: []eksdv1.Asset{ - { - Arch: []string{"amd64"}, - Archive: &eksdv1.AssetArchive{ - URI: "https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz", - }, - }, - }, }, { Name: "comp-1", @@ -412,7 +404,6 @@ func wantKubeDistroForEksdRelease() (*eksdv1.Release, *cluster.KubeDistro) { URI: "public.ecr.aws/eks-distro/kubernetes/kube-proxy:v1.19.8", }, EtcdVersion: "3.4.14", - EtcdURL: "https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz", } return eksdRelease, kubeDistro diff --git a/pkg/cluster/spec.go b/pkg/cluster/spec.go index 99a0d3e8bde5..368653293420 100644 --- a/pkg/cluster/spec.go +++ b/pkg/cluster/spec.go @@ -80,7 +80,6 @@ type KubeDistro struct { Pause v1alpha1.Image EtcdImage v1alpha1.Image EtcdVersion string - EtcdURL string AwsIamAuthImage v1alpha1.Image KubeProxy v1alpha1.Image } @@ -201,17 +200,9 @@ func buildKubeDistro(eksd *eksdv1alpha1.Release) (*KubeDistro, error) { if asset.Image != nil { assets[asset.Name] = asset.Image } - - if component.Name == "etcd" { - kubeDistro.EtcdVersion = strings.TrimPrefix(component.GitTag, "v") - - // Get archive uri for amd64 - if asset.Archive != nil && len(asset.Arch) > 0 { - if asset.Arch[0] == "amd64" { - kubeDistro.EtcdURL = asset.Archive.URI - } - } - } + } + if component.Name == "etcd" { + kubeDistro.EtcdVersion = strings.TrimPrefix(component.GitTag, "v") } } diff --git a/pkg/clusterapi/apibuilder_test.go b/pkg/clusterapi/apibuilder_test.go index 6becbd1dec48..bcba2a2a13e0 100644 --- a/pkg/clusterapi/apibuilder_test.go +++ b/pkg/clusterapi/apibuilder_test.go @@ -119,8 +119,6 @@ func newApiBuilerTest(t *testing.T) apiBuilerTest { EtcdImage: v1alpha1.Image{ URI: "public.ecr.aws/eks-distro/etcd-io/etcd:0.0.1", }, - EtcdURL: "https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz", - EtcdVersion: "3.4.14", Pause: v1alpha1.Image{ URI: "public.ecr.aws/eks-distro/kubernetes/pause:0.0.1", }, diff --git a/pkg/clusterapi/etcd.go b/pkg/clusterapi/etcd.go index 3fe1f1408b5d..83ad12cfa6bf 100644 --- a/pkg/clusterapi/etcd.go +++ b/pkg/clusterapi/etcd.go @@ -14,12 +14,11 @@ import ( ) // SetUbuntuConfigInEtcdCluster sets up the etcd config in EtcdadmCluster. -func SetUbuntuConfigInEtcdCluster(etcd *etcdv1.EtcdadmCluster, versionsBundle *cluster.VersionsBundle) { +func SetUbuntuConfigInEtcdCluster(etcd *etcdv1.EtcdadmCluster, version string) { etcd.Spec.EtcdadmConfigSpec.Format = etcdbootstrapv1.Format("cloud-config") etcd.Spec.EtcdadmConfigSpec.CloudInitConfig = &etcdbootstrapv1.CloudInitConfig{ - Version: versionsBundle.KubeDistro.EtcdVersion, - InstallDir: "/usr/bin", - EtcdReleaseURL: versionsBundle.KubeDistro.EtcdURL, + Version: version, + InstallDir: "/usr/bin", } } diff --git a/pkg/clusterapi/etcd_test.go b/pkg/clusterapi/etcd_test.go index 1971e71f1920..fc0ed7613d43 100644 --- a/pkg/clusterapi/etcd_test.go +++ b/pkg/clusterapi/etcd_test.go @@ -15,15 +15,14 @@ import ( func TestSetUbuntuConfigInEtcdCluster(t *testing.T) { g := newApiBuilerTest(t) got := wantEtcdCluster() - versionBundle := g.clusterSpec.VersionsBundles["1.21"] + v := "0.0.1" want := got.DeepCopy() want.Spec.EtcdadmConfigSpec.Format = etcdbootstrapv1.Format("cloud-config") want.Spec.EtcdadmConfigSpec.CloudInitConfig = &etcdbootstrapv1.CloudInitConfig{ - Version: versionBundle.KubeDistro.EtcdVersion, - InstallDir: "/usr/bin", - EtcdReleaseURL: versionBundle.KubeDistro.EtcdURL, + Version: v, + InstallDir: "/usr/bin", } - clusterapi.SetUbuntuConfigInEtcdCluster(got, versionBundle) + clusterapi.SetUbuntuConfigInEtcdCluster(got, v) g.Expect(got).To(Equal(want)) } diff --git a/pkg/providers/cloudstack/config/template-cp.yaml b/pkg/providers/cloudstack/config/template-cp.yaml index a55be33d4c07..bd16a7c79678 100644 --- a/pkg/providers/cloudstack/config/template-cp.yaml +++ b/pkg/providers/cloudstack/config/template-cp.yaml @@ -396,7 +396,6 @@ spec: cloudInitConfig: version: {{.externalEtcdVersion}} installDir: "/usr/bin" - etcdReleaseURL: {{.externalEtcdReleaseUrl}} etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/template.go b/pkg/providers/cloudstack/template.go index 78945e855ce8..f12798f22b72 100644 --- a/pkg/providers/cloudstack/template.go +++ b/pkg/providers/cloudstack/template.go @@ -188,7 +188,6 @@ func buildTemplateMapCP(clusterSpec *cluster.Spec) (map[string]interface{}, erro "schedulerExtraArgs": sharedExtraArgs.ToPartialYaml(), "format": format, "externalEtcdVersion": versionsBundle.KubeDistro.EtcdVersion, - "externalEtcdReleaseUrl": versionsBundle.KubeDistro.EtcdURL, "etcdImage": versionsBundle.KubeDistro.EtcdImage.VersionedImage(), "eksaSystemNamespace": constants.EksaSystemNamespace, } diff --git a/pkg/providers/cloudstack/testdata/expected_results_affinity_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_affinity_cp.yaml index 3fdb97b4e3c1..82107a6ae629 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_affinity_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_affinity_cp.yaml @@ -364,7 +364,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_availability_zones_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_availability_zones_cp.yaml index 1422703f3100..c987de28efbe 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_availability_zones_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_availability_zones_cp.yaml @@ -385,7 +385,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_cp.yaml index b263a9ffe180..86f3338ebd37 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_main_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_main_cp.yaml @@ -388,7 +388,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_cp_kubernetes_version.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_cp_kubernetes_version.yaml index fad033eda75a..e8556ca0a57d 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_main_cp_kubernetes_version.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_main_cp_kubernetes_version.yaml @@ -388,7 +388,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_no_machinetemplate_update_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_no_machinetemplate_update_cp.yaml index ad20ae970a3e..a785f4077ce9 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_main_no_machinetemplate_update_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_main_no_machinetemplate_update_cp.yaml @@ -388,7 +388,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_node_labels_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_node_labels_cp.yaml index eee190b5d66e..2686ccbd064a 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_main_node_labels_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_main_node_labels_cp.yaml @@ -383,7 +383,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_rollout_strategy_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_rollout_strategy_cp.yaml index 501939ddb14e..13aafdb87f4b 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_main_rollout_strategy_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_main_rollout_strategy_cp.yaml @@ -384,7 +384,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_with_taints_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_with_taints_cp.yaml index 62c8baf9d861..7ea0d2b99856 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_main_with_taints_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_main_with_taints_cp.yaml @@ -384,7 +384,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_cp.yaml index 5a6849f5321c..0f6bfa04852a 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_cp.yaml @@ -373,7 +373,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_cert_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_cert_cp.yaml index 7c6a587460b3..d6ae9bbead5e 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_cert_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_cert_cp.yaml @@ -395,7 +395,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_and_cert_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_and_cert_cp.yaml index 2bf1614b43be..141b222aba43 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_and_cert_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_and_cert_cp.yaml @@ -387,7 +387,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_cp.yaml index 58103e59f8f3..5dc7429b022f 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_cp.yaml @@ -375,7 +375,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/cloudstack/testdata/expected_results_resourceids_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_resourceids_cp.yaml index fd2905dd0169..f1e7feb7ffa4 100644 --- a/pkg/providers/cloudstack/testdata/expected_results_resourceids_cp.yaml +++ b/pkg/providers/cloudstack/testdata/expected_results_resourceids_cp.yaml @@ -388,7 +388,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz etcdadmInstallCommands: - echo this line exists so that etcdadmInstallCommands is not empty - echo etcdadmInstallCommands can be removed once etcdadm bootstrap and controller fix the bug diff --git a/pkg/providers/docker/config/template-cp.yaml b/pkg/providers/docker/config/template-cp.yaml index 30f2d3e7b1ac..fed04f28ad27 100644 --- a/pkg/providers/docker/config/template-cp.yaml +++ b/pkg/providers/docker/config/template-cp.yaml @@ -268,7 +268,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: {{.externalEtcdVersion}} - etcdReleaseURL: {{.externalEtcdReleaseUrl}} {{- if .etcdCipherSuites }} cipherSuites: {{.etcdCipherSuites}} {{- end }} diff --git a/pkg/providers/docker/docker.go b/pkg/providers/docker/docker.go index 6a5a3584de5b..25627a649c26 100644 --- a/pkg/providers/docker/docker.go +++ b/pkg/providers/docker/docker.go @@ -261,7 +261,6 @@ func buildTemplateMapCP(clusterSpec *cluster.Spec) (map[string]interface{}, erro "kubernetesVersion": versionsBundle.KubeDistro.Kubernetes.Tag, "etcdRepository": versionsBundle.KubeDistro.Etcd.Repository, "etcdVersion": versionsBundle.KubeDistro.Etcd.Tag, - "externalEtcdReleaseUrl": versionsBundle.KubeDistro.EtcdURL, "corednsRepository": versionsBundle.KubeDistro.CoreDNS.Repository, "corednsVersion": versionsBundle.KubeDistro.CoreDNS.Tag, "kindNodeImage": versionsBundle.EksD.KindNode.VersionedImage(), diff --git a/pkg/providers/docker/docker_test.go b/pkg/providers/docker/docker_test.go index 6339d98f7018..e1b663ccbbd4 100644 --- a/pkg/providers/docker/docker_test.go +++ b/pkg/providers/docker/docker_test.go @@ -548,7 +548,6 @@ var versionsBundle = &cluster.VersionsBundle{ Tag: "v3.4.14-eks-1-19-2", }, EtcdVersion: "3.4.14", - EtcdURL: "https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz", }, VersionsBundle: &releasev1alpha1.VersionsBundle{ EksD: releasev1alpha1.EksDRelease{ diff --git a/pkg/providers/docker/testdata/capd_valid_full_oidc_cp_expected.yaml b/pkg/providers/docker/testdata/capd_valid_full_oidc_cp_expected.yaml index 3027319598dc..53bd750abddf 100644 --- a/pkg/providers/docker/testdata/capd_valid_full_oidc_cp_expected.yaml +++ b/pkg/providers/docker/testdata/capd_valid_full_oidc_cp_expected.yaml @@ -299,7 +299,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.14 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 infrastructureTemplate: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/pkg/providers/docker/testdata/capd_valid_minimal_oidc_cp_expected.yaml b/pkg/providers/docker/testdata/capd_valid_minimal_oidc_cp_expected.yaml index 22bca099323a..7c6946ab0097 100644 --- a/pkg/providers/docker/testdata/capd_valid_minimal_oidc_cp_expected.yaml +++ b/pkg/providers/docker/testdata/capd_valid_minimal_oidc_cp_expected.yaml @@ -294,7 +294,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.14 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 infrastructureTemplate: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/pkg/providers/docker/testdata/expected_results_mirror_config_cp.yaml b/pkg/providers/docker/testdata/expected_results_mirror_config_cp.yaml index 22fe02e6dd5e..ee257406056f 100644 --- a/pkg/providers/docker/testdata/expected_results_mirror_config_cp.yaml +++ b/pkg/providers/docker/testdata/expected_results_mirror_config_cp.yaml @@ -302,7 +302,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.16 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 registryMirror: endpoint: 1.2.3.4:1234/v2/eks-anywhere diff --git a/pkg/providers/docker/testdata/expected_results_mirror_with_auth_config_cp.yaml b/pkg/providers/docker/testdata/expected_results_mirror_with_auth_config_cp.yaml index 80a129a6e83c..8e5c78c1bb11 100644 --- a/pkg/providers/docker/testdata/expected_results_mirror_with_auth_config_cp.yaml +++ b/pkg/providers/docker/testdata/expected_results_mirror_with_auth_config_cp.yaml @@ -328,7 +328,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.16 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 registryMirror: endpoint: 1.2.3.4:1234/v2/eks-anywhere diff --git a/pkg/providers/docker/testdata/expected_results_mirror_with_cert_config_cp.yaml b/pkg/providers/docker/testdata/expected_results_mirror_with_cert_config_cp.yaml index 5fd9a9a863e0..5d281bb3a923 100644 --- a/pkg/providers/docker/testdata/expected_results_mirror_with_cert_config_cp.yaml +++ b/pkg/providers/docker/testdata/expected_results_mirror_with_cert_config_cp.yaml @@ -325,7 +325,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.16 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 registryMirror: endpoint: 1.2.3.4:1234/v2/eks-anywhere diff --git a/pkg/providers/docker/testdata/valid_deployment_cp_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_cp_expected.yaml index 15d0a417dcdc..a8c9b95cc038 100644 --- a/pkg/providers/docker/testdata/valid_deployment_cp_expected.yaml +++ b/pkg/providers/docker/testdata/valid_deployment_cp_expected.yaml @@ -292,7 +292,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.14 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 infrastructureTemplate: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/pkg/providers/docker/testdata/valid_deployment_cp_expected_124onwards.yaml b/pkg/providers/docker/testdata/valid_deployment_cp_expected_124onwards.yaml index 95b9e7addf46..0823d4c15e05 100644 --- a/pkg/providers/docker/testdata/valid_deployment_cp_expected_124onwards.yaml +++ b/pkg/providers/docker/testdata/valid_deployment_cp_expected_124onwards.yaml @@ -320,7 +320,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.14 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 infrastructureTemplate: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/pkg/providers/docker/testdata/valid_deployment_cp_pod_iam_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_cp_pod_iam_expected.yaml index d342dc5e07b2..408eb55ff9e7 100644 --- a/pkg/providers/docker/testdata/valid_deployment_cp_pod_iam_expected.yaml +++ b/pkg/providers/docker/testdata/valid_deployment_cp_pod_iam_expected.yaml @@ -293,7 +293,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.14 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 infrastructureTemplate: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/pkg/providers/docker/testdata/valid_deployment_cp_taints_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_cp_taints_expected.yaml index 5fe4469917a2..0fa4e7fc76c9 100644 --- a/pkg/providers/docker/testdata/valid_deployment_cp_taints_expected.yaml +++ b/pkg/providers/docker/testdata/valid_deployment_cp_taints_expected.yaml @@ -312,7 +312,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.14 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 infrastructureTemplate: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/pkg/providers/docker/testdata/valid_deployment_custom_cidrs_cp_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_custom_cidrs_cp_expected.yaml index 6ef2fc7273c8..bfefad00cede 100644 --- a/pkg/providers/docker/testdata/valid_deployment_custom_cidrs_cp_expected.yaml +++ b/pkg/providers/docker/testdata/valid_deployment_custom_cidrs_cp_expected.yaml @@ -294,7 +294,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.14 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 infrastructureTemplate: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/pkg/providers/docker/testdata/valid_deployment_node_labels_cp_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_node_labels_cp_expected.yaml index 6422832f9a60..4fd54e3116cb 100644 --- a/pkg/providers/docker/testdata/valid_deployment_node_labels_cp_expected.yaml +++ b/pkg/providers/docker/testdata/valid_deployment_node_labels_cp_expected.yaml @@ -294,7 +294,6 @@ spec: etcdadmBuiltin: true cloudInitConfig: version: 3.4.14 - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 infrastructureTemplate: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/pkg/providers/snow/apibuilder.go b/pkg/providers/snow/apibuilder.go index 3fd3fb2818eb..2b68af7e29f8 100644 --- a/pkg/providers/snow/apibuilder.go +++ b/pkg/providers/snow/apibuilder.go @@ -161,7 +161,7 @@ func EtcdadmCluster(log logr.Logger, clusterSpec *cluster.Spec, snowMachineTempl clusterapi.SetBottlerocketHostConfigInEtcdCluster(etcd, machineConfig.Spec.HostOSConfiguration) case v1alpha1.Ubuntu: - clusterapi.SetUbuntuConfigInEtcdCluster(etcd, versionsBundle) + clusterapi.SetUbuntuConfigInEtcdCluster(etcd, versionsBundle.KubeDistro.EtcdVersion) etcd.Spec.EtcdadmConfigSpec.PreEtcdadmCommands = append(etcd.Spec.EtcdadmConfigSpec.PreEtcdadmCommands, "/etc/eks/bootstrap.sh", ) diff --git a/pkg/providers/snow/apibuilder_test.go b/pkg/providers/snow/apibuilder_test.go index b0ada13489a4..a4d2e2f55a08 100644 --- a/pkg/providers/snow/apibuilder_test.go +++ b/pkg/providers/snow/apibuilder_test.go @@ -1057,9 +1057,8 @@ func wantEtcdClusterUbuntu() *etcdv1.EtcdadmCluster { etcd := wantEtcdCluster() etcd.Spec.EtcdadmConfigSpec.Format = etcdbootstrapv1.Format("cloud-config") etcd.Spec.EtcdadmConfigSpec.CloudInitConfig = &etcdbootstrapv1.CloudInitConfig{ - Version: "3.4.16", - InstallDir: "/usr/bin", - EtcdReleaseURL: "https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz", + Version: "3.4.16", + InstallDir: "/usr/bin", } etcd.Spec.EtcdadmConfigSpec.PreEtcdadmCommands = []string{ "/etc/eks/bootstrap.sh", diff --git a/pkg/providers/snow/snow_test.go b/pkg/providers/snow/snow_test.go index a8d4613adb89..0f88321d48f3 100644 --- a/pkg/providers/snow/snow_test.go +++ b/pkg/providers/snow/snow_test.go @@ -135,7 +135,6 @@ func givenVersionsBundle() *cluster.VersionsBundle { URI: "public.ecr.aws/eks-distro/kubernetes/pause:0.0.1", }, EtcdVersion: "3.4.16", - EtcdURL: "https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz", }, VersionsBundle: &releasev1alpha1.VersionsBundle{ KubeVersion: "1.21", diff --git a/pkg/providers/tinkerbell/config/template-cp.yaml b/pkg/providers/tinkerbell/config/template-cp.yaml index ae0ada4da509..2fa8a03206b4 100644 --- a/pkg/providers/tinkerbell/config/template-cp.yaml +++ b/pkg/providers/tinkerbell/config/template-cp.yaml @@ -434,7 +434,6 @@ spec: cloudInitConfig: version: {{.externalEtcdVersion}} installDir: "/usr/bin" - etcdReleaseURL: {{.externalEtcdReleaseUrl}} preEtcdadmCommands: - hostname "{{`{{ ds.meta_data.hostname }}`}}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/tinkerbell/template.go b/pkg/providers/tinkerbell/template.go index 4100b092d4cc..1db95a791d9a 100644 --- a/pkg/providers/tinkerbell/template.go +++ b/pkg/providers/tinkerbell/template.go @@ -421,7 +421,6 @@ func buildTemplateMapCP( "etcdRepository": versionsBundle.KubeDistro.Etcd.Repository, "etcdImageTag": versionsBundle.KubeDistro.Etcd.Tag, "externalEtcdVersion": versionsBundle.KubeDistro.EtcdVersion, - "externalEtcdReleaseUrl": versionsBundle.KubeDistro.EtcdURL, "etcdCipherSuites": crypto.SecureCipherSuitesString(), "kubeletExtraArgs": kubeletExtraArgs.ToPartialYaml(), "hardwareSelector": controlPlaneMachineSpec.HardwareSelector, diff --git a/pkg/providers/vsphere/config/template-cp.yaml b/pkg/providers/vsphere/config/template-cp.yaml index e29a7cf7311f..513c547bd07a 100644 --- a/pkg/providers/vsphere/config/template-cp.yaml +++ b/pkg/providers/vsphere/config/template-cp.yaml @@ -538,7 +538,6 @@ spec: cloudInitConfig: version: {{.externalEtcdVersion}} installDir: "/usr/bin" - etcdReleaseURL: {{.externalEtcdReleaseUrl}} preEtcdadmCommands: - hostname "{{`{{ ds.meta_data.hostname }}`}}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/controlplane_test.go b/pkg/providers/vsphere/controlplane_test.go index d639f61ee940..08e073613d8e 100644 --- a/pkg/providers/vsphere/controlplane_test.go +++ b/pkg/providers/vsphere/controlplane_test.go @@ -757,7 +757,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/template.go b/pkg/providers/vsphere/template.go index fceff2194875..f8aaa86cd1d3 100644 --- a/pkg/providers/vsphere/template.go +++ b/pkg/providers/vsphere/template.go @@ -155,7 +155,6 @@ func buildTemplateMapCP( "kubernetesVersion": versionsBundle.KubeDistro.Kubernetes.Tag, "etcdRepository": versionsBundle.KubeDistro.Etcd.Repository, "etcdImageTag": versionsBundle.KubeDistro.Etcd.Tag, - "externalEtcdReleaseUrl": versionsBundle.KubeDistro.EtcdURL, "corednsRepository": versionsBundle.KubeDistro.CoreDNS.Repository, "corednsVersion": versionsBundle.KubeDistro.CoreDNS.Tag, "nodeDriverRegistrarImage": versionsBundle.KubeDistro.NodeDriverRegistrar.VersionedImage(), diff --git a/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml b/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml index bafca1c04e6f..1ff0de064245 100644 --- a/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml @@ -400,7 +400,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_diff_template_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_diff_template_cp.yaml index bc198cafaf31..ee09ea619c2e 100644 --- a/pkg/providers/vsphere/testdata/expected_results_diff_template_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_diff_template_cp.yaml @@ -398,7 +398,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml index 1f75a2701d55..259ec2cd39e3 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml @@ -398,7 +398,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml index fc315ea2a60d..e5c526b0a4ef 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml @@ -398,7 +398,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provder_and_csi_driver_credentials.yaml b/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provder_and_csi_driver_credentials.yaml index 9eb52dc95e2f..e162870bb5f0 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provder_and_csi_driver_credentials.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provder_and_csi_driver_credentials.yaml @@ -398,7 +398,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provider_credentials.yaml b/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provider_credentials.yaml index 9eb52dc95e2f..e162870bb5f0 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provider_credentials.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provider_credentials.yaml @@ -398,7 +398,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_main_cp_csi_driver_credentials.yaml b/pkg/providers/vsphere/testdata/expected_results_main_cp_csi_driver_credentials.yaml index fc315ea2a60d..e5c526b0a4ef 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_cp_csi_driver_credentials.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_cp_csi_driver_credentials.yaml @@ -398,7 +398,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_cp.yaml index 622cbb64ee23..e11562a172ee 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_cp.yaml @@ -398,7 +398,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_main_node_labels_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_node_labels_cp.yaml index a4183598e5f7..bbbf8de38a1c 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_node_labels_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_node_labels_cp.yaml @@ -400,7 +400,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_main_with_taints_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_with_taints_cp.yaml index b1b55b73a4f5..12c3b8944774 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_with_taints_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_with_taints_cp.yaml @@ -418,7 +418,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml index f2d1d4f71ed8..832e4bd6bd47 100644 --- a/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml @@ -407,7 +407,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_cp.yaml index 7db9533cb503..1fc48432dda6 100644 --- a/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_cp.yaml @@ -431,7 +431,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_mirror_with_auth_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_mirror_with_auth_config_cp.yaml index 4f47429836de..c52f49cbd6f2 100644 --- a/pkg/providers/vsphere/testdata/expected_results_mirror_with_auth_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_mirror_with_auth_config_cp.yaml @@ -432,7 +432,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml b/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml index b088b2c5b6ff..0ae870d44793 100644 --- a/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml @@ -399,7 +399,6 @@ spec: cloudInitConfig: version: 3.4.14 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-19/releases/4/artifacts/etcd/v3.4.14/etcd-linux-amd64-v3.4.14.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts diff --git a/pkg/providers/vsphere/testdata/expected_results_ubuntu_ntp_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_ubuntu_ntp_config_cp.yaml index 6ac60d074e82..ae6ca953d49a 100644 --- a/pkg/providers/vsphere/testdata/expected_results_ubuntu_ntp_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_ubuntu_ntp_config_cp.yaml @@ -410,7 +410,6 @@ spec: cloudInitConfig: version: 3.4.16 installDir: "/usr/bin" - etcdReleaseURL: https://distro.eks.amazonaws.com/kubernetes-1-21/releases/4/artifacts/etcd/v3.4.16/etcd-linux-amd64-v3.4.16.tar.gz preEtcdadmCommands: - hostname "{{ ds.meta_data.hostname }}" - echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts