Skip to content

Commit

Permalink
Revert "Set etcd url in cloud-config when external etcd is enabled" (#…
Browse files Browse the repository at this point in the history
…6903)

Co-authored-by: Tanvir Tatla <[email protected]>
  • Loading branch information
eks-distro-pr-bot and tatlat authored Oct 26, 2023
1 parent 17676c4 commit 23ccf95
Show file tree
Hide file tree
Showing 59 changed files with 13 additions and 88 deletions.
9 changes: 0 additions & 9 deletions pkg/cluster/fetch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
15 changes: 3 additions & 12 deletions pkg/cluster/spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ type KubeDistro struct {
Pause v1alpha1.Image
EtcdImage v1alpha1.Image
EtcdVersion string
EtcdURL string
AwsIamAuthImage v1alpha1.Image
KubeProxy v1alpha1.Image
}
Expand Down Expand Up @@ -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")
}
}

Expand Down
2 changes: 0 additions & 2 deletions pkg/clusterapi/apibuilder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
Expand Down
7 changes: 3 additions & 4 deletions pkg/clusterapi/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
}

Expand Down
9 changes: 4 additions & 5 deletions pkg/clusterapi/etcd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down
1 change: 0 additions & 1 deletion pkg/providers/cloudstack/config/template-cp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pkg/providers/cloudstack/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pkg/providers/docker/config/template-cp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ spec:
etcdadmBuiltin: true
cloudInitConfig:
version: {{.externalEtcdVersion}}
etcdReleaseURL: {{.externalEtcdReleaseUrl}}
{{- if .etcdCipherSuites }}
cipherSuites: {{.etcdCipherSuites}}
{{- end }}
Expand Down
1 change: 0 additions & 1 deletion pkg/providers/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
1 change: 0 additions & 1 deletion pkg/providers/docker/docker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/providers/snow/apibuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)
Expand Down
5 changes: 2 additions & 3 deletions pkg/providers/snow/apibuilder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion pkg/providers/snow/snow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion pkg/providers/tinkerbell/config/template-cp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pkg/providers/tinkerbell/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion pkg/providers/tinkerbell/tinkerbell_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2289,7 +2289,6 @@ func getVersionBundle() *cluster.VersionsBundle {
URI: "public.ecr.aws/eks-distro/kubernetes/kube-proxy:v1.21.2-eks-1-21-4",
},
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",
},
}
}
1 change: 0 additions & 1 deletion pkg/providers/vsphere/config/template-cp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pkg/providers/vsphere/controlplane_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 23ccf95

Please sign in to comment.