diff --git a/.gitignore b/.gitignore index 8f7747f533..69ae365b3b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,5 @@ bower_components .cache pip-selfcheck.json keys -/chart/charts -/chart/requirements.lock +/chart/mist/charts +/chart/mist/requirements.lock diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2891b8a3a4..982bc0929a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -295,7 +295,7 @@ compose: helm init --client-only helm repo update - helm dependency update ./chart/ + helm dependency update ./chart/mist/ helm upgrade --install --namespace $namespace \ --wait --timeout=600 \ @@ -314,7 +314,7 @@ compose: --set docker.cert="$DOCKER_CERT" \ --set docker.ca="$DOCKER_CA" \ $(elasticsearch_params) \ - $namespace ./chart/ + $namespace ./chart/mist/ apk add --no-cache curl echo "Waiting for environment to be ready..." while kubectl --namespace $namespace get pods | grep -v -e NAME -e Running -e Completed -e Evicted -e OutOfcpu; do diff --git a/chart/README.md b/chart/README.md deleted file mode 100644 index d3885b6357..0000000000 --- a/chart/README.md +++ /dev/null @@ -1 +0,0 @@ -This chart was created by Kompose diff --git a/chart/Chart.yaml b/chart/mist/Chart.yaml similarity index 66% rename from chart/Chart.yaml rename to chart/mist/Chart.yaml index de31f86269..56ebee9959 100644 --- a/chart/Chart.yaml +++ b/chart/mist/Chart.yaml @@ -1,5 +1,3 @@ -name: chart +name: mist description: A Helm Chart for Mist CE. version: 0.0.1 -sources: -home: diff --git a/chart/mist/README.md b/chart/mist/README.md new file mode 100644 index 0000000000..b4cde22d70 --- /dev/null +++ b/chart/mist/README.md @@ -0,0 +1,3 @@ +# Mist Helm Chart + +This is the mist helm chart. See `./values.yaml` for configuration options. diff --git a/chart/requirements.yaml b/chart/mist/requirements.yaml similarity index 100% rename from chart/requirements.yaml rename to chart/mist/requirements.yaml diff --git a/chart/templates/api-deployment.yaml b/chart/mist/templates/api-deployment.yaml similarity index 100% rename from chart/templates/api-deployment.yaml rename to chart/mist/templates/api-deployment.yaml diff --git a/chart/templates/api-service.yaml b/chart/mist/templates/api-service.yaml similarity index 100% rename from chart/templates/api-service.yaml rename to chart/mist/templates/api-service.yaml diff --git a/chart/templates/apply-migrations-job.yaml b/chart/mist/templates/apply-migrations-job.yaml similarity index 100% rename from chart/templates/apply-migrations-job.yaml rename to chart/mist/templates/apply-migrations-job.yaml diff --git a/chart/templates/beat-deployment.yaml b/chart/mist/templates/beat-deployment.yaml similarity index 100% rename from chart/templates/beat-deployment.yaml rename to chart/mist/templates/beat-deployment.yaml diff --git a/chart/templates/celery-deployment.yaml b/chart/mist/templates/celery-deployment.yaml similarity index 100% rename from chart/templates/celery-deployment.yaml rename to chart/mist/templates/celery-deployment.yaml diff --git a/chart/templates/celery-exporter-deployment.yaml b/chart/mist/templates/celery-exporter-deployment.yaml similarity index 100% rename from chart/templates/celery-exporter-deployment.yaml rename to chart/mist/templates/celery-exporter-deployment.yaml diff --git a/chart/templates/celery-exporter-service.yaml b/chart/mist/templates/celery-exporter-service.yaml similarity index 100% rename from chart/templates/celery-exporter-service.yaml rename to chart/mist/templates/celery-exporter-service.yaml diff --git a/chart/templates/celery-exporter-servicemonitor.yaml b/chart/mist/templates/celery-exporter-servicemonitor.yaml similarity index 100% rename from chart/templates/celery-exporter-servicemonitor.yaml rename to chart/mist/templates/celery-exporter-servicemonitor.yaml diff --git a/chart/templates/celery-horizontalpodautoscaler.yaml b/chart/mist/templates/celery-horizontalpodautoscaler.yaml similarity index 100% rename from chart/templates/celery-horizontalpodautoscaler.yaml rename to chart/mist/templates/celery-horizontalpodautoscaler.yaml diff --git a/chart/templates/cilia-deployment.yaml b/chart/mist/templates/cilia-deployment.yaml similarity index 100% rename from chart/templates/cilia-deployment.yaml rename to chart/mist/templates/cilia-deployment.yaml diff --git a/chart/templates/common-horizontalpodautoscaler.yaml b/chart/mist/templates/common-horizontalpodautoscaler.yaml similarity index 100% rename from chart/templates/common-horizontalpodautoscaler.yaml rename to chart/mist/templates/common-horizontalpodautoscaler.yaml diff --git a/chart/templates/elasticsearch-deployment.yaml b/chart/mist/templates/elasticsearch-deployment.yaml similarity index 100% rename from chart/templates/elasticsearch-deployment.yaml rename to chart/mist/templates/elasticsearch-deployment.yaml diff --git a/chart/templates/elasticsearch-manage-job.yaml b/chart/mist/templates/elasticsearch-manage-job.yaml similarity index 100% rename from chart/templates/elasticsearch-manage-job.yaml rename to chart/mist/templates/elasticsearch-manage-job.yaml diff --git a/chart/templates/elasticsearch-persistentvolumeclaim.yaml b/chart/mist/templates/elasticsearch-persistentvolumeclaim.yaml similarity index 100% rename from chart/templates/elasticsearch-persistentvolumeclaim.yaml rename to chart/mist/templates/elasticsearch-persistentvolumeclaim.yaml diff --git a/chart/templates/elasticsearch-service.yaml b/chart/mist/templates/elasticsearch-service.yaml similarity index 100% rename from chart/templates/elasticsearch-service.yaml rename to chart/mist/templates/elasticsearch-service.yaml diff --git a/chart/templates/gocky-configmap.yaml b/chart/mist/templates/gocky-configmap.yaml similarity index 100% rename from chart/templates/gocky-configmap.yaml rename to chart/mist/templates/gocky-configmap.yaml diff --git a/chart/templates/gocky-deployment.yaml b/chart/mist/templates/gocky-deployment.yaml similarity index 100% rename from chart/templates/gocky-deployment.yaml rename to chart/mist/templates/gocky-deployment.yaml diff --git a/chart/templates/gocky-service.yaml b/chart/mist/templates/gocky-service.yaml similarity index 100% rename from chart/templates/gocky-service.yaml rename to chart/mist/templates/gocky-service.yaml diff --git a/chart/templates/hubshell-deployment.yaml b/chart/mist/templates/hubshell-deployment.yaml similarity index 100% rename from chart/templates/hubshell-deployment.yaml rename to chart/mist/templates/hubshell-deployment.yaml diff --git a/chart/templates/influxdb-deployment.yaml b/chart/mist/templates/influxdb-deployment.yaml similarity index 100% rename from chart/templates/influxdb-deployment.yaml rename to chart/mist/templates/influxdb-deployment.yaml diff --git a/chart/templates/influxdb-persistentvolumeclaim.yaml b/chart/mist/templates/influxdb-persistentvolumeclaim.yaml similarity index 100% rename from chart/templates/influxdb-persistentvolumeclaim.yaml rename to chart/mist/templates/influxdb-persistentvolumeclaim.yaml diff --git a/chart/templates/influxdb-service.yaml b/chart/mist/templates/influxdb-service.yaml similarity index 100% rename from chart/templates/influxdb-service.yaml rename to chart/mist/templates/influxdb-service.yaml diff --git a/chart/templates/ingress.yaml b/chart/mist/templates/ingress.yaml similarity index 100% rename from chart/templates/ingress.yaml rename to chart/mist/templates/ingress.yaml diff --git a/chart/templates/kibana-deployment.yaml b/chart/mist/templates/kibana-deployment.yaml similarity index 100% rename from chart/templates/kibana-deployment.yaml rename to chart/mist/templates/kibana-deployment.yaml diff --git a/chart/templates/kibana-service.yaml b/chart/mist/templates/kibana-service.yaml similarity index 100% rename from chart/templates/kibana-service.yaml rename to chart/mist/templates/kibana-service.yaml diff --git a/chart/templates/landing-deployment.yaml b/chart/mist/templates/landing-deployment.yaml similarity index 100% rename from chart/templates/landing-deployment.yaml rename to chart/mist/templates/landing-deployment.yaml diff --git a/chart/templates/landing-service.yaml b/chart/mist/templates/landing-service.yaml similarity index 100% rename from chart/templates/landing-service.yaml rename to chart/mist/templates/landing-service.yaml diff --git a/chart/templates/logstash-deployment.yaml b/chart/mist/templates/logstash-deployment.yaml similarity index 100% rename from chart/templates/logstash-deployment.yaml rename to chart/mist/templates/logstash-deployment.yaml diff --git a/chart/templates/mailmock-deployment.yaml b/chart/mist/templates/mailmock-deployment.yaml similarity index 100% rename from chart/templates/mailmock-deployment.yaml rename to chart/mist/templates/mailmock-deployment.yaml diff --git a/chart/templates/mailmock-service.yaml b/chart/mist/templates/mailmock-service.yaml similarity index 100% rename from chart/templates/mailmock-service.yaml rename to chart/mist/templates/mailmock-service.yaml diff --git a/chart/templates/main-configmap.yaml b/chart/mist/templates/main-configmap.yaml similarity index 100% rename from chart/templates/main-configmap.yaml rename to chart/mist/templates/main-configmap.yaml diff --git a/chart/templates/memcached-deployment.yaml b/chart/mist/templates/memcached-deployment.yaml similarity index 100% rename from chart/templates/memcached-deployment.yaml rename to chart/mist/templates/memcached-deployment.yaml diff --git a/chart/templates/memcached-service.yaml b/chart/mist/templates/memcached-service.yaml similarity index 100% rename from chart/templates/memcached-service.yaml rename to chart/mist/templates/memcached-service.yaml diff --git a/chart/templates/mongodb-deployment.yaml b/chart/mist/templates/mongodb-deployment.yaml similarity index 100% rename from chart/templates/mongodb-deployment.yaml rename to chart/mist/templates/mongodb-deployment.yaml diff --git a/chart/templates/mongodb-persistentvolumeclaim.yaml b/chart/mist/templates/mongodb-persistentvolumeclaim.yaml similarity index 100% rename from chart/templates/mongodb-persistentvolumeclaim.yaml rename to chart/mist/templates/mongodb-persistentvolumeclaim.yaml diff --git a/chart/templates/mongodb-service.yaml b/chart/mist/templates/mongodb-service.yaml similarity index 100% rename from chart/templates/mongodb-service.yaml rename to chart/mist/templates/mongodb-service.yaml diff --git a/chart/templates/nginx-configmap.yaml b/chart/mist/templates/nginx-configmap.yaml similarity index 100% rename from chart/templates/nginx-configmap.yaml rename to chart/mist/templates/nginx-configmap.yaml diff --git a/chart/templates/nginx-deployment.yaml b/chart/mist/templates/nginx-deployment.yaml similarity index 100% rename from chart/templates/nginx-deployment.yaml rename to chart/mist/templates/nginx-deployment.yaml diff --git a/chart/templates/nginx-service.yaml b/chart/mist/templates/nginx-service.yaml similarity index 100% rename from chart/templates/nginx-service.yaml rename to chart/mist/templates/nginx-service.yaml diff --git a/chart/templates/poller-deployment.yaml b/chart/mist/templates/poller-deployment.yaml similarity index 100% rename from chart/templates/poller-deployment.yaml rename to chart/mist/templates/poller-deployment.yaml diff --git a/chart/templates/poller-horizontalpodautoscaler.yaml b/chart/mist/templates/poller-horizontalpodautoscaler.yaml similarity index 100% rename from chart/templates/poller-horizontalpodautoscaler.yaml rename to chart/mist/templates/poller-horizontalpodautoscaler.yaml diff --git a/chart/templates/prometheusrule.yaml b/chart/mist/templates/prometheusrule.yaml similarity index 100% rename from chart/templates/prometheusrule.yaml rename to chart/mist/templates/prometheusrule.yaml diff --git a/chart/templates/scheduler-deployment.yaml b/chart/mist/templates/scheduler-deployment.yaml similarity index 100% rename from chart/templates/scheduler-deployment.yaml rename to chart/mist/templates/scheduler-deployment.yaml diff --git a/chart/templates/sockjs-deployment.yaml b/chart/mist/templates/sockjs-deployment.yaml similarity index 100% rename from chart/templates/sockjs-deployment.yaml rename to chart/mist/templates/sockjs-deployment.yaml diff --git a/chart/templates/sockjs-service.yaml b/chart/mist/templates/sockjs-service.yaml similarity index 100% rename from chart/templates/sockjs-service.yaml rename to chart/mist/templates/sockjs-service.yaml diff --git a/chart/templates/swagger-deployment.yaml b/chart/mist/templates/swagger-deployment.yaml similarity index 100% rename from chart/templates/swagger-deployment.yaml rename to chart/mist/templates/swagger-deployment.yaml diff --git a/chart/templates/swagger-service.yaml b/chart/mist/templates/swagger-service.yaml similarity index 100% rename from chart/templates/swagger-service.yaml rename to chart/mist/templates/swagger-service.yaml diff --git a/chart/templates/traefik-deployment.yaml b/chart/mist/templates/traefik-deployment.yaml similarity index 100% rename from chart/templates/traefik-deployment.yaml rename to chart/mist/templates/traefik-deployment.yaml diff --git a/chart/templates/traefik-service.yaml b/chart/mist/templates/traefik-service.yaml similarity index 100% rename from chart/templates/traefik-service.yaml rename to chart/mist/templates/traefik-service.yaml diff --git a/chart/templates/ui-deployment.yaml b/chart/mist/templates/ui-deployment.yaml similarity index 100% rename from chart/templates/ui-deployment.yaml rename to chart/mist/templates/ui-deployment.yaml diff --git a/chart/templates/ui-service.yaml b/chart/mist/templates/ui-service.yaml similarity index 100% rename from chart/templates/ui-service.yaml rename to chart/mist/templates/ui-service.yaml diff --git a/chart/values.yaml b/chart/mist/values.yaml similarity index 100% rename from chart/values.yaml rename to chart/mist/values.yaml