Skip to content
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

Jump to bottom

arm64 RKE2 CNI download logic #528

Merged
merged 3 commits into from
Aug 14, 2024
Merged

arm64 RKE2 CNI download logic #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c926304
arm64 rke2 cni download logic
dbw7 Aug 13, 2024
4568fa8
arm64 rke2 cni download logic
dbw7 Aug 13, 2024
151f096
Merge branch 'k8s-arm' of https://github.com/dbw7/edge-image-builder …
dbw7 Aug 14, 2024
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
2 changes: 2 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

## General

* Allow RKE2 deployments with Calico, Cilium and Multus on aarch64 platforms

## API

### Image Definition Changes
Expand Down
9 changes: 0 additions & 9 deletions pkg/kubernetes/artefact_downloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,14 @@ func rke2ImageArtefacts(cni string, multusEnabled bool, arch image.Arch) ([]stri
case image.CNITypeCanal:
artefacts = append(artefacts, fmt.Sprintf(rke2CanalImages, artefactArch))
case image.CNITypeCalico:
if arch == image.ArchTypeARM {
return nil, fmt.Errorf("calico is not supported on %s platforms", arch)
}
artefacts = append(artefacts, fmt.Sprintf(rke2CalicoImages, artefactArch))
case image.CNITypeCilium:
if arch == image.ArchTypeARM {
return nil, fmt.Errorf("cilium is not supported on %s platforms", arch)
}
artefacts = append(artefacts, fmt.Sprintf(rke2CiliumImages, artefactArch))
default:
return nil, fmt.Errorf("unsupported CNI: %s", cni)
}

if multusEnabled {
if arch == image.ArchTypeARM {
return nil, fmt.Errorf("multus is not supported on %s platforms", arch)
}
artefacts = append(artefacts, fmt.Sprintf(rke2MultusImages, artefactArch))
}

Expand Down
28 changes: 19 additions & 9 deletions pkg/kubernetes/artefact_downloader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,23 +100,33 @@ func TestRKE2ImageArtefacts(t *testing.T) {
},
},
{
name: "aarch64 artefacts with calico CNI",
cni: image.CNITypeCalico,
arch: image.ArchTypeARM,
expectedError: "calico is not supported on aarch64 platforms",
name: "aarch64 artefacts with calico CNI",
cni: image.CNITypeCalico,
arch: image.ArchTypeARM,
expectedArtefacts: []string{
"rke2-images-core.linux-arm64.tar.zst",
"rke2-images-calico.linux-arm64.tar.zst",
},
},
{
name: "aarch64 artefacts with cilium CNI",
cni: image.CNITypeCilium,
arch: image.ArchTypeARM,
expectedError: "cilium is not supported on aarch64 platforms",
name: "aarch64 artefacts with cilium CNI",
cni: image.CNITypeCilium,
arch: image.ArchTypeARM,
expectedArtefacts: []string{
"rke2-images-core.linux-arm64.tar.zst",
"rke2-images-cilium.linux-arm64.tar.zst",
},
},
{
name: "aarch64 artefacts with canal CNI + multus",
cni: image.CNITypeCanal,
multusEnabled: true,
arch: image.ArchTypeARM,
expectedError: "multus is not supported on aarch64 platforms",
expectedArtefacts: []string{
"rke2-images-core.linux-arm64.tar.zst",
"rke2-images-canal.linux-arm64.tar.zst",
"rke2-images-multus.linux-arm64.tar.zst",
},
},
}

Expand Down