Update enterprise private registry docs for combined tigera/calico image#2717
Open
caseydavenport wants to merge 3 commits into
Open
Update enterprise private registry docs for combined tigera/calico image#2717caseydavenport wants to merge 3 commits into
caseydavenport wants to merge 3 commits into
Conversation
The enterprise side of the calico mono-image consolidation (tigera/calico-private#11681, tigera/operator#4782) drops standalone builds for voltron, guardian, ui-apis, queryserver, linseed, l7-collector, ingress-collector, packetcapture, es-gateway, elasticsearch-metrics, prometheus-service, and compliance (server/controller/reporter/snapshotter). Operator points each of those at the combined tigera/calico image with 'calico component <name>' as the container command. Add a tigera/calico entry to the enterprise components map and prune the folded components so the rendered private-registry pull list stays in sync with what's actually published.
✅ Deploy Preview succeeded!Built without sensitive environment variables
To edit notification comments on pull requests, go to your Netlify project configuration. |
❌ Deploy Preview for calico-docs-preview-next failed. Why did it fail? →
|
These were pulled from quay.io/calico, and projectcalico/calico#12225 folded them into the calico/calico mono-image. The standalone images aren't published anymore, so prune them from the private-registry pull list.
Contributor
There was a problem hiding this comment.
Pull request overview
Updates Calico Enterprise’s release metadata to reflect the mono-image consolidation to tigera/calico, ensuring the private-registry install docs render an up-to-date set of images to mirror/pull.
Changes:
- Add the new
tigera/calicoimage tocalico-enterprise/releases.jsonso it appears in the generated private-registry pull list. - Remove component image entries that are no longer published as standalone images (now run from
tigera/calicoviacalico component <name>).
A comment in calico-private's release/internal/utils/enterprise.go enumerates everything bundled under cmd/calico: apiserver, calicoctl, kube-controllers, typha, pod2daemon/flexvol/csi, key-cert-provisioner, webhooks, Linux CNI, voltron, guardian, linseed (plus the components already dropped in this PR). Drop the enterprise standalones for each. calicoq stays - the calico-private PR body calls out that it picked up cobra plumbing only with no image change. cloud-controllers stays - not referenced as folded anywhere. tigera-cni-windows stays - the comment scopes the fold to the Linux CNI plugin.
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
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.

Enterprise companion to #2673. The enterprise side of the mono-image consolidation (https://github.com/tigera/calico-private/pull/11681, tigera/operator#4782) drops standalone builds for voltron, guardian, ui-apis, queryserver, linseed, l7-collector, ingress-collector, packetcapture, es-gateway, elasticsearch-metrics, prometheus-service, and compliance (server/controller/reporter/snapshotter). Operator points each one at
tigera/calicowithcalico component <name>as the container command.tigera/calicoentry tocalico-enterprise/releases.jsonso it shows up in the rendered private-registry pull list.intrusion-detection-controllerstays in the list - that image is now a thin layer on top oftigera/calicocarrying the GeoIP databases, so it's still published. Same goes forcnx-manager(the UI is still its own image; only theui-apisbackend got folded).dikastesalso stays standalone in enterprise for now, unlike OSS.