Skip to content

feat: flatcar: install blobfuse2 binary #7236

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

Open
invidian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: flatcar: install blobfuse2 binary #7236

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
30 changes: 30 additions & 0 deletions e2e/scenario_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,36 @@ func Test_Flatcar_CustomCATrust(t *testing.T) {
})
}

func Test_Flatcar_Blobfuse2(t *testing.T) {
RunScenario(t, &Scenario{
Description: "Tests that a node using the Flatcar VHD has blobfuse2 binary executable at expected path",
Config: Config{
Cluster: ClusterKubenet,
VHD: config.VHDFlatcarGen2,
BootstrapConfigMutator: func(nbc *datamodel.NodeBootstrappingConfiguration) {
},
Validator: func(ctx context.Context, s *Scenario) {
execScriptOnVMForScenarioValidateExitCode(ctx, s, "/var/bin/blobfuse2 mount list", 0, "blobfuse2 binary not found or not executable")
},
},
})
}

func Test_Flatcar_No_Docker_images(t *testing.T) {
RunScenario(t, &Scenario{
Description: "Tests that a node using the Flatcar VHD has no Docker images present",
Config: Config{
Cluster: ClusterKubenet,
VHD: config.VHDFlatcarGen2,
BootstrapConfigMutator: func(nbc *datamodel.NodeBootstrappingConfiguration) {
},
Validator: func(ctx context.Context, s *Scenario) {
execScriptOnVMForScenarioValidateExitCode(ctx, s, "docker image ls -q | grep .", 1, "Docker images found on Flatcar node")
},
},
})
}

func Test_Flatcar_Scriptless(t *testing.T) {
RunScenario(t, &Scenario{
Description: "Tests that a node using a Flatcar and the self-contained installer can be properly bootstrapped",
Expand Down
16 changes: 15 additions & 1 deletion parts/linux/cloud-init/artifacts/flatcar/cse_install_flatcar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,21 @@ stub() {
}

installDeps() {
stub
# We must configure containerd before running Docker commands.
installStandaloneContainerd ""

local ARCH; ARCH="$(uname -m)"
local BLOB_CSI_IMAGE="mcr.microsoft.com/oss/v2/kubernetes-csi/blob-csi:v1.27.1"

docker run --rm \
-v /var/bin:/host/var/bin \
--env DISTRIBUTION=flatcar \
--env ARCH="${ARCH}" \
--env INSTALL_BLOBFUSE2=true \
--env INSTALL_BLOBFUSE_PROXY=false \
--entrypoint /blobfuse-proxy/install-proxy-rhcos.sh \
"${BLOB_CSI_IMAGE}"
docker image rm "${BLOB_CSI_IMAGE}"
}

installCriCtlPackage() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/Flatcar+CustomCloud+USSec/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/Flatcar+CustomCloud+USSec/CustomData.inner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
},
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/3xSwW6jMBS88xVTyqE9EFTtraseVkmoVtqlEQm9VFXlmEdixdjINpEqwr+vnGRZ2m7LCenNzJt5nsuLZC1UsmZ2GwTWteura3QBABDfaoRRlxbZNPvxe/5089zDI8KgDwKhrGNSzqixA8MPR7OpEVMnF4zv2IY+Ay0dUyWTWtFUK8eEIlMOWKk5kyjJCkPlIxkrtLoLo+7mNu7DI2Ja5Pk8W708zvPlz4fsLrrigwzi/YmCA3jrEJcIESKu8O16lJC3xpBy8hVnS1RiJHLWuEXUvVvWTzA7WfsLQtS9NdtPsNyJphFqgy8CQyukkjnOzOSUS1R4woX3GibkePLPkP+txGbidC1DPH+H25I6cvxX70phEDd4xxoAvEHSWpPYLTP0iSy+WDkI2VfrqOZOwpB1zLjx0Q6H83FTJvw9nf4P6pS0Er4NpGxrKG8V/1AUQ7XeU7YXpWA5Nfpj37gkpormflHMjPBPMSBMjTivEN0vipfZfLlCohuXbJp21MCV1jI1uv7ly+YXvNU/ypBrjcKNZ13OH9LgTwAAAP//2Fu5TzYDAAA=",
"source": "data:;base64,H4sIAAAAAAAC/4STTW/yOBDH7/kU05RDe0gsuoeVqDhQXrpIFFAC1a66FTLOBCwSOxo70SLKd18ZKE1Lnz4cIDa/efvPP9dXbCkVW3Kz9jxjy+XNLew8AAAUaw1+YzeYj7vjzlP/pfm6B0f43t7zpDKWZ1kPC3OOON3FlquEZ1phVyvLpUJKwPe9A5NpwTPoRN2/7g/fbb9xUyqeIwT5rV9DHkaTh0U3Hi6GT53HftvPBYW5FKSNTm0odM60May6Y5tyiaTQogmEkWyZ6aV7aFXN8O7PsHmqm2ixQQIqFQQB5fDv4dZ9ggpYxcnJ0GJrbez7CepQgKqC3jCeRcOH+Ww4GbfTjFvB6QI6TbVzv3v/4u/hOJ51RqOFm28wj/t3bUslwm+5xTSa/P1PO+WZuaAtbQstlYXD9GlpMChI/7dlp40cTwGthTahWdei/cbus9B7vy6XzPkKgfJvuQ8XdEl2bTblYsNXeLaD80oN+s4WZ/a48wSNJEyekYzUyonYbAWnjrrzKOqPZ4vnfhQ7+Rs34sNdQXUMgTcQpYUgAR98CFL447bmZVESobLZ9t2pmEAtySlHCxq7L8X2IfSOrb1D0Nh9bnYfQryRRSHV6sf3QCsYHI0THueSKbzAlevVZ2gF+2jIPaZyFVqdZz683oNdozpvLt8kkiAo4EvUGRAFsNIQM2tO+Iu08EPJcyKzNRZzYTMgNJaTrYv29nYSd8Cl09Pqb6jjpKl0bkBlSsKoVOLCKIS5rnBcyUTyCAttLgiRIVfz4nE675F0qzgTlEMQpdB4nM4XvX48A6YLy1ZFWXPgTOtsQDofObO5Ap/zH9KgLUlB00Vd9ycD7/8AAAD//3mjF/UgBQAA",
"verification": {}
},
"mode": 484
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/Flatcar+CustomCloud/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/Flatcar+CustomCloud/CustomData.inner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
},
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/3xSwW6jMBS88xVTyqE9EFTtraseVkmoVtqlEQm9VFXlmEdixdjINpEqwr+vnGRZ2m7LCenNzJt5nsuLZC1UsmZ2GwTWteura3QBABDfaoRRlxbZNPvxe/5089zDI8KgDwKhrGNSzqixA8MPR7OpEVMnF4zv2IY+Ay0dUyWTWtFUK8eEIlMOWKk5kyjJCkPlIxkrtLoLo+7mNu7DI2Ja5Pk8W708zvPlz4fsLrrigwzi/YmCA3jrEJcIESKu8O16lJC3xpBy8hVnS1RiJHLWuEXUvVvWTzA7WfsLQtS9NdtPsNyJphFqgy8CQyukkjnOzOSUS1R4woX3GibkePLPkP+txGbidC1DPH+H25I6cvxX70phEDd4xxoAvEHSWpPYLTP0iSy+WDkI2VfrqOZOwpB1zLjx0Q6H83FTJvw9nf4P6pS0Er4NpGxrKG8V/1AUQ7XeU7YXpWA5Nfpj37gkpormflHMjPBPMSBMjTivEN0vipfZfLlCohuXbJp21MCV1jI1uv7ly+YXvNU/ypBrjcKNZ13OH9LgTwAAAP//2Fu5TzYDAAA=",
"source": "data:;base64,H4sIAAAAAAAC/4STTW/yOBDH7/kU05RDe0gsuoeVqDhQXrpIFFAC1a66FTLOBCwSOxo70SLKd18ZKE1Lnz4cIDa/efvPP9dXbCkVW3Kz9jxjy+XNLew8AAAUaw1+YzeYj7vjzlP/pfm6B0f43t7zpDKWZ1kPC3OOON3FlquEZ1phVyvLpUJKwPe9A5NpwTPoRN2/7g/fbb9xUyqeIwT5rV9DHkaTh0U3Hi6GT53HftvPBYW5FKSNTm0odM60May6Y5tyiaTQogmEkWyZ6aV7aFXN8O7PsHmqm2ixQQIqFQQB5fDv4dZ9ggpYxcnJ0GJrbez7CepQgKqC3jCeRcOH+Ww4GbfTjFvB6QI6TbVzv3v/4u/hOJ51RqOFm28wj/t3bUslwm+5xTSa/P1PO+WZuaAtbQstlYXD9GlpMChI/7dlp40cTwGthTahWdei/cbus9B7vy6XzPkKgfJvuQ8XdEl2bTblYsNXeLaD80oN+s4WZ/a48wSNJEyekYzUyonYbAWnjrrzKOqPZ4vnfhQ7+Rs34sNdQXUMgTcQpYUgAR98CFL447bmZVESobLZ9t2pmEAtySlHCxq7L8X2IfSOrb1D0Nh9bnYfQryRRSHV6sf3QCsYHI0THueSKbzAlevVZ2gF+2jIPaZyFVqdZz683oNdozpvLt8kkiAo4EvUGRAFsNIQM2tO+Iu08EPJcyKzNRZzYTMgNJaTrYv29nYSd8Cl09Pqb6jjpKl0bkBlSsKoVOLCKIS5rnBcyUTyCAttLgiRIVfz4nE675F0qzgTlEMQpdB4nM4XvX48A6YLy1ZFWXPgTOtsQDofObO5Ap/zH9KgLUlB00Vd9ycD7/8AAAD//3mjF/UgBQAA",
"verification": {}
},
"mode": 484
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/Flatcar/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/Flatcar/CustomData.inner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
},
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/3xSwW6jMBS88xVTyqE9EFTtraseVkmoVtqlEQm9VFXlmEdixdjINpEqwr+vnGRZ2m7LCenNzJt5nsuLZC1UsmZ2GwTWteura3QBABDfaoRRlxbZNPvxe/5089zDI8KgDwKhrGNSzqixA8MPR7OpEVMnF4zv2IY+Ay0dUyWTWtFUK8eEIlMOWKk5kyjJCkPlIxkrtLoLo+7mNu7DI2Ja5Pk8W708zvPlz4fsLrrigwzi/YmCA3jrEJcIESKu8O16lJC3xpBy8hVnS1RiJHLWuEXUvVvWTzA7WfsLQtS9NdtPsNyJphFqgy8CQyukkjnOzOSUS1R4woX3GibkePLPkP+txGbidC1DPH+H25I6cvxX70phEDd4xxoAvEHSWpPYLTP0iSy+WDkI2VfrqOZOwpB1zLjx0Q6H83FTJvw9nf4P6pS0Er4NpGxrKG8V/1AUQ7XeU7YXpWA5Nfpj37gkpormflHMjPBPMSBMjTivEN0vipfZfLlCohuXbJp21MCV1jI1uv7ly+YXvNU/ypBrjcKNZ13OH9LgTwAAAP//2Fu5TzYDAAA=",
"source": "data:;base64,H4sIAAAAAAAC/4STTW/yOBDH7/kU05RDe0gsuoeVqDhQXrpIFFAC1a66FTLOBCwSOxo70SLKd18ZKE1Lnz4cIDa/efvPP9dXbCkVW3Kz9jxjy+XNLew8AAAUaw1+YzeYj7vjzlP/pfm6B0f43t7zpDKWZ1kPC3OOON3FlquEZ1phVyvLpUJKwPe9A5NpwTPoRN2/7g/fbb9xUyqeIwT5rV9DHkaTh0U3Hi6GT53HftvPBYW5FKSNTm0odM60May6Y5tyiaTQogmEkWyZ6aV7aFXN8O7PsHmqm2ixQQIqFQQB5fDv4dZ9ggpYxcnJ0GJrbez7CepQgKqC3jCeRcOH+Ww4GbfTjFvB6QI6TbVzv3v/4u/hOJ51RqOFm28wj/t3bUslwm+5xTSa/P1PO+WZuaAtbQstlYXD9GlpMChI/7dlp40cTwGthTahWdei/cbus9B7vy6XzPkKgfJvuQ8XdEl2bTblYsNXeLaD80oN+s4WZ/a48wSNJEyekYzUyonYbAWnjrrzKOqPZ4vnfhQ7+Rs34sNdQXUMgTcQpYUgAR98CFL447bmZVESobLZ9t2pmEAtySlHCxq7L8X2IfSOrb1D0Nh9bnYfQryRRSHV6sf3QCsYHI0THueSKbzAlevVZ2gF+2jIPaZyFVqdZz683oNdozpvLt8kkiAo4EvUGRAFsNIQM2tO+Iu08EPJcyKzNRZzYTMgNJaTrYv29nYSd8Cl09Pqb6jjpKl0bkBlSsKoVOLCKIS5rnBcyUTyCAttLgiRIVfz4nE675F0qzgTlEMQpdB4nM4XvX48A6YLy1ZFWXPgTOtsQDofObO5Ap/zH9KgLUlB00Vd9ycD7/8AAAD//3mjF/UgBQAA",
"verification": {}
},
"mode": 484
Expand Down
Loading