Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kops]: add aws-iam-authenticator support #282

Merged
merged 4 commits into from
Sep 24, 2018
Merged

[kops]: add aws-iam-authenticator support #282

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29cc45c
feat(kops): add aws-iam-authenticator support
alebabai Sep 18, 2018
8a3e259
refactor(kops): fix yaml
alebabai Sep 19, 2018
70012c7
refactor(kops): fix template
alebabai Sep 19, 2018
9201df1
Merge branch 'master' into feature/aws-iam-authenticator
osterman Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion rootfs/templates/kops/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,26 @@ spec:
api:
loadBalancer:
type: Public
{{- if bool (getenv "KOPS_AUTHORIZATION_RBAC_ENABLED" "false") }}
hooks:
{{- if bool (getenv "KOPS_AWS_IAM_AUTHENTICATOR_ENABLED" "false") }}
- name: kops-hook-authenticator-config.service
before:
- kubelet.service
roles: [Master]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use list notation for consistency

roles:
  - "Master"

manifest: |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be?

manifest: |-

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i picked it from official documentation.
|- just removes \n from the end

[Unit]
Description=Download AWS Authenticator configs from S3
[Service]
Type=oneshot
ExecStart=/bin/mkdir -p /srv/kubernetes/aws-iam-authenticator
ExecStart=/usr/local/bin/aws s3 cp --recursive {{ getenv "KOPS_STATE_STORE" }}/{{ getenv "CLUSTER_NAME" }}/addons/authenticator /srv/kubernetes/aws-iam-authenticator/
kubeAPIServer:
{{- if bool (getenv "KOPS_AUTHORIZATION_RBAC_ENABLED" "false") }}
authorizationMode: {{ getenv "KOPS_KUBE_API_SERVER_AUTHORIZATION_MODE" "RBAC,AlwaysAllow" }}
authorizationRbacSuperUser: {{ getenv "KOPS_KUBE_API_SERVER_AUTHORIZATION_RBAC_SUPER_USER" "admin" }}
{{- if bool (getenv "KOPS_AWS_IAM_AUTHENTICATOR_ENABLED" "false") }}
authenticationTokenWebhookConfigFile: /srv/kubernetes/aws-iam-authenticator/kubeconfig.yaml
{{- end }}
{{- end }}
authorization:
{{- if bool (getenv "KOPS_AUTHORIZATION_RBAC_ENABLED" "false") }}
Expand Down