From 4fe1857e49bacf8139cc7ec1b9463a1e080f9ad4 Mon Sep 17 00:00:00 2001 From: Mark Burnett Date: Thu, 27 Jul 2017 13:45:00 -0500 Subject: [PATCH] rsync Calico & DNS charts onto host This is a temporary measure to improve iteration for development. These can be moved out once armada supports loading charts from, e.g. `helm serve`. --- Dockerfile | 2 ++ .../etc/kubernetes/armada-loader/assets/charts}/.gitignore | 0 .../kubernetes/armada-loader/assets/charts}/calico/.helmignore | 0 .../kubernetes/armada-loader/assets/charts}/calico/Chart.yaml | 0 .../assets/charts}/calico/templates/configmap.yaml | 0 .../assets/charts}/calico/templates/daemonset-node.yaml | 0 .../charts}/calico/templates/deployment-policy-controller.yaml | 0 .../armada-loader/assets/charts}/calico/templates/rbac.yaml | 0 .../armada-loader/assets/charts}/calico/templates/secret.yaml | 0 .../assets/charts}/calico/templates/service-etcd.yaml | 0 .../kubernetes/armada-loader/assets/charts}/calico/values.yaml | 0 .../kubernetes/armada-loader/assets/charts}/kube-dns/Chart.yaml | 0 .../assets/charts}/kube-dns/templates/configmap.yaml | 0 .../assets/charts}/kube-dns/templates/deployment.yaml | 0 .../armada-loader/assets/charts}/kube-dns/templates/rbac.yaml | 0 .../assets/charts}/kube-dns/templates/service.yaml | 0 .../armada-loader/assets/charts}/kube-dns/values.yaml | 0 17 files changed, 2 insertions(+) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/.gitignore (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/calico/.helmignore (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/calico/Chart.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/calico/templates/configmap.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/calico/templates/daemonset-node.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/calico/templates/deployment-policy-controller.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/calico/templates/rbac.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/calico/templates/secret.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/calico/templates/service-etcd.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/calico/values.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/kube-dns/Chart.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/kube-dns/templates/configmap.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/kube-dns/templates/deployment.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/kube-dns/templates/rbac.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/kube-dns/templates/service.yaml (100%) rename {charts => assets/etc/kubernetes/armada-loader/assets/charts}/kube-dns/values.yaml (100%) diff --git a/Dockerfile b/Dockerfile index de8b1bfa..e199aad6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,5 +48,7 @@ RUN set -ex \ COPY requirements-frozen.txt /promenade RUN pip install --no-cache-dir -r requirements-frozen.txt +COPY ./assets/ /assets/ + COPY . /promenade RUN pip install -e /promenade diff --git a/charts/.gitignore b/assets/etc/kubernetes/armada-loader/assets/charts/.gitignore similarity index 100% rename from charts/.gitignore rename to assets/etc/kubernetes/armada-loader/assets/charts/.gitignore diff --git a/charts/calico/.helmignore b/assets/etc/kubernetes/armada-loader/assets/charts/calico/.helmignore similarity index 100% rename from charts/calico/.helmignore rename to assets/etc/kubernetes/armada-loader/assets/charts/calico/.helmignore diff --git a/charts/calico/Chart.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/calico/Chart.yaml similarity index 100% rename from charts/calico/Chart.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/calico/Chart.yaml diff --git a/charts/calico/templates/configmap.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/configmap.yaml similarity index 100% rename from charts/calico/templates/configmap.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/configmap.yaml diff --git a/charts/calico/templates/daemonset-node.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/daemonset-node.yaml similarity index 100% rename from charts/calico/templates/daemonset-node.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/daemonset-node.yaml diff --git a/charts/calico/templates/deployment-policy-controller.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/deployment-policy-controller.yaml similarity index 100% rename from charts/calico/templates/deployment-policy-controller.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/deployment-policy-controller.yaml diff --git a/charts/calico/templates/rbac.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/rbac.yaml similarity index 100% rename from charts/calico/templates/rbac.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/rbac.yaml diff --git a/charts/calico/templates/secret.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/secret.yaml similarity index 100% rename from charts/calico/templates/secret.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/secret.yaml diff --git a/charts/calico/templates/service-etcd.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/service-etcd.yaml similarity index 100% rename from charts/calico/templates/service-etcd.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/calico/templates/service-etcd.yaml diff --git a/charts/calico/values.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/calico/values.yaml similarity index 100% rename from charts/calico/values.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/calico/values.yaml diff --git a/charts/kube-dns/Chart.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/Chart.yaml similarity index 100% rename from charts/kube-dns/Chart.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/Chart.yaml diff --git a/charts/kube-dns/templates/configmap.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/templates/configmap.yaml similarity index 100% rename from charts/kube-dns/templates/configmap.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/templates/configmap.yaml diff --git a/charts/kube-dns/templates/deployment.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/templates/deployment.yaml similarity index 100% rename from charts/kube-dns/templates/deployment.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/templates/deployment.yaml diff --git a/charts/kube-dns/templates/rbac.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/templates/rbac.yaml similarity index 100% rename from charts/kube-dns/templates/rbac.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/templates/rbac.yaml diff --git a/charts/kube-dns/templates/service.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/templates/service.yaml similarity index 100% rename from charts/kube-dns/templates/service.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/templates/service.yaml diff --git a/charts/kube-dns/values.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/values.yaml similarity index 100% rename from charts/kube-dns/values.yaml rename to assets/etc/kubernetes/armada-loader/assets/charts/kube-dns/values.yaml