chore(flannel): remove legacy flannel wrapper - #75
Garrett Settles (gsettles01) merged 2 commits into
Conversation
There was a problem hiding this comment.
🔵 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.
|
nit: this depends on a draft pr, so you have a bit of an inversion of the state of the prs. |
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.
b6bd2a8 to
cd10641
Compare
|
> 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. |
|
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 It would also help to state explicitly in the summary that the upstream |
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. |
Summary
This PR removes ACL's legacy Quay-dependent Flannel wrapper from ACL RPM images. The upstream
app-admin/flannel-wrapperpackage andcoreos-0.0.1.ebuilddependency 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
Type of Change
Associated Issues
Test Methodology
Merge Checklist
All applicable boxes should be checked before merging.