Skip to content

Commit

Permalink
Merge pull request #5843 from rifelpet/aws_iam_docs
Browse files Browse the repository at this point in the history
Add clarity to AWS IAM Authenticator documentation
  • Loading branch information
k8s-ci-robot authored Sep 28, 2018
2 parents 6b8bc20 + 3171b6a commit d95f0e2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions docs/authentication.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Authentication

Kops has support for configuring authentication systems. This support is
currently highly experimental, and should not be used with kubernetes versions
before 1.8.5 because of a serious bug with apimachinery (#55022)[https://github.com/kubernetes/kubernetes/issues/55022].
Kops has support for configuring authentication systems. This should not be used with kubernetes versions
before 1.8.5 because of a serious bug with apimachinery [#55022](https://github.com/kubernetes/kubernetes/issues/55022).

## kopeio authentication

Expand Down Expand Up @@ -35,7 +34,7 @@ spec:
## AWS IAM Authenticator

If you want to turn on AWS IAM Authenticator, you can add this block
to your cluster:
to your cluster running Kubernetes 1.10 or newer:

```
authentication:
Expand All @@ -56,9 +55,10 @@ spec:
rbac: {}
```

Once the cluster is up you will need to create the AWS IAM authenticator
Once the cluster is up, or after you've performed a rolling update to an existing cluster with `kops rolling-update cluster ${CLUSTER_NAME} --instance-group-roles=Master --force --yes`, you will need to create the AWS IAM authenticator
config as a config map. (This can also be done when boostrapping a cluster using addons)
For more details on AWS IAM authenticator please visit (kubernetes-sigs/aws-iam-authenticator)[https://github.com/kubernetes-sigs/aws-iam-authenticator]
For more details on AWS IAM authenticator please visit [kubernetes-sigs/aws-iam-authenticator](https://github.com/kubernetes-sigs/aws-iam-authenticator)

Example config:

```
Expand Down

0 comments on commit d95f0e2

Please sign in to comment.