Merge branch 'rig-work'

ctrl/cluster.sh

@@ -8,13 +8,13 @@
 #
 # spr depends on rig, never the other way round. Building and deleting a cluster
 # is rig's job, so up and down hand straight to rig/ctrl/cluster.sh, carrying the
-# four things that make this cluster spr's rather than rig's defaults:
+# the things that make this cluster spr's rather than rig's defaults:
 #
 #   CLUSTER=spr          rooms deploy into the kind-spr context
-#   KIND_CONFIG          spr's own shape, which maps the rooms' gateway NodePorts
+#   KIND_CONFIG          spr's own kind config, which maps the rooms' gateway NodePorts
 #   REGISTRY_MODE=none   rooms load images straight into the node
-#   PROFILE=minimal      pinned here, so a change to rig's own ctrl/.env can never
-#                        quietly add addons to spr's cluster
+#   PROFILE= ADDONS=     set empty here, so rig's own ctrl/.env can never quietly
+#                        pick a profile or add addons to spr's cluster
 #
 # status stays here: it answers a question about rooms, not about the cluster.
 set -e
@@ -26,7 +26,8 @@ rig() {
     CLUSTER=spr \
     KIND_CONFIG="$SCRIPT_DIR/k8s/kind-config.yaml" \
     REGISTRY_MODE=none \
-    PROFILE=minimal \
+    PROFILE= \
+    ADDONS= \
         bash "$RIG_CTRL/cluster.sh" "$@"
 }