This repository has been archived by the owner on Feb 5, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 264
Kubelet tls bootstrap #2809
Merged
alexsomesan
merged 1 commit into
coreos:master
from
abhinavdahiya:kubelet-tls-bootstrap
Feb 12, 2018
Merged
Kubelet tls bootstrap #2809
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| # admin | ||
| # Admin (generated/tls/{admin.key,admin.crt}) | ||
| # Used to create kubeconfig (generated/auth/kubeconfig) with admin level privileges. | ||
| resource "tls_private_key" "admin" { | ||
| algorithm = "RSA" | ||
| rsa_bits = "2048" | ||
| } | ||
|
|
||
| resource "tls_cert_request" "admin" { | ||
| key_algorithm = "${tls_private_key.admin.algorithm}" | ||
| private_key_pem = "${tls_private_key.admin.private_key_pem}" | ||
|
|
||
| subject { | ||
| common_name = "admin" | ||
| organization = "system:masters" | ||
| } | ||
| } | ||
|
|
||
| resource "tls_locally_signed_cert" "admin" { | ||
| cert_request_pem = "${tls_cert_request.admin.cert_request_pem}" | ||
|
|
||
| ca_key_algorithm = "${var.ca_cert_pem == "" ? join(" ", tls_self_signed_cert.kube_ca.*.key_algorithm) : var.ca_key_alg}" | ||
| ca_private_key_pem = "${var.ca_cert_pem == "" ? join(" ", tls_private_key.kube_ca.*.private_key_pem) : var.ca_key_pem}" | ||
| ca_cert_pem = "${var.ca_cert_pem == "" ? join(" ", tls_self_signed_cert.kube_ca.*.cert_pem) : var.ca_cert_pem}" | ||
| validity_period_hours = "${var.validity_period}" | ||
|
|
||
| allowed_uses = [ | ||
| "key_encipherment", | ||
| "digital_signature", | ||
| "server_auth", | ||
| "client_auth", | ||
| ] | ||
| } | ||
|
|
||
| resource "local_file" "admin_key" { | ||
| content = "${tls_private_key.admin.private_key_pem}" | ||
| filename = "./generated/tls/admin.key" | ||
| } | ||
|
|
||
| resource "local_file" "admin_crt" { | ||
| content = "${tls_locally_signed_cert.admin.cert_pem}" | ||
| filename = "./generated/tls/admin.crt" | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| apiVersion: v1 | ||
| kind: Config | ||
| clusters: | ||
| - name: ${cluster_name} | ||
| cluster: | ||
| server: ${server} | ||
| certificate-authority-data: ${kube_ca_cert} | ||
| users: | ||
| - name: kubelet | ||
| user: | ||
| token: ${kubelet_bootstrap_token_id}.${kubelet_bootstrap_token_secret} | ||
| contexts: | ||
| - context: | ||
| cluster: ${cluster_name} | ||
| user: kubelet |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,3 +7,4 @@ type: Opaque | |
| data: | ||
| service-account.key: ${serviceaccount_key} | ||
| ca.crt: ${kube_ca_cert} | ||
| ca.key: ${kube_ca_key} | ||
10 changes: 10 additions & 0 deletions
10
modules/bootkube/resources/manifests/kubelet-bootstrap-token.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| apiVersion: v1 | ||
| kind: Secret | ||
| metadata: | ||
| name: bootstrap-token-${kubelet_bootstrap_token_id} | ||
| namespace: kube-system | ||
| type: bootstrap.kubernetes.io/token | ||
| stringData: | ||
| token-id: ${kubelet_bootstrap_token_id} | ||
| token-secret: ${kubelet_bootstrap_token_secret} | ||
| usage-bootstrap-authentication: "true" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would consider renaming this one too (to
kubeconfig-admin) to make it really clear that you shouldn't use it for anything in the cluster. Others might have different feelings though.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bootkube start expects the admin kubeconfig to exist at this path.
https://github.com/kubernetes-incubator/bootkube/blob/master/pkg/bootkube/bootstrap.go#L38-L41
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Heh, look at the fool who left that TODO there :-/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
may be just add a comment on the kubeconfig file if that does not break any consumer?