Merge branch 'master' into 1.1682.0

scaleway · Apr 7, 2021 · ebc6f94 · ebc6f94
2 parents d005e50 + 4910805
commit ebc6f94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden
@@ -19,7 +19,6 @@ ARGS:
   [tags.{index}]                                         The tags associated with the cluster
   version=latest                                         The Kubernetes version of the cluster
   cni=cilium                                             The Container Network Interface (CNI) plugin that will run in the cluster (unknown_cni | cilium | calico | weave | flannel)
-  [enable-dashboard]                                     The enablement of the Kubernetes Dashboard in the cluster
   [ingress]                                              The Ingress Controller that will run in the cluster (unknown_ingress | none | nginx | traefik | traefik2)
   pools.{index}.name                                     The name of the pool
   pools.{index}.node-type                                The node type is the type of Scaleway Instance wanted for the pool
@@ -61,6 +60,9 @@ ARGS:
   [organization-id]                                      Organization ID to use. If none is passed the default organization ID will be used
   [region=fr-par]                                        Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 
+DEPRECATED ARGS:
+  [enable-dashboard]   The enablement of the Kubernetes Dashboard in the cluster
+
 FLAGS:
   -h, --help   help for create
   -w, --wait   wait until the cluster is ready

diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden
@@ -27,7 +27,6 @@ ARGS:
   [autoscaler-config.scale-down-unneeded-time]           How long a node should be unneeded before it is eligible for scale down
   [autoscaler-config.scale-down-utilization-threshold]   Node utilization level, defined as sum of requested resources divided by capacity, below which a node can be considered for scale down
   [autoscaler-config.max-graceful-termination-sec]       Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node
-  [enable-dashboard]                                     The new value of the Kubernetes Dashboard enablement
   [ingress]                                              The new Ingress Controller for the cluster (unknown_ingress | none | nginx | traefik | traefik2)
   [auto-upgrade.enable]                                  Whether or not auto upgrade is enabled for the cluster
   [auto-upgrade.maintenance-window.start-hour]           The start hour of the 2-hour maintenance window
@@ -44,6 +43,9 @@ ARGS:
   [apiserver-cert-sans.{index}]                          Additional Subject Alternative Names for the Kubernetes API server certificate
   [region=fr-par]                                        Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 
+DEPRECATED ARGS:
+  [enable-dashboard]   The new value of the Kubernetes Dashboard enablement
+
 FLAGS:
   -h, --help   help for update
   -w, --wait   wait until the cluster is ready