Skip to content

fix(templates): runtime Kubernetes arch detection for arm64 #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ArangoGutierrez wants to merge 1 commit into from
Closed

fix(templates): runtime Kubernetes arch detection for arm64 #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions pkg/provisioner/templates/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ K8S_VERSION="{{.Version}}"
CNI_PLUGINS_VERSION="{{.CniPluginsVersion}}"
CALICO_VERSION="{{.CalicoVersion}}"
CRICTL_VERSION="{{.CrictlVersion}}"
ARCH="{{.Arch}}"
{{if .Arch}}ARCH="{{.Arch}}"{{else}}ARCH="$(dpkg --print-architecture 2>/dev/null || (uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/'))"{{end}}
KUBELET_RELEASE_VERSION="{{.KubeletReleaseVersion}}"
K8S_ENDPOINT_HOST="{{.K8sEndpointHost}}"

Expand Down Expand Up @@ -822,7 +822,7 @@ GIT_COMMIT="{{.GitCommit}}"
CNI_PLUGINS_VERSION="{{.CniPluginsVersion}}"
CALICO_VERSION="{{.CalicoVersion}}"
CRICTL_VERSION="{{.CrictlVersion}}"
ARCH="{{.Arch}}"
{{if .Arch}}ARCH="{{.Arch}}"{{else}}ARCH="$(dpkg --print-architecture 2>/dev/null || (uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/'))"{{end}}
KUBELET_RELEASE_VERSION="{{.KubeletReleaseVersion}}"
K8S_ENDPOINT_HOST="{{.K8sEndpointHost}}"

Expand Down Expand Up @@ -1153,7 +1153,7 @@ TRACK_BRANCH="{{.TrackBranch}}"
CNI_PLUGINS_VERSION="{{.CniPluginsVersion}}"
CALICO_VERSION="{{.CalicoVersion}}"
CRICTL_VERSION="{{.CrictlVersion}}"
ARCH="{{.Arch}}"
{{if .Arch}}ARCH="{{.Arch}}"{{else}}ARCH="$(dpkg --print-architecture 2>/dev/null || (uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/'))"{{end}}
KUBELET_RELEASE_VERSION="{{.KubeletReleaseVersion}}"
K8S_ENDPOINT_HOST="{{.K8sEndpointHost}}"

Expand Down Expand Up @@ -1545,9 +1545,8 @@ func NewKubernetes(env v1alpha1.Environment) (*Kubernetes, error) {
}
if env.Spec.Kubernetes.Arch != "" {
kubernetes.Arch = env.Spec.Kubernetes.Arch
} else {
kubernetes.Arch = "amd64"
}
// When Arch is empty, the template uses runtime detection
if env.Spec.Kubernetes.CniPluginsVersion != "" {
kubernetes.CniPluginsVersion = env.Spec.Kubernetes.CniPluginsVersion
} else {
Expand Down
180 changes: 174 additions & 6 deletions pkg/provisioner/templates/kubernetes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func TestNewKubernetes(t *testing.T) {
want: &Kubernetes{
Version: "v1.30.0",
KubeletReleaseVersion: defaultKubeletReleaseVersion,
Arch: defaultArch,
Arch: "", // empty = runtime detection
CniPluginsVersion: defaultCNIPluginsVersion,
CalicoVersion: defaultCalicoVersion,
CrictlVersion: defaultCRIVersion,
Expand All @@ -56,7 +56,7 @@ func TestNewKubernetes(t *testing.T) {
want: &Kubernetes{
Version: "v1.31.0",
KubeletReleaseVersion: defaultKubeletReleaseVersion,
Arch: defaultArch,
Arch: "", // empty = runtime detection
CniPluginsVersion: defaultCNIPluginsVersion,
CalicoVersion: defaultCalicoVersion,
CrictlVersion: defaultCRIVersion,
Expand Down Expand Up @@ -116,7 +116,7 @@ func TestNewKubernetes(t *testing.T) {
},
want: &Kubernetes{
KubeletReleaseVersion: defaultKubeletReleaseVersion,
Arch: defaultArch,
Arch: "", // empty = runtime detection
CniPluginsVersion: defaultCNIPluginsVersion,
CalicoVersion: defaultCalicoVersion,
CrictlVersion: defaultCRIVersion,
Expand Down Expand Up @@ -144,7 +144,7 @@ func TestNewKubernetes(t *testing.T) {
},
want: &Kubernetes{
KubeletReleaseVersion: defaultKubeletReleaseVersion,
Arch: defaultArch,
Arch: "", // empty = runtime detection
CniPluginsVersion: defaultCNIPluginsVersion,
CalicoVersion: defaultCalicoVersion,
CrictlVersion: defaultCRIVersion,
Expand Down Expand Up @@ -172,7 +172,7 @@ func TestNewKubernetes(t *testing.T) {
},
want: &Kubernetes{
KubeletReleaseVersion: defaultKubeletReleaseVersion,
Arch: defaultArch,
Arch: "", // empty = runtime detection
CniPluginsVersion: defaultCNIPluginsVersion,
CalicoVersion: defaultCalicoVersion,
CrictlVersion: defaultCRIVersion,
Expand All @@ -197,7 +197,7 @@ func TestNewKubernetes(t *testing.T) {
},
want: &Kubernetes{
KubeletReleaseVersion: defaultKubeletReleaseVersion,
Arch: defaultArch,
Arch: "", // empty = runtime detection
CniPluginsVersion: defaultCNIPluginsVersion,
CalicoVersion: defaultCalicoVersion,
CrictlVersion: defaultCRIVersion,
Expand Down Expand Up @@ -818,3 +818,171 @@ func TestIsLegacyKubernetesVersion(t *testing.T) {
})
}
}

func TestKubernetes_ArchRuntimeDetection(t *testing.T) {
tests := []struct {
name string
arch string
expectedString string
notExpected string
}{
{
name: "empty arch uses runtime detection",
arch: "",
expectedString: `dpkg --print-architecture`,
notExpected: "\nARCH=\"amd64\"\n",
},
{
name: "explicit arm64 arch",
arch: "arm64",
expectedString: `ARCH="arm64"`,
notExpected: `dpkg --print-architecture`,
},
{
name: "explicit amd64 arch",
arch: "amd64",
expectedString: `ARCH="amd64"`,
notExpected: `dpkg --print-architecture`,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
env := v1alpha1.Environment{
Spec: v1alpha1.EnvironmentSpec{
Kubernetes: v1alpha1.Kubernetes{
KubernetesVersion: "v1.30.0",
KubernetesInstaller: "kubeadm",
Arch: tt.arch,
},
ContainerRuntime: v1alpha1.ContainerRuntime{
Name: "containerd",
},
},
}

k, err := NewKubernetes(env)
assert.NoError(t, err)

var buf bytes.Buffer
err = k.Execute(&buf, env)
assert.NoError(t, err)

out := buf.String()
assert.Contains(t, out, tt.expectedString,
"template output should contain %q", tt.expectedString)
assert.NotContains(t, out, tt.notExpected,
"template output should not contain %q", tt.notExpected)
})
}
}

func TestKubernetes_ArchRuntimeDetection_GitSource(t *testing.T) {
tests := []struct {
name string
arch string
expectedString string
notExpected string
}{
{
name: "git source empty arch uses runtime detection",
arch: "",
expectedString: `dpkg --print-architecture`,
notExpected: "\nARCH=\"amd64\"\n",
},
{
name: "git source explicit arm64 arch",
arch: "arm64",
expectedString: `ARCH="arm64"`,
notExpected: `dpkg --print-architecture`,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
env := v1alpha1.Environment{
Spec: v1alpha1.EnvironmentSpec{
Kubernetes: v1alpha1.Kubernetes{
KubernetesInstaller: "kubeadm",
Arch: tt.arch,
Source: v1alpha1.K8sSourceGit,
Git: &v1alpha1.K8sGitSpec{
Ref: "v1.32.0-alpha.1",
},
},
ContainerRuntime: v1alpha1.ContainerRuntime{
Name: "containerd",
},
},
}

k, err := NewKubernetes(env)
assert.NoError(t, err)

var buf bytes.Buffer
err = k.Execute(&buf, env)
assert.NoError(t, err)

out := buf.String()
assert.Contains(t, out, tt.expectedString,
"template output should contain %q", tt.expectedString)
assert.NotContains(t, out, tt.notExpected,
"template output should not contain %q", tt.notExpected)
})
}
}

func TestKubernetes_ArchRuntimeDetection_LatestSource(t *testing.T) {
tests := []struct {
name string
arch string
expectedString string
notExpected string
}{
{
name: "latest source empty arch uses runtime detection",
arch: "",
expectedString: `dpkg --print-architecture`,
notExpected: "\nARCH=\"amd64\"\n",
},
{
name: "latest source explicit arm64 arch",
arch: "arm64",
expectedString: `ARCH="arm64"`,
notExpected: `dpkg --print-architecture`,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
env := v1alpha1.Environment{
Spec: v1alpha1.EnvironmentSpec{
Kubernetes: v1alpha1.Kubernetes{
KubernetesInstaller: "kubeadm",
Arch: tt.arch,
Source: v1alpha1.K8sSourceLatest,
Latest: &v1alpha1.K8sLatestSpec{
Track: "master",
},
},
ContainerRuntime: v1alpha1.ContainerRuntime{
Name: "containerd",
},
},
}

k, err := NewKubernetes(env)
assert.NoError(t, err)

var buf bytes.Buffer
err = k.Execute(&buf, env)
assert.NoError(t, err)

out := buf.String()
assert.Contains(t, out, tt.expectedString,
"template output should contain %q", tt.expectedString)
assert.NotContains(t, out, tt.notExpected,
"template output should not contain %q", tt.notExpected)
})
}
}
Loading