Adopt the ko-built calico image#4805
Closed
caseydavenport wants to merge 3 commits into
Closed
Conversation
Switches CalicoBinaryPath (and the csi-node-driver-registrar command) from absolute paths to bare commands so they resolve via PATH. Keeps us agnostic to where the binary lives in the image: legacy Dockerfile builds use /usr/bin/calico, ko-built images use /ko-app/calico. Both paths are on PATH. Companion to the ko-build prototype in projectcalico/calico#12710.
The csi-node-driver-registrar binary is being carved out of calico/calico into its own image (calico/node-driver-registrar) on the OSS side. ResolveImages for the CSI driver now picks up the standalone registrar component for OSS variants (and its FIPS counterpart when FIPS is on); Enterprise keeps using the combined tigera/calico image since the binary is still bundled there. Companion to projectcalico/calico#12710.
caseydavenport
changed the title
caseydavenport
added
release-note-not-required
docs-not-required
and removed
docs-pr-required
release-note-required
labels
caseydavenport
changed the title
# Conflicts: # pkg/render/csi.go
Member
Author
|
Closing - depends on projectcalico/calico#12710 which was closed (benchmark numbers didn't justify the blast radius). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two changes needed in the operator before the calico/calico image can ship from ko (see projectcalico/calico#12710):
/usr/bin/calicoto a barecalicoso it resolves via PATH. The legacy Dockerfile build puts the binary at/usr/bin/calico; the ko-built image puts it at/ko-app/calico. Both directories are on PATH, so manifests, probes, init containers, and lifecycle hooks all work either way. Same treatment for the csi-node-driver-registrar command.calico/node-driver-registrar), since the ko-built calico/calico no longer carries the binary. Enterprise keeps using the combinedtigera/calicoimage (registrar is still bundled there).