commit 1222f2c76ebfdb206323a8e9bef3b226e87530bc
author Tomas Kukral <tkukral@mirantis.com> Mon Dec 18 07:51:40 2017 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Mon Dec 18 07:51:40 2017 +0000
tree a13662b8c988be8624f8b45811a4cc37a37e52ba
parent a38b4303a1459d2b40727317e4da58f9c3051cf8
parent b94fcbcd73287338d16e6b6c8c0a0fd11276536c

Merge "Removed helm from k8s-ha-calico."

classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml

diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
index 7916e9c..306fb15 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
@@ -6,24 +6,10 @@
 - system.kubernetes.master.cluster
 - cluster.k8s-ha-calico-cloudprovider.kubernetes.compute
 - cluster.k8s-ha-calico-cloudprovider
-# FIXME: replace service.helm to system.helm (once properly in reclass)
-- service.helm.client
 parameters:
   _param:
     keepalived_vip_interface: ${_param:primary_interface}
     keepalived_vip_virtual_router_id: 60
-  helm:
-    client:
-      repos:
-        mirantisworkloads: https://mirantisworkloads.storage.googleapis.com/
-      #releases:
-      # TODO: configure custom application stacks below
-      #  grafana:
-      #    chart: mirantisworkloads/grafana
-      #    version: 0.4.1
-      #    values:
-      #      replicas: 1
-      #      logLevel: INFO
   etcd:
     server:
       source:

classes/cluster/k8s-ha-calico/kubernetes/control.yml

diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index ab43539..23d4da7 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -6,24 +6,10 @@
 - system.kubernetes.master.cluster
 - cluster.k8s-ha-calico.kubernetes.compute
 - cluster.k8s-ha-calico
-# FIXME: replace service.helm to system.helm (once properly in reclass)
-- service.helm.client
 parameters:
   _param:
     keepalived_vip_interface: ${_param:primary_interface}
     keepalived_vip_virtual_router_id: 60
-  helm:
-    client:
-      repos:
-        mirantisworkloads: https://mirantisworkloads.storage.googleapis.com/
-      #releases:
-      # TODO: configure custom application stacks below
-      #  grafana:
-      #    chart: mirantisworkloads/grafana
-      #    version: 0.4.1
-      #    values:
-      #      replicas: 1
-      #      logLevel: INFO
   etcd:
     server:
       bind: