From b52d971aee4eeb029b73091ceacfd96a42419a9e Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 21 Nov 2016 10:16:29 +0100 Subject: [PATCH] stash --- cluster/addons/storage-class/aws/default.yaml | 11 +++++++++++ cluster/addons/storage-class/gce/default.yaml | 11 +++++++++++ cluster/addons/storage-class/openstack/default.yaml | 9 +++++++++ cluster/aws/config-default.sh | 3 +++ cluster/aws/config-test.sh | 3 +++ cluster/common.sh | 1 + cluster/gce/config-default.sh | 3 +++ cluster/gce/config-test.sh | 3 +++ cluster/gce/configure-vm.sh | 1 + cluster/gce/coreos/configure-node.sh | 5 +++++ cluster/gce/gci/configure-helper.sh | 3 +++ cluster/gce/trusty/configure-helper.sh | 3 +++ cluster/saltbase/salt/kube-addons/init.sls | 10 ++++++++++ 13 files changed, 66 insertions(+) create mode 100644 cluster/addons/storage-class/aws/default.yaml create mode 100644 cluster/addons/storage-class/gce/default.yaml create mode 100644 cluster/addons/storage-class/openstack/default.yaml diff --git a/cluster/addons/storage-class/aws/default.yaml b/cluster/addons/storage-class/aws/default.yaml new file mode 100644 index 0000000000..319fe55cbc --- /dev/null +++ b/cluster/addons/storage-class/aws/default.yaml @@ -0,0 +1,11 @@ +apiVersion: storage.k8s.io/v1beta1 +kind: StorageClass +metadata: + name: default + annotations: + storageclass.beta.kubernetes.io/is-default-class: "true" + labels: + kubernetes.io/cluster-service: "true" +provisioner: kubernetes.io/aws-ebs +parameters: + type: gp2 diff --git a/cluster/addons/storage-class/gce/default.yaml b/cluster/addons/storage-class/gce/default.yaml new file mode 100644 index 0000000000..e1b89675f1 --- /dev/null +++ b/cluster/addons/storage-class/gce/default.yaml @@ -0,0 +1,11 @@ +apiVersion: storage.k8s.io/v1beta1 +kind: StorageClass +metadata: + name: default + annotations: + storageclass.beta.kubernetes.io/is-default-class: "true" + labels: + kubernetes.io/cluster-service: "true" +provisioner: kubernetes.io/gce-pd +parameters: + type: pd-standard diff --git a/cluster/addons/storage-class/openstack/default.yaml b/cluster/addons/storage-class/openstack/default.yaml new file mode 100644 index 0000000000..6e4f771b7b --- /dev/null +++ b/cluster/addons/storage-class/openstack/default.yaml @@ -0,0 +1,9 @@ +apiVersion: storage.k8s.io/v1beta1 +kind: StorageClass +metadata: + name: default + annotations: + storageclass.beta.kubernetes.io/is-default-class: "true" + labels: + kubernetes.io/cluster-service: "true" +provisioner: kubernetes.io/cinder diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 35b6aa460d..0427892c26 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -162,3 +162,6 @@ OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}" # Optional: if set to true, kube-up will configure the cluster to run e2e tests. E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false} + +# Optional: install a default StorageClass +ENABLE_DEFAULT_STORAGE_CLASS="${ENABLE_DEFAULT_STORAGE_CLASS:-true}" diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 5c0bbec29c..78ad8d87c2 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -148,3 +148,6 @@ OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}" # Optional: if set to true, kube-up will configure the cluster to run e2e tests. E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false} + +# Optional: install a default StorageClass +ENABLE_DEFAULT_STORAGE_CLASS="${ENABLE_DEFAULT_STORAGE_CLASS:-true}" diff --git a/cluster/common.sh b/cluster/common.sh index 00f00f1706..89d7904d01 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -630,6 +630,7 @@ KUBE_ADDON_REGISTRY: $(yaml-quote ${KUBE_ADDON_REGISTRY:-}) MULTIZONE: $(yaml-quote ${MULTIZONE:-}) NON_MASQUERADE_CIDR: $(yaml-quote ${NON_MASQUERADE_CIDR:-}) KUBE_UID: $(yaml-quote ${KUBE_UID:-}) +ENABLE_DEFAULT_STORAGE_CLASS: $(yaml-quote ${ENABLE_DEFAULT_STORAGE_CLASS:-}) EOF if [ -n "${KUBELET_PORT:-}" ]; then cat >>$file <>/srv/salt-overlay/pillar/cluster-params.sls diff --git a/cluster/gce/coreos/configure-node.sh b/cluster/gce/coreos/configure-node.sh index 18988b065f..6dc47b8845 100755 --- a/cluster/gce/coreos/configure-node.sh +++ b/cluster/gce/coreos/configure-node.sh @@ -167,6 +167,11 @@ function configure-master-addons() { if [[ "${ENABLE_NODE_PROBLEM_DETECTOR}" == "true" ]]; then evaluate-manifests-dir ${MANIFESTS_DIR}/addons/node-problem-detector ${addon_dir}/node-problem-detector fi + if [[ "${ENABLE_DEFAULT_STORAGE_CLASS:-}" == "true" ]]; then + setup-addon-manifests "addons" "storage-class/gce" + fi + + evaluate-manifests-dir ${MANIFESTS_DIR}/addons/storage-class/gce ${addon_dir}/storage-class } function configure-master-components() { diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 24aba9d032..6a01634c83 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1096,6 +1096,9 @@ function start-kube-addons { if [[ "${NETWORK_POLICY_PROVIDER:-}" == "calico" ]]; then setup-addon-manifests "addons" "calico-policy-controller" fi + if [[ "${ENABLE_DEFAULT_STORAGE_CLASS:-}" == "true" ]]; then + setup-addon-manifests "addons" "storage-class/gce" + fi # Place addon manager pod manifest. cp "${src_dir}/kube-addon-manager.yaml" /etc/kubernetes/manifests diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index 0b7edfe3de..7a040db8a2 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -937,6 +937,9 @@ start_kube_addons() { if echo "${ADMISSION_CONTROL:-}" | grep -q "LimitRanger"; then setup_addon_manifests "admission-controls" "limit-range" fi + if [[ "${ENABLE_DEFAULT_STORAGE_CLASS:-}" == "true" ]]; then + setup-addon-manifests "addons" "storage-class/gce" + fi # Place addon manager pod manifest cp "${addon_src_dir}/kube-addon-manager.yaml" /etc/kubernetes/manifests diff --git a/cluster/saltbase/salt/kube-addons/init.sls b/cluster/saltbase/salt/kube-addons/init.sls index 502260d91f..a1b3c76d63 100644 --- a/cluster/saltbase/salt/kube-addons/init.sls +++ b/cluster/saltbase/salt/kube-addons/init.sls @@ -177,3 +177,13 @@ addon-dir-create: - user: root - group: root - mode: 755 + +{% if pillar.get('enable_default_storage_class', '').lower() == 'true' and grains['cloud'] is defined and grains['cloud'] in ['aws', 'gce', 'openstack'] %} +/etc/kubernetes/addons/storage-class/default.yaml: + file.managed: + - source: salt://kube-addons/storage-class/{{ grains['cloud'] }}/default.yaml + - user: root + - group: root + - mode: 644 + - makedirs: True +{% endif %}