From dab9ada1be972386c36c1507a7eaae7810f53a6b Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Mon, 11 May 2026 09:46:20 -0700 Subject: [PATCH 1/4] Update enterprise private registry docs for combined tigera/calico image 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 ' 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. --- calico-enterprise/releases.json | 64 +++------------------------------ 1 file changed, 4 insertions(+), 60 deletions(-) diff --git a/calico-enterprise/releases.json b/calico-enterprise/releases.json index 9a65bcfea4..27bd65c855 100644 --- a/calico-enterprise/releases.json +++ b/calico-enterprise/releases.json @@ -11,26 +11,18 @@ "archive_path": "archive" }, "components": { - "cnx-manager": { - "image": "tigera/cnx-manager", - "version": "master" - }, - "voltron": { - "image": "tigera/voltron", + "calico": { + "image": "tigera/calico", "version": "master" }, - "guardian": { - "image": "tigera/guardian", + "cnx-manager": { + "image": "tigera/cnx-manager", "version": "master" }, "cnx-apiserver": { "image": "tigera/cnx-apiserver", "version": "master" }, - "cnx-queryserver": { - "image": "tigera/cnx-queryserver", - "version": "master" - }, "cnx-kube-controllers": { "image": "tigera/kube-controllers", "version": "master" @@ -71,10 +63,6 @@ "image": "tigera/fluentd-windows", "version": "master" }, - "ui-apis": { - "image": "tigera/ui-apis", - "version": "master" - }, "eck-kibana": { "version": "8.16.1" }, @@ -101,38 +89,10 @@ "image": "tigera/intrusion-detection-controller", "version": "master" }, - "compliance-controller": { - "image": "tigera/compliance-controller", - "version": "master" - }, - "compliance-reporter": { - "image": "tigera/compliance-reporter", - "version": "master" - }, - "compliance-snapshotter": { - "image": "tigera/compliance-snapshotter", - "version": "master" - }, - "compliance-server": { - "image": "tigera/compliance-server", - "version": "master" - }, "compliance-benchmarker": { "image": "tigera/compliance-benchmarker", "version": "master" }, - "ingress-collector": { - "image": "tigera/ingress-collector", - "version": "master" - }, - "l7-collector": { - "image": "tigera/l7-collector", - "version": "master" - }, - "linseed": { - "image": "tigera/linseed", - "version": "master" - }, "tigera-cni": { "image": "tigera/cni", "version": "master" @@ -154,14 +114,6 @@ "version": "master", "registry": "quay.io" }, - "elasticsearch-metrics": { - "image": "tigera/elasticsearch-metrics", - "version": "master" - }, - "packetcapture": { - "image": "tigera/packetcapture", - "version": "master" - }, "prometheus": { "image": "tigera/prometheus", "version": "master" @@ -180,14 +132,6 @@ "image": "tigera/prometheus-config-reloader", "version": "master" }, - "tigera-prometheus-service": { - "image": "tigera/prometheus-service", - "version": "master" - }, - "es-gateway": { - "image": "tigera/es-gateway", - "version": "master" - }, "deep-packet-inspection": { "image": "tigera/deep-packet-inspection", "version": "master" From 61960acbf80cdde55448ba4f1b723d992b342ff0 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Mon, 11 May 2026 09:49:00 -0700 Subject: [PATCH 2/4] Drop pod2daemon-flexvol and CSI entries 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. --- calico-enterprise/releases.json | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/calico-enterprise/releases.json b/calico-enterprise/releases.json index 27bd65c855..9ac9a259d8 100644 --- a/calico-enterprise/releases.json +++ b/calico-enterprise/releases.json @@ -157,21 +157,6 @@ "envoy-init": { "image": "tigera/envoy-init", "version": "master" - }, - "flexvol": { - "image": "calico/pod2daemon-flexvol", - "version": "master", - "registry": "quay.io" - }, - "csi-driver": { - "image": "calico/csi", - "version": "master", - "registry": "quay.io" - }, - "csi-node-driver-registrar": { - "image": "calico/node-driver-registrar", - "version": "master", - "registry": "quay.io" } } } From 6f7e9391ff9aeeb492ff721bc1aedf7316bb5a62 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Mon, 11 May 2026 09:54:05 -0700 Subject: [PATCH 3/4] Prune more components folded into the calico mono-image 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. --- calico-enterprise/releases.json | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/calico-enterprise/releases.json b/calico-enterprise/releases.json index 9ac9a259d8..64191d1c5b 100644 --- a/calico-enterprise/releases.json +++ b/calico-enterprise/releases.json @@ -19,26 +19,10 @@ "image": "tigera/cnx-manager", "version": "master" }, - "cnx-apiserver": { - "image": "tigera/cnx-apiserver", - "version": "master" - }, - "cnx-kube-controllers": { - "image": "tigera/kube-controllers", - "version": "master" - }, "calicoq": { "image": "tigera/calicoq", "version": "master" }, - "typha": { - "image": "tigera/typha", - "version": "master" - }, - "calicoctl": { - "image": "tigera/calicoctl", - "version": "master" - }, "cnx-node": { "image": "tigera/cnx-node", "version": "master" @@ -93,10 +77,6 @@ "image": "tigera/compliance-benchmarker", "version": "master" }, - "tigera-cni": { - "image": "tigera/cni", - "version": "master" - }, "tigera-cni-windows": { "image": "tigera/cni-windows", "version": "master" @@ -109,11 +89,6 @@ "image": "tigera/egress-gateway", "version": "master" }, - "key-cert-provisioner": { - "image": "tigera/key-cert-provisioner", - "version": "master", - "registry": "quay.io" - }, "prometheus": { "image": "tigera/prometheus", "version": "master" From 13fa0f2ff6d0f1623416a465f8a777902dc9cdcd Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Tue, 19 May 2026 17:07:46 -0700 Subject: [PATCH 4/4] Fix variables.js calicoctl reference after mono-image fold calicoctl was removed from releases.json in 6f7e9391f but variables.js still called componentImage('calicoctl', ...), which dereferenced undefined.registry and broke the Netlify build. Point both at the calico mono-image instead. --- calico-enterprise/operations/clis/calicoctl/install.mdx | 9 +++++---- calico-enterprise/variables.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/calico-enterprise/operations/clis/calicoctl/install.mdx b/calico-enterprise/operations/clis/calicoctl/install.mdx index 07f68ddbde..14c38f5f6b 100644 --- a/calico-enterprise/operations/clis/calicoctl/install.mdx +++ b/calico-enterprise/operations/clis/calicoctl/install.mdx @@ -271,18 +271,19 @@ If you run these commands from your local machine (instead of a host node), some 1. Save and close the file. -1. Use the following commands to pull the `calicoctl` image from the Tigera - registry. +1. Use the following commands to pull the `calico` image from the Tigera + registry. `calicoctl` ships inside this image alongside the other + $[prodname] command-line tools. ```bash - docker pull $[registry]$[componentImage.calicoctl] + docker pull $[registry]$[componentImage.calico] ``` 1. Confirm that the image has loaded by typing `docker images`. ```bash REPOSITORY TAG IMAGE ID CREATED SIZE - $[releases.0.components.calicoctl.image] $[releases.0.components.calicoctl.version] e07d59b0eb8a 2 minutes ago 42MB + $[releases.0.components.calico.image] $[releases.0.components.calico.version] e07d59b0eb8a 2 minutes ago 42MB ``` **Next step**: diff --git a/calico-enterprise/variables.js b/calico-enterprise/variables.js index c510d4d830..d8ec25b4b8 100644 --- a/calico-enterprise/variables.js +++ b/calico-enterprise/variables.js @@ -33,7 +33,7 @@ const variables = { }, componentImage: { cnxNode: componentImage('cnx-node', releases[0]), - calicoctl:componentImage('calicoctl', releases[0]), + calico: componentImage('calico', releases[0]), calicoq: componentImage('calicoq', releases[0]), }, };