diff --git a/docs/authentication.md b/docs/authentication.md index fabac9af08c3d..2694bfdd662ab 100644 --- a/docs/authentication.md +++ b/docs/authentication.md @@ -55,7 +55,7 @@ spec: rbac: {} ``` -By default the creation of a AWS IAM authenticator config as a ConfigMap is also required. +By default the creation of an AWS IAM authenticator config as a ConfigMap is also required. For more details on AWS IAM authenticator please visit [kubernetes-sigs/aws-iam-authenticator](https://github.com/kubernetes-sigs/aws-iam-authenticator) Example config: @@ -113,7 +113,7 @@ data: - system:masters ``` -It is also possible to configure alternative backend modes for aws-iam-authenticator. The `backendMode` configuration option allows defining multiple backends in a comma separated string. The mappings in these backends will be merged. When the same mapping is found in multiple backends, the first backend in the list will take precedence. If MountedFile is not included in the list of backends, no configmap is required and the [cluster-id](https://github.com/kubernetes-sigs/aws-iam-authenticator#what-is-a-cluster-id) will default to the cluster's master API DNS name. The cluster ID can be overridden by setting the `clusterID`. If you wish to continue using a configmap for authenticator settings other than mappings MountedFile will need to be included in the backendMode list. +It is also possible to configure alternative backend modes for aws-iam-authenticator. The `backendMode` configuration option allows defining multiple backends in a comma separated string. The mappings in these backends will be merged. When the same mapping is found in multiple backends, the first backend in the list will take precedence. If MountedFile is not included in the list of backends, no configmap is required and the [cluster-id](https://github.com/kubernetes-sigs/aws-iam-authenticator#what-is-a-cluster-id) will default to the cluster's master API DNS name. The cluster-id can be overridden by setting the `clusterID` API field. If you wish to continue using a configmap for authenticator settings other than mappings, MountedFile must be included in the backendMode list. This requires an aws-iam-authenticator image >= 0.5.0 For more information see [usergroup-mappings](https://github.com/kubernetes-sigs/aws-iam-authenticator#4-create-iam-roleuser-to-kubernetes-usergroup-mappings) diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml index 74e2828ca933d..2d54338e0dccb 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml @@ -7,11 +7,11 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0-alpha.0' manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: cafdcd2b3f237ae82d0b1ccc42331480be24271d + manifestHash: d11d9fdd074fbd0cc63036e792eb77eae7e002e2 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.1 + version: 1.19.0-alpha.2 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -21,19 +21,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: dc3d42acafa02913589a75b6800ed22aa4ff97b1 + manifestHash: 622cc4a17d2d0258d6e364294dcef983730e9f7e name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.2 + version: 1.15.13-kops.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 90d49903e9285fc9191d7daea2f9c6a2d955443f + manifestHash: 66f284c5d8a4b3fdbc385b84b21d013a55eec4cd name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.2 + version: 1.15.13-kops.3 - id: k8s-1.8 manifest: rbac.addons.k8s.io/k8s-1.8.yaml manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914 @@ -57,19 +57,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 224077cac498b4c3a06c43e8a7689d3927e28246 + manifestHash: c015437008df2507f01bf1150b2a4a9cae9bead8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.1 + version: 1.19.0-alpha.2 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: c497df601c2e5a7c19f216b8b64b30282dabba9f + manifestHash: 1f1e2a3bc38a45eca4ec11e8510e42f1cc33119e name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.1 + version: 1.19.0-alpha.2 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml