From 2d014c1c93c120f2bc84f6255a5510210c31b905 Mon Sep 17 00:00:00 2001 From: Ruslan Aliev Date: Wed, 9 Sep 2020 20:05:42 -0500 Subject: [PATCH] Remove left over artifacts from set/get-cluster/credentials cmds Change-Id: Ic44083049ae82e1ff65669af76af08553b500fda Signed-off-by: Ruslan Aliev --- .../cli/airshipctl_config_get-cluster.md | 48 ------------- .../cli/airshipctl_config_get-credential.md | 44 ------------ .../cli/airshipctl_config_set-cluster.md | 67 ------------------- .../cli/airshipctl_config_set-credentials.md | 64 ------------------ tools/deployment/22_test_configs.sh | 6 -- 5 files changed, 229 deletions(-) delete mode 100644 docs/source/cli/airshipctl_config_get-cluster.md delete mode 100644 docs/source/cli/airshipctl_config_get-credential.md delete mode 100644 docs/source/cli/airshipctl_config_set-cluster.md delete mode 100644 docs/source/cli/airshipctl_config_set-credentials.md diff --git a/docs/source/cli/airshipctl_config_get-cluster.md b/docs/source/cli/airshipctl_config_get-cluster.md deleted file mode 100644 index 858c53478..000000000 --- a/docs/source/cli/airshipctl_config_get-cluster.md +++ /dev/null @@ -1,48 +0,0 @@ -## airshipctl config get-cluster - -Get cluster information from the airshipctl config - -### Synopsis - -Display a specific cluster or all defined clusters if no name is provided. - -Note that if a specific cluster's name is provided, the --cluster-type flag -must also be provided. -Valid values for the --cluster-type flag are [ephemeral|target]. - - -``` -airshipctl config get-cluster [NAME] [flags] -``` - -### Examples - -``` - -# List all clusters -airshipctl config get-clusters - -# Display a specific cluster -airshipctl config get-cluster --cluster-type=ephemeral exampleCluster - -``` - -### Options - -``` - --cluster-type string type of the desired cluster - -h, --help help for get-cluster -``` - -### Options inherited from parent commands - -``` - --airshipconf string Path to file for airshipctl configuration. (default "$HOME/.airship/config") - --debug enable verbose output - --kubeconfig string Path to kubeconfig associated with airshipctl configuration. (default "$HOME/.airship/kubeconfig") -``` - -### SEE ALSO - -* [airshipctl config](airshipctl_config.md) - Manage the airshipctl config file - diff --git a/docs/source/cli/airshipctl_config_get-credential.md b/docs/source/cli/airshipctl_config_get-credential.md deleted file mode 100644 index 5a4908d62..000000000 --- a/docs/source/cli/airshipctl_config_get-credential.md +++ /dev/null @@ -1,44 +0,0 @@ -## airshipctl config get-credential - -Get user credentials from the airshipctl config - -### Synopsis - -Display a specific user's credentials, or all defined user -credentials if no name is provided. - - -``` -airshipctl config get-credential [NAME] [flags] -``` - -### Examples - -``` - -# List all user credentials -airshipctl config get-credentials - -# Display a specific user's credentials -airshipctl config get-credential exampleUser - -``` - -### Options - -``` - -h, --help help for get-credential -``` - -### Options inherited from parent commands - -``` - --airshipconf string Path to file for airshipctl configuration. (default "$HOME/.airship/config") - --debug enable verbose output - --kubeconfig string Path to kubeconfig associated with airshipctl configuration. (default "$HOME/.airship/kubeconfig") -``` - -### SEE ALSO - -* [airshipctl config](airshipctl_config.md) - Manage the airshipctl config file - diff --git a/docs/source/cli/airshipctl_config_set-cluster.md b/docs/source/cli/airshipctl_config_set-cluster.md deleted file mode 100644 index 8857d2f85..000000000 --- a/docs/source/cli/airshipctl_config_set-cluster.md +++ /dev/null @@ -1,67 +0,0 @@ -## airshipctl config set-cluster - -Manage clusters - -### Synopsis - -Create or modify a cluster in the airshipctl config files. - -Since a cluster can be either "ephemeral" or "target", you must specify -cluster-type when managing clusters. - - -``` -airshipctl config set-cluster NAME [flags] -``` - -### Examples - -``` - -# Set the server field on the ephemeral exampleCluster -airshipctl config set-cluster exampleCluster \ - --cluster-type=ephemeral \ - --server=https://1.2.3.4 - -# Embed certificate authority data for the target exampleCluster -airshipctl config set-cluster exampleCluster \ - --cluster-type=target \ - --client-certificate-authority=$HOME/.airship/ca/kubernetes.ca.crt \ - --embed-certs - -# Disable certificate checking for the target exampleCluster -airshipctl config set-cluster exampleCluster - --cluster-type=target \ - --insecure-skip-tls-verify - -# Configure client certificate for the target exampleCluster -airshipctl config set-cluster exampleCluster \ - --cluster-type=target \ - --embed-certs \ - --client-certificate=$HOME/.airship/cert_file - -``` - -### Options - -``` - --certificate-authority string path to a certificate authority - --cluster-type string the type of the cluster to add or modify - --embed-certs if set, embed the client certificate/key into the cluster - -h, --help help for set-cluster - --insecure-skip-tls-verify if set, disable certificate checking (default true) - --server string server to use for the cluster -``` - -### Options inherited from parent commands - -``` - --airshipconf string Path to file for airshipctl configuration. (default "$HOME/.airship/config") - --debug enable verbose output - --kubeconfig string Path to kubeconfig associated with airshipctl configuration. (default "$HOME/.airship/kubeconfig") -``` - -### SEE ALSO - -* [airshipctl config](airshipctl_config.md) - Manage the airshipctl config file - diff --git a/docs/source/cli/airshipctl_config_set-credentials.md b/docs/source/cli/airshipctl_config_set-credentials.md deleted file mode 100644 index 1c4a6aaab..000000000 --- a/docs/source/cli/airshipctl_config_set-credentials.md +++ /dev/null @@ -1,64 +0,0 @@ -## airshipctl config set-credentials - -Manage user credentials - -### Synopsis - -Create or modify a user credential in the airshipctl config file. - -Note that specifying more than one authentication method is an error. - - -``` -airshipctl config set-credentials NAME [flags] -``` - -### Examples - -``` - -# Create a new user credential with basic auth -airshipctl config set-credentials exampleUser \ - --username=exampleUser \ - --password=examplePassword - -# Change the client-key of a user named admin -airshipctl config set-credentials admin \ - --client-key=$HOME/.kube/admin.key - -# Change the username and password of the admin user -airshipctl config set-credentials admin \ - --username=admin \ - --password=uXFGweU9l35qcif - -# Embed client certificate data of the admin user -airshipctl config set-credentials admin \ - --client-certificate=$HOME/.kube/admin.crt \ - --embed-certs - -``` - -### Options - -``` - --client-certificate string path to a certificate - --client-key string path to a key file - --embed-certs if set, embed the client certificate/key into the credential - -h, --help help for set-credentials - --password string password for the credential; mutually exclusive with token flag. - --token string token to use for the credential; mutually exclusive with username and password flags. - --username string username for the credential; mutually exclusive with token flag. -``` - -### Options inherited from parent commands - -``` - --airshipconf string Path to file for airshipctl configuration. (default "$HOME/.airship/config") - --debug enable verbose output - --kubeconfig string Path to kubeconfig associated with airshipctl configuration. (default "$HOME/.airship/kubeconfig") -``` - -### SEE ALSO - -* [airshipctl config](airshipctl_config.md) - Manage the airshipctl config file - diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh index 33bddd494..263ffbd2f 100755 --- a/tools/deployment/22_test_configs.sh +++ b/tools/deployment/22_test_configs.sh @@ -50,9 +50,3 @@ echo "Generate ~/.airship/config and ~/.airship/kubeconfig" envsubst <"${AIRSHIPCTL_WS}/tools/deployment/templates/airshipconfig_template" > ~/.airship/config envsubst <"${AIRSHIPCTL_WS}/tools/deployment/templates/kubeconfig_template" > ~/.airship/kubeconfig -if ! airshipctl config get-cluster | grep -q 'dummycluster_ephemeral' ; then - echo "Unable to verify the ephemeral cluster details. Please verify the ephemeral cluster configuration." -else - echo "Verify airshipctl configuration" - airshipctl config get-cluster -fi