Skip to content
This repository has been archived by the owner on Sep 30, 2020. It is now read-only.

Shared Persistent Volume #471

Merged
merged 3 commits into from
Apr 13, 2017
+139 −16
Merged

Shared Persistent Volume #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dd141f
Shared Persistent Volume
Mar 27, 2017
8da4731
Taint service does not remain active
Apr 5, 2017
21f2b35
Fix merge conflict and go fmt
Apr 13, 2017
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
31 changes: 16 additions & 15 deletions core/controlplane/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,21 +458,22 @@ type DeploymentSettings struct {
InternetGatewayID string `yaml:"internetGatewayId,omitempty"`
RouteTableID string `yaml:"routeTableId,omitempty"`
// Required for validations like e.g. if instance cidr is contained in vpc cidr
VPCCIDR string `yaml:"vpcCIDR,omitempty"`
InstanceCIDR string `yaml:"instanceCIDR,omitempty"`
K8sVer string `yaml:"kubernetesVersion,omitempty"`
ContainerRuntime string `yaml:"containerRuntime,omitempty"`
KMSKeyARN string `yaml:"kmsKeyArn,omitempty"`
StackTags map[string]string `yaml:"stackTags,omitempty"`
Subnets []model.Subnet `yaml:"subnets,omitempty"`
EIPAllocationIDs []string `yaml:"eipAllocationIDs,omitempty"`
MapPublicIPs bool `yaml:"mapPublicIPs,omitempty"`
ElasticFileSystemID string `yaml:"elasticFileSystemId,omitempty"`
SSHAuthorizedKeys []string `yaml:"sshAuthorizedKeys,omitempty"`
Addons model.Addons `yaml:"addons"`
Experimental Experimental `yaml:"experimental"`
ManageCertificates bool `yaml:"manageCertificates,omitempty"`
WaitSignal WaitSignal `yaml:"waitSignal"`
VPCCIDR string `yaml:"vpcCIDR,omitempty"`
InstanceCIDR string `yaml:"instanceCIDR,omitempty"`
K8sVer string `yaml:"kubernetesVersion,omitempty"`
ContainerRuntime string `yaml:"containerRuntime,omitempty"`
KMSKeyARN string `yaml:"kmsKeyArn,omitempty"`
StackTags map[string]string `yaml:"stackTags,omitempty"`
Subnets []model.Subnet `yaml:"subnets,omitempty"`
EIPAllocationIDs []string `yaml:"eipAllocationIDs,omitempty"`
MapPublicIPs bool `yaml:"mapPublicIPs,omitempty"`
ElasticFileSystemID string `yaml:"elasticFileSystemId,omitempty"`
SharedPersistentVolume bool `yaml:"sharedPersistentVolume,omitempty"`
SSHAuthorizedKeys []string `yaml:"sshAuthorizedKeys,omitempty"`
Addons model.Addons `yaml:"addons"`
Experimental Experimental `yaml:"experimental"`
ManageCertificates bool `yaml:"manageCertificates,omitempty"`
WaitSignal WaitSignal `yaml:"waitSignal"`

// Images repository
HyperkubeImage model.Image `yaml:"hyperkubeImage,omitempty"`
Expand Down
64 changes: 64 additions & 0 deletions core/controlplane/config/templates/cloud-config-controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,22 @@ coreos:
{{end}}
Type={{.Experimental.EphemeralImageStorage.Filesystem}}
{{end}}
{{ if .SharedPersistentVolume }}
- name: load-efs-pv.service
command: start
content: |
[Unit]
Description=Load efs persistent volume mount
Wants=kube-node-taint-and-uncordon.service
After=kube-node-taint-and-uncordon.service
[Service]
Type=simple
RemainAfterExit=true
RestartSec=10
Restart=on-failure
ExecStartPre=/opt/bin/set-efs-pv
ExecStart=/opt/bin/load-efs-pv
{{end}}

{{if .SSHAuthorizedKeys}}
ssh_authorized_keys:
Expand Down Expand Up @@ -453,6 +469,36 @@ write_files:
'

rkt rm --uuid-file=/var/run/coreos/set-aws-environment.uuid || :
{{end}}
{{ if .SharedPersistentVolume }}
- path: /opt/bin/set-efs-pv
owner: root:root
permissions: 0700
content: |
#!/bin/bash -e

rkt run \
--volume=dns,kind=host,source=/etc/resolv.conf,readOnly=true \
--mount volume=dns,target=/etc/resolv.conf \
--volume=awsenv,kind=host,source=/etc/kubernetes,readOnly=false \
--mount volume=awsenv,target=/etc/kubernetes \
--uuid-file-save=/var/run/coreos/set-efs-pv.uuid \
--net=host \
--trust-keys-from-https \
{{.AWSCliImage.Options}}{{.AWSCliImage.RktRepo}} --exec=/bin/bash -- \
-ec \
'instance_id=$(curl http://169.254.169.254/latest/meta-data/instance-id)
stack_name=$(
aws ec2 describe-tags --region {{.Region}} --filters \
"Name=resource-id,Values=$instance_id" \
"Name=key,Values=aws:cloudformation:stack-name" \
--output json \
| jq -r ".Tags[].Value"
)
cfn-init -v -c "load-efs-pv" --region {{.Region}} --resource {{.Controller.LogicalName}} --stack $stack_name
'

rkt rm --uuid-file=/var/run/coreos/set-efs-pv.uuid || :
{{end}}
- path: /opt/bin/cfn-signal
owner: root:root
Expand Down Expand Up @@ -1850,3 +1896,21 @@ write_files:
encoding: base64
content: {{ .Experimental.Authentication.Webhook.Config }}
{{ end }}

{{ if .SharedPersistentVolume }}
- path: /opt/bin/load-efs-pv
owner: root:root
permissions: 0700
content: |
#!/bin/bash -e

docker run --rm --net=host \
-v /etc/kubernetes:/etc/kubernetes \
-v /etc/resolv.conf:/etc/resolv.conf \
{{ .HyperkubeImage.RepoWithTag }} /bin/bash \
-vxec \
'echo "Starting Loading EFS Persistent Volume"
/kubectl create -f /etc/kubernetes/efs-pv.yaml
echo "Finished Loading EFS Persistent Volume"'

{{ end }}
3 changes: 3 additions & 0 deletions core/controlplane/config/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,9 @@ worker:
# See https://github.com/kubernetes-incubator/kube-aws/issues/208 for more information
#elasticFileSystemId: fs-47a2c22e

# Create shared persistent volume
#sharedPersistentVolume: false
Copy link
Contributor

@mumoshu mumoshu Mar 28, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Just wondering/Not intended to scope-creep this PR; Are there any use-cases that lead us want to create multiple of shared persistent volumes, possibly varying volume names and storage sizes?

sharedPersistentVolumes:
- name: shared-efs
  provider: efs
  size: 500Gi
- name: shared-ebs
  provider: ebs
  size: 100Gi


# Determines the container runtime for kubernetes to use. Accepts 'docker' or 'rkt'.
# containerRuntime: docker

Expand Down
57 changes: 56 additions & 1 deletion core/controlplane/config/templates/stack-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@
"configSets" : {
"etcd-client": [ "etcd-client-env" ]{{if .Experimental.AwsEnvironment.Enabled}},
"aws-environment": [ "aws-environment-env" ]{{end}}
{{ if .SharedPersistentVolume }},
"load-efs-pv": [ "load-efs-pv-env" ]
{{end}}
},
{{ if .Experimental.AwsEnvironment.Enabled }}
"aws-environment-env" : {
Expand All @@ -86,6 +89,28 @@
}
},
{{ end }}
{{ if .SharedPersistentVolume }}
"load-efs-pv-env" : {
"files" : {
"/etc/kubernetes/efs-pv.yaml": {
"content": { "Fn::Join" : [ "", [
"apiVersion: v1\n",
"kind: PersistentVolume\n",
"metadata:\n",
" name: shared-efs\n",
"spec:\n",
" accessModes:\n",
" - ReadWriteMany\n",
" capacity:\n",
" storage: 500Gi\n",
" nfs:\n",
" path: /\n",
" server: ", {"Ref": "FileSystemCustom"}, ".efs.{{ $.Region }}.amazonaws.com", "\n"
]]}
}
}
},
{{ end }}
"etcd-client-env": {
"files" : {
"/var/run/coreos/etcd-environment": {
Expand Down Expand Up @@ -1189,7 +1214,7 @@
},
"Type": "AWS::EC2::SecurityGroupIngress"
}
{{if $.ElasticFileSystemID}}
{{if or $.ElasticFileSystemID .SharedPersistentVolume}}
,
"SecurityGroupMountTarget": {
"Properties": {
Expand Down Expand Up @@ -1224,6 +1249,36 @@
},
"Type": "AWS::EC2::SecurityGroup"
}
{{ if .SharedPersistentVolume }}
,
"FileSystemCustom": {
"Type": "AWS::EFS::FileSystem",
"Properties": {
"PerformanceMode": "maxIO",
"FileSystemTags": [
{
"Key": "Name",
"Value": "SharedData"
},
{
"Key": "KubernetesCluster",
"Value": "{{.ClusterName}}"
}
]
}
}
{{range $index, $subnet := .Subnets}}
,
"{{$subnet.LogicalName}}MountTargetCustom": {
"Properties" : {
"FileSystemId": { "Ref": "FileSystemCustom" },
"SubnetId": {{$subnet.Ref}},
"SecurityGroups": [ { "Ref": "SecurityGroupMountTarget" } ]
},
"Type" : "AWS::EFS::MountTarget"
}
{{end}}
{{end}}
{{end}}

{{range $index, $subnet := .Subnets}}
Expand Down