summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRudi Chiarito <rudi@clarifai.com>2016-01-08 19:02:05 -0500
committerRudi Chiarito <rudi@clarifai.com>2016-01-22 15:03:25 -0500
commitbed31a43a9e5c33e430ca48221cbb01a344344e6 (patch)
tree71a57bd9fffeaff2e6b4a52bb7d0f80a86ab0c13
parent19371b130701cd44089049c4965e7796c0eae92c (diff)
ECR credential provider
-rw-r--r--aws_under_the_hood.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/aws_under_the_hood.md b/aws_under_the_hood.md
index a551c07c..019b07d6 100644
--- a/aws_under_the_hood.md
+++ b/aws_under_the_hood.md
@@ -171,7 +171,11 @@ The nodes do not need a lot of access to the AWS APIs. They need to download
a distribution file, and then are responsible for attaching and detaching EBS
volumes from itself.
-The node policy is relatively minimal. The master policy is probably overly
+The node policy is relatively minimal. In 1.2 and later, nodes can retrieve ECR
+authorization tokens, refresh them every 12 hours if needed, and fetch Docker
+images from it, as long as the appropriate permissions are enabled. Those in
+[AmazonEC2ContainerRegistryReadOnly](http://docs.aws.amazon.com/AmazonECR/latest/userguide/ecr_managed_policies.html#AmazonEC2ContainerRegistryReadOnly),
+without write access, should suffice. The master policy is probably overly
permissive. The security conscious may want to lock-down the IAM policies
further ([#11936](http://issues.k8s.io/11936)).
@@ -180,7 +184,7 @@ are correctly configured ([#14226](http://issues.k8s.io/14226)).
### Tagging
-All AWS resources are tagged with a tag named "KuberentesCluster", with a value
+All AWS resources are tagged with a tag named "KubernetesCluster", with a value
that is the unique cluster-id. This tag is used to identify a particular
'instance' of Kubernetes, even if two clusters are deployed into the same VPC.
Resources are considered to belong to the same cluster if and only if they have