Skip to content

chore(flannel): remove legacy flannel wrapper - #75

Merged
Garrett Settles (gsettles01) merged 2 commits into
aclmainfrom
gsettles/flannel-wrapper-removal-3-remove-wrapper
Sep 22, 2026
Merged

Garrett Settles (gsettles01) merged 2 commits into
aclmainfrom
gsettles/flannel-wrapper-removal-3-remove-wrapper

Conversation

@gsettles01

@gsettles01 Garrett Settles (gsettles01) commented Sep 15, 2026

Copy link
Copy Markdown

Summary

This PR removes ACL's legacy Quay-dependent Flannel wrapper from ACL RPM images. The upstream app-admin/flannel-wrapper package and coreos-0.0.1.ebuild dependency remain unchanged; only ACL's RPM-mode installation paths are removed. ACL #74 and Mantle #43 are merged. A separate work item will add replacement coverage. See more info in plan document.

Change Log

  • Remove flannel-wrapper packaging, units, network configs and RPM/sysext integration.

Type of Change

  • New kola test
  • Kola test fix/update
  • Platform integration change (Azure, QEMU, etc.)
  • CLI/command change
  • CI/automation change
  • Bug fix
  • Documentation update
  • Image build / package removal — additional category for this ACL change

Associated Issues

Test Methodology

  • Required CI checks pass

Merge Checklist

All applicable boxes should be checked before merging.

@gsettles01 Garrett Settles (gsettles01) changed the title [WIP] Gsettles/flannel wrapper removal 3 remove wrapper [WIP] chore(flannel): remove legacy wrapper Sep 15, 2026
@gsettles01 Garrett Settles (gsettles01) changed the title [WIP] chore(flannel): remove legacy wrapper [WIP] chore(flannel): remove legacy flannel wrapper Sep 15, 2026
@gsettles01 Garrett Settles (gsettles01) changed the title [WIP] chore(flannel): remove legacy flannel wrapper chore(flannel): remove legacy flannel wrapper Sep 16, 2026
@gsettles01
Garrett Settles (gsettles01) marked this pull request as ready for review September 16, 2026 17:03
Copilot AI lite review requested due to automatic review settings September 16, 2026 17:03

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

The prerequisite changes and CI conditions required for safe approval are not confirmed.

Pull request overview

This pull request removes the legacy Quay-dependent Flannel wrapper and its integrations.

Changes:

  • Deletes Flannel packaging, services, scripts, and network configuration.
  • Removes RPM, sysext, and image-build integration.
  • Removes legacy Flannel enforcement tests.
File summaries
File Description
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild Removes the wrapper dependency.
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/metadata.xml Deletes package metadata.
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.14.0-r1.ebuild Deletes the package definition.
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service Deletes the Flannel service unit.
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper Deletes the wrapper script.
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service Deletes the Docker options service.
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.network Deletes network configuration.
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.link Deletes link configuration.
build_library/rpm/sysext_mangle_docker-flatcar.sh Removes sysext installation logic.
build_library/rpm/package_catalog.yaml Removes the package catalog entry.
build_library/rpm/build_image_util.sh Removes RPM service installation logic.
acl/tests/kola_enforcing.yaml Removes legacy Flannel enforcement entries.
Review details
  • Files reviewed: 12/12 changed files
  • Comments generated: 0
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@gsettles01 Garrett Settles (gsettles01) changed the title chore(flannel): remove legacy flannel wrapper [Depends on Mantle #43] chore(flannel): remove legacy flannel wrapper Sep 16, 2026
@jiria

Copy link
Copy Markdown
Member

nit: this depends on a draft pr, so you have a bit of an inversion of the state of the prs.

Comment thread acl/tests/kola_enforcing.yaml Outdated
Comment thread build_library/rpm/package_catalog.yaml
Part 2 of the published remove-flannel-wrapper PR, stacked on gsettles/remove-flannel-wrapper-1-prerequisite. Remove the remaining package sources, Portage dependency, RPM rootfs service installation, and Docker sysext injection. The combined tree exactly reproduces 6b378c6.

Merge only after ACL part 1 and Mantle gsettles/remove-acl-flannel-tests have landed and validation consumes the excluded-test runner. Rebuild both the OS and Docker sysext, validate applicable etcd/kubeadm tests, and migrate legacy user configs before image rollout.
@gsettles01
Garrett Settles (gsettles01) force-pushed the gsettles/flannel-wrapper-removal-3-remove-wrapper branch from b6bd2a8 to cd10641 Compare September 16, 2026 18:53
@gsettles01

Garrett Settles (gsettles01) commented Sep 16, 2026

Copy link
Copy Markdown
Author

> nit: this depends on a draft pr, so you have a bit of an inversion of the state of the prs.

Jiri Appl (@jiria) Good catch. Yep, Mantle #43 is now out of draft. I'll hold #75 until #43 merges and CI uses the updated Mantle image.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

Approval depends on the unmerged Mantle #43 image and coordinated test-exclusion rollout.

Review details
  • Files reviewed: 2/2 changed files
  • Comments generated: 0 new
  • Review effort level: Lite

Comment thread build_library/rpm/sysext_mangle_docker-flatcar.sh
@jiria

Copy link
Copy Markdown
Member

Small housekeeping before this merges: the description still has "NOTE - currently rebased on the first ACL PR #74 to show all changes", but #74 is merged and this is now rebased on aclmain — the diff is just the 2 files / -49 lines. Worth dropping that note and ticking the #74 prerequisite so the squash commit message reflects the final scope (the first automated review summarised the old 12-file diff, which makes the stale note a bit of a trap for the next reviewer). Also a typo in the checklist: "Prerequiste" -> "Prerequisite".

It would also help to state explicitly in the summary that the upstream app-admin/flannel-wrapper package and the coreos-0.0.1.ebuild dependency are deliberately left in place, and that only ACL's RPM-mode install steps are removed — that context currently lives only in the review threads.

@gsettles01 Garrett Settles (gsettles01) changed the title [Depends on Mantle #43] chore(flannel): remove legacy flannel wrapper chore(flannel): remove legacy flannel wrapper Sep 18, 2026
@gsettles01

Garrett Settles (gsettles01) commented Sep 21, 2026

Copy link
Copy Markdown
Author

Small housekeeping before this merges: the description still has "NOTE - currently rebased on the first ACL PR #74 to show all changes", but #74 is merged and this is now rebased on aclmain — the diff is just the 2 files / -49 lines. Worth dropping that note and ticking the #74 prerequisite so the squash commit message reflects the final scope (the first automated review summarised the old 12-file diff, which makes the stale note a bit of a trap for the next reviewer). Also a typo in the checklist: "Prerequiste" -> "Prerequisite".

It would also help to state explicitly in the summary that the upstream app-admin/flannel-wrapper package and the coreos-0.0.1.ebuild dependency are deliberately left in place, and that only ACL's RPM-mode install steps are removed — that context currently lives only in the review threads.

Ah, that makes sense. I agree that removing shared Flannel references would create unnecessary upstream-sync churn. I removed the stale note, fixed the typo, marked prerequisites merged, and clarified the ACL-only RPM scope. Code wise got it so the shared package and dependency remain, limited the PR to ACL RPM install paths. Thanks for helping me understand the distinction between shared upstream sources and ACL-specific installation paths.

@gsettles01
Garrett Settles (gsettles01) merged commit 1d0251d into aclmain Sep 22, 2026
28 of 32 checks passed
@gsettles01
Garrett Settles (gsettles01) deleted the gsettles/flannel-wrapper-removal-3-remove-wrapper branch September 22, 2026 17:54

This branch was successfully deployed

1 active deployment
development e3d0165a Deployed Sep 21, 2026 by gsettles01 via Check if we need to update the SDK #24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants