Update ck8s

elastisys · Jun 14, 2021 · ec021a6 · ec021a6
1 parent 233757e
commit ec021a6
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/bin/ck8s b/bin/ck8s
@@ -25,21 +25,18 @@ usage() {
     # TODO: We might want to make this command less visible once we feel
     #       confident that the apply command and migrations are good enough
     #       that direct Helmfile access is not necessary.
-<<<<<<< HEAD
     echo "  ops helmfile <wc|sc>                            run helmfile as cluster admin" 1>&2
     echo "  s3cmd [cmd]                                     run s3cmd" 1>&2
     echo "  kubeconfig <user|admin <wc|sc> [cluster_name]>  generate user/admin kubeconfig, stored at CK8S_CONFIG_PATH/user or CK8S_CONFIG_PATH/.state"
     echo "  completion bash                                 output shell completion code for bash" 1>&2
     echo "  validate <wc|sc>                                validates config files" 1>&2
     echo "  providers                                       lists supported cloud providers" 1>&2
     echo "  flavors                                         lists supported configuration flavors" 1>&2
-=======
     echo "  ops helmfile <wc|sc>                              run helmfile as cluster admin" 1>&2
     echo "  s3cmd [cmd]                                       run s3cmd" 1>&2
     echo "  kubeconfig <user|admin <wc|sc> [cluster_name]>    generate user/admin kubeconfig, stored at CK8S_CONFIG_PATH/user or CK8S_CONFIG_PATH/.state"
     echo "  completion bash                                   output shell completion code for bash" 1>&2
     echo "  validate <wc|sc>                                  validates config files" 1>&2
->>>>>>> a182ce7... apps sc & wc: improve dry-run and deploy scripts
     exit 1
 }