From 71b1135ad3b70b19762de6673f32d719fe6decb9 Mon Sep 17 00:00:00 2001 From: Christopher Tauchen Date: Wed, 20 May 2026 11:04:57 +0100 Subject: [PATCH 1/2] Revert "Update enterprise private registry docs for combined tigera/calico image (#2717)" This reverts commit 314604321c00662b5f2ae29ec86941f5ca9d6ebc. --- .../operations/clis/calicoctl/install.mdx | 9 +- calico-enterprise/releases.json | 104 +++++++++++++++++- calico-enterprise/variables.js | 2 +- 3 files changed, 105 insertions(+), 10 deletions(-) diff --git a/calico-enterprise/operations/clis/calicoctl/install.mdx b/calico-enterprise/operations/clis/calicoctl/install.mdx index 14c38f5f6b..07f68ddbde 100644 --- a/calico-enterprise/operations/clis/calicoctl/install.mdx +++ b/calico-enterprise/operations/clis/calicoctl/install.mdx @@ -271,19 +271,18 @@ 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 `calico` image from the Tigera - registry. `calicoctl` ships inside this image alongside the other - $[prodname] command-line tools. +1. Use the following commands to pull the `calicoctl` image from the Tigera + registry. ```bash - docker pull $[registry]$[componentImage.calico] + docker pull $[registry]$[componentImage.calicoctl] ``` 1. Confirm that the image has loaded by typing `docker images`. ```bash REPOSITORY TAG IMAGE ID CREATED SIZE - $[releases.0.components.calico.image] $[releases.0.components.calico.version] e07d59b0eb8a 2 minutes ago 42MB + $[releases.0.components.calicoctl.image] $[releases.0.components.calicoctl.version] e07d59b0eb8a 2 minutes ago 42MB ``` **Next step**: diff --git a/calico-enterprise/releases.json b/calico-enterprise/releases.json index 64191d1c5b..9a65bcfea4 100644 --- a/calico-enterprise/releases.json +++ b/calico-enterprise/releases.json @@ -11,18 +11,42 @@ "archive_path": "archive" }, "components": { - "calico": { - "image": "tigera/calico", - "version": "master" - }, "cnx-manager": { "image": "tigera/cnx-manager", "version": "master" }, + "voltron": { + "image": "tigera/voltron", + "version": "master" + }, + "guardian": { + "image": "tigera/guardian", + "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" + }, "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" @@ -47,6 +71,10 @@ "image": "tigera/fluentd-windows", "version": "master" }, + "ui-apis": { + "image": "tigera/ui-apis", + "version": "master" + }, "eck-kibana": { "version": "8.16.1" }, @@ -73,10 +101,42 @@ "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" + }, "tigera-cni-windows": { "image": "tigera/cni-windows", "version": "master" @@ -89,6 +149,19 @@ "image": "tigera/egress-gateway", "version": "master" }, + "key-cert-provisioner": { + "image": "tigera/key-cert-provisioner", + "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" @@ -107,6 +180,14 @@ "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" @@ -132,6 +213,21 @@ "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" } } } diff --git a/calico-enterprise/variables.js b/calico-enterprise/variables.js index d8ec25b4b8..c510d4d830 100644 --- a/calico-enterprise/variables.js +++ b/calico-enterprise/variables.js @@ -33,7 +33,7 @@ const variables = { }, componentImage: { cnxNode: componentImage('cnx-node', releases[0]), - calico: componentImage('calico', releases[0]), + calicoctl:componentImage('calicoctl', releases[0]), calicoq: componentImage('calicoq', releases[0]), }, }; From fc3ca5e1fe201e6bc8bd84f66a88e492b474ccc8 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Wed, 20 May 2026 03:00:34 -0700 Subject: [PATCH 2/2] Update enterprise private registry docs for combined tigera/calico image (#2717) --- .../operations/clis/calicoctl/install.mdx | 9 +- calico-enterprise/releases.json | 104 +----------------- calico-enterprise/variables.js | 2 +- 3 files changed, 10 insertions(+), 105 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/releases.json b/calico-enterprise/releases.json index 9a65bcfea4..64191d1c5b 100644 --- a/calico-enterprise/releases.json +++ b/calico-enterprise/releases.json @@ -11,42 +11,18 @@ "archive_path": "archive" }, "components": { - "cnx-manager": { - "image": "tigera/cnx-manager", - "version": "master" - }, - "voltron": { - "image": "tigera/voltron", - "version": "master" - }, - "guardian": { - "image": "tigera/guardian", + "calico": { + "image": "tigera/calico", "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", + "cnx-manager": { + "image": "tigera/cnx-manager", "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" @@ -71,10 +47,6 @@ "image": "tigera/fluentd-windows", "version": "master" }, - "ui-apis": { - "image": "tigera/ui-apis", - "version": "master" - }, "eck-kibana": { "version": "8.16.1" }, @@ -101,42 +73,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" - }, "tigera-cni-windows": { "image": "tigera/cni-windows", "version": "master" @@ -149,19 +89,6 @@ "image": "tigera/egress-gateway", "version": "master" }, - "key-cert-provisioner": { - "image": "tigera/key-cert-provisioner", - "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 +107,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" @@ -213,21 +132,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" } } } 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]), }, };