X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fhelm%2Ftemplates%2Ftiller.yml;h=5762d816118b7c8ba59d3c3894f167a9685b94c1;hb=refs%2Fchanges%2F14%2F1814%2F10;hp=36c55d8729e7ffa06733ab64895b04cb8301b4a0;hpb=863d4e265683ce662153bf9d793b91e85abd0dd0;p=ta%2Fcaas-helm.git

diff --git a/ansible/roles/helm/templates/tiller.yml b/ansible/roles/helm/templates/tiller.yml
index 36c55d8..5762d81 100644
--- a/ansible/roles/helm/templates/tiller.yml
+++ b/ansible/roles/helm/templates/tiller.yml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 #}
 ---
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: tiller
@@ -26,20 +26,13 @@ spec:
       {{ caas.kubernetes_component_label }}: tiller
   template:
     metadata:
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {
-              "network":"flannel"
-            }
-          ]
       labels:
         {{ caas.kubernetes_component_label }}: tiller
     spec:
       priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
-        nodename: caas_master1
+        nodetype: caas_master
       securityContext:
         runAsUser: {{ caas.uid.kube }}
       containers: