From ec021a6ed84df9b645ef2b38d3c14ff4f0c70ee4 Mon Sep 17 00:00:00 2001 From: Robin Ramquist <80628178+robinelastisys@users.noreply.github.com> Date: Mon, 14 Jun 2021 09:05:09 +0200 Subject: [PATCH] Update ck8s --- bin/ck8s | 3 --- 1 file changed, 3 deletions(-) diff --git a/bin/ck8s b/bin/ck8s index f30dd79b22..02ed0f2fbe 100755 --- a/bin/ck8s +++ b/bin/ck8s @@ -25,7 +25,6 @@ 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 run helmfile as cluster admin" 1>&2 echo " s3cmd [cmd] run s3cmd" 1>&2 echo " kubeconfig [cluster_name]> generate user/admin kubeconfig, stored at CK8S_CONFIG_PATH/user or CK8S_CONFIG_PATH/.state" @@ -33,13 +32,11 @@ usage() { echo " validate validates config files" 1>&2 echo " providers lists supported cloud providers" 1>&2 echo " flavors lists supported configuration flavors" 1>&2 -======= echo " ops helmfile run helmfile as cluster admin" 1>&2 echo " s3cmd [cmd] run s3cmd" 1>&2 echo " kubeconfig [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 validates config files" 1>&2 ->>>>>>> a182ce7... apps sc & wc: improve dry-run and deploy scripts exit 1 }