From 2ce398b62a0d7283069d0402b79be7d8d67b4f2b Mon Sep 17 00:00:00 2001 From: Ryan Ooi Date: Wed, 7 Oct 2020 06:44:24 +0800 Subject: [PATCH 1/2] Update acl-method command example --- command/acl/authmethod/authmethod.go | 4 ++-- command/acl/authmethod/create/authmethod_create.go | 2 +- command/acl/authmethod/update/authmethod_update.go | 3 +-- website/pages/commands/acl/auth-method/index.mdx | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/command/acl/authmethod/authmethod.go b/command/acl/authmethod/authmethod.go index 321116394..0b3213be1 100644 --- a/command/acl/authmethod/authmethod.go +++ b/command/acl/authmethod/authmethod.go @@ -37,7 +37,7 @@ Usage: consul acl auth-method [options] [args] -name "my-k8s" \ -description "This is an example kube auth method" \ -kubernetes-host "https://apiserver.example.com:8443" \ - -kubernetes-ca-file /path/to/kube.ca.crt \ + -kubernetes-ca-cert @/path/to/kube.ca.crt \ -kubernetes-service-account-jwt "JWT_CONTENTS" List all auth methods: @@ -49,7 +49,7 @@ Usage: consul acl auth-method [options] [args] $ consul acl auth-method update -name "my-k8s" \ -description "new description" \ -kubernetes-host "https://new-apiserver.example.com:8443" \ - -kubernetes-ca-file /path/to/new-kube.ca.crt \ + -kubernetes-ca-cert @/path/to/new-kube.ca.crt \ -kubernetes-service-account-jwt "NEW_JWT_CONTENTS" Read an auth method: diff --git a/command/acl/authmethod/create/authmethod_create.go b/command/acl/authmethod/create/authmethod_create.go index b648b6498..4d4882c06 100644 --- a/command/acl/authmethod/create/authmethod_create.go +++ b/command/acl/authmethod/create/authmethod_create.go @@ -269,6 +269,6 @@ Usage: consul acl auth-method create -name NAME -type TYPE [options] -name "my-k8s" \ -description "This is an example kube method" \ -kubernetes-host "https://apiserver.example.com:8443" \ - -kubernetes-ca-file /path/to/kube.ca.crt \ + -kubernetes-ca-cert @/path/to/kube.ca.crt \ -kubernetes-service-account-jwt "JWT_CONTENTS" ` diff --git a/command/acl/authmethod/update/authmethod_update.go b/command/acl/authmethod/update/authmethod_update.go index 5b6f98dbf..9eb1a45d6 100644 --- a/command/acl/authmethod/update/authmethod_update.go +++ b/command/acl/authmethod/update/authmethod_update.go @@ -333,6 +333,5 @@ Usage: consul acl auth-method update -name NAME [options] $ consul acl auth-method update -name "my-k8s" \ -description "new description" \ -kubernetes-host "https://new-apiserver.example.com:8443" \ - -kubernetes-ca-file /path/to/new-kube.ca.crt \ + -kubernetes-ca-cert @/path/to/new-kube.ca.crt \ -kubernetes-service-account-jwt "NEW_JWT_CONTENTS" -` diff --git a/website/pages/commands/acl/auth-method/index.mdx b/website/pages/commands/acl/auth-method/index.mdx index bd1b8aa32..d2ca56859 100644 --- a/website/pages/commands/acl/auth-method/index.mdx +++ b/website/pages/commands/acl/auth-method/index.mdx @@ -50,7 +50,7 @@ $ consul acl auth-method create -type "kubernetes" \ -name "my-k8s" \ -description "This is an example kube auth method" \ -kubernetes-host "https://apiserver.example.com:8443" \ - -kubernetes-ca-file /path/to/kube.ca.crt \ + -kubernetes-ca-cert @/path/to/kube.ca.crt \ -kubernetes-service-account-jwt "JWT_CONTENTS" ``` @@ -66,7 +66,7 @@ Update all editable fields of the auth method: $ consul acl auth-method update -name "my-k8s" \ -description "new description" \ -kubernetes-host "https://new-apiserver.example.com:8443" \ - -kubernetes-ca-file /path/to/new-kube.ca.crt \ + -kubernetes-ca-cert @/path/to/new-kube.ca.crt \ -kubernetes-service-account-jwt "NEW_JWT_CONTENTS" ``` From ae6cc78f912066e2116d8ffa93de290ec5f0bb23 Mon Sep 17 00:00:00 2001 From: Ryan Ooi Date: Wed, 7 Oct 2020 07:14:56 +0800 Subject: [PATCH 2/2] add tailing backtick --- command/acl/authmethod/update/authmethod_update.go | 1 + 1 file changed, 1 insertion(+) diff --git a/command/acl/authmethod/update/authmethod_update.go b/command/acl/authmethod/update/authmethod_update.go index 9eb1a45d6..3125ad7b7 100644 --- a/command/acl/authmethod/update/authmethod_update.go +++ b/command/acl/authmethod/update/authmethod_update.go @@ -335,3 +335,4 @@ Usage: consul acl auth-method update -name NAME [options] -kubernetes-host "https://new-apiserver.example.com:8443" \ -kubernetes-ca-cert @/path/to/new-kube.ca.crt \ -kubernetes-service-account-jwt "NEW_JWT_CONTENTS" +`