Update OSS private registry docs for combined calico/calico image (#2673)

Author: caseydavenport

calico/getting-started/kubernetes/self-managed-onprem/config-options.mdx

@@ -302,7 +302,8 @@ Add a new container to the template.
 
 ```yaml
       - name: dikastes
-        image: $[registry]$[imageNames.calico/dikastes]:$[releases.0.components.calico/dikastes.version]
+        image: $[registry]$[imageNames.calico/calico]:$[releases.0.components.calico/calico.version]
+        command: ["/usr/bin/calico", "component", "dikastes"]
         args: ["server", "-l", "/var/run/dikastes/dikastes.sock", "-d", "/var/run/felix/nodeagent/socket"]
         securityContext:
           allowPrivilegeEscalation: false

calico/operations/calicoctl/install.mdx

@@ -306,11 +306,17 @@ the node related subcommands will not work (like node status).
 
 ### Install calicoctl as a container on a single host
 
-To install `calicoctl` as a container on a single host, log into the
-target host and issue the following command.
+`calicoctl` ships as part of the combined `calico/calico` image. To install it as a
+container on a single host, log into the target host and issue the following command.
 
 ```bash
-docker pull $[registry]$[imageNames.calicoctl]:$[releaseTitle]
+docker pull $[registry]$[imageNames.calico/calico]:$[releaseTitle]
+```
+
+Run `calicoctl` by invoking the binary inside the container, for example:
+
+```bash
+docker run --rm $[registry]$[imageNames.calico/calico]:$[releaseTitle] calicoctl get nodes
 ```
 
 **Next step**:

calico/reference/kube-controllers/configuration.mdx

@@ -22,9 +22,9 @@ The controllers are primarily configured through environment variables. When run
 the controllers as a Kubernetes pod, this is accomplished through the pod manifest `env`
 section.
 
-## The $[imageNames.calico/kube-controllers] container
+## The calico-kube-controllers container
 
-The `$[imageNames.calico/kube-controllers]` container includes the following controllers:
+The `calico-kube-controllers` container includes the following controllers:
 
 1. policy controller: watches Kubernetes network policies in the Kubernetes API, and syncs the policies to the datastore (etcd) as $[prodname] network policies. Felix implements network policies in the data plane.
 1. namespace controller: watches namespaces and programs $[prodname] profiles.

calico/releases.json

@@ -7,38 +7,26 @@
       "version": "master"
     },
     "components": {
-      "calico/typha": {
-        "version": "master",
-        "registry": "quay.io"
-      },
-      "calico/ctl": {
+      "calico/calico": {
         "version": "master",
         "registry": "quay.io"
       },
       "calico/node": {
         "version": "master",
         "registry": "quay.io"
       },
-      "calico/node-windows": {
+      "calico/whisker": {
         "version": "master",
         "registry": "quay.io"
       },
-      "calico/cni": {
+      "calico/node-windows": {
         "version": "master",
         "registry": "quay.io"
       },
       "calico/cni-windows": {
         "version": "master",
         "registry": "quay.io"
       },
-      "calico/apiserver": {
-        "version": "master",
-        "registry": "quay.io"
-      },
-      "calico/kube-controllers": {
-        "version": "master",
-        "registry": "quay.io"
-      },
       "calico/envoy-gateway": {
         "version": "master",
         "registry": "quay.io"
@@ -51,50 +39,10 @@
         "version": "master",
         "registry": "quay.io"
       },
-      "calico/flannel-migration-controller": {
-        "version": "master",
-        "registry": "quay.io"
-      },
       "flannel": {
         "version": "v0.24.4",
         "registry": "docker.io"
-      },
-      "calico/dikastes": {
-        "version": "master",
-        "registry": "quay.io"
-      },
-      "flexvol": {
-        "version": "master",
-        "registry": "quay.io"
-      },
-      "calico/csi": {
-        "version": "master",
-        "registry": "quay.io"
-      },
-      "calico/node-driver-registrar": {
-        "version": "master",
-        "registry": "quay.io"
-      },
-      "calico/pod2daemon-flexvol": {
-        "version": "master",
-        "registry": "quay.io"
-      },
-      "calico/key-cert-provisioner": {
-        "version": "master",
-        "registry": "quay.io"
-      },
-      "calico/goldmane": {
-        "version": "master",
-        "registry": "quay.io"
-      },
-      "calico/whisker": {
-        "version": "master",
-        "registry": "quay.io"
-      },
-      "calico/whisker-backend": {
-        "version": "master",
-        "registry": "quay.io"
       }
     }
   }
-]
+]

calico/variables.js

@@ -25,22 +25,15 @@ const variables = {
   tigeraOperator: releases[0]['tigera-operator'],
   tigeraOperatorVersionShort: releases[0]['tigera-operator'].version.split('.').slice(0, 2).join('.'),
   imageNames: {
+    'calico/calico': 'calico/calico',
     'calico/node': 'calico/node',
-    calicoctl: 'calico/ctl',
-    typha: 'calico/typha',
-    'calico/cni': 'calico/cni',
-    'calico/apiserver': 'calico/apiserver',
-    'calico/kube-controllers': 'calico/kube-controllers',
-    'calico-upgrade': 'calico-upgrade',
+    'calico/whisker': 'calico/whisker',
     'calico/node-windows': 'calico/node-windows',
     'calico/cni-windows': 'calico/cni-windows',
+    'calico/envoy-gateway': 'calico/envoy-gateway',
+    'calico/envoy-proxy': 'calico/envoy-proxy',
+    'calico/envoy-ratelimit': 'calico/envoy-ratelimit',
     flannel: 'docker.io/flannelcni/flannel',
-    flannelMigration: 'calico/flannel-migration-controller',
-    'calico/dikastes': 'calico/dikastes',
-    'pilot-webhook': 'calico/pilot-webhook',
-    flexvol: 'calico/pod2daemon-flexvol',
-    'csi-driver': 'calico/csi',
-    'csi-node-driver-registrar': 'calico/node-driver-registrar',
   },
 };