Merge "[k8s_coreos] Remove podmaster"

magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-controller-manager.yaml

@@ -33,7 +33,7 @@ write_files:
         ROOT_CA_FILE=
       fi
 
-      TEMPLATE=/srv/kubernetes/manifests/kube-controller-manager.yaml
+      TEMPLATE=/etc/kubernetes/manifests/kube-controller-manager.yaml
       mkdir -p $(dirname ${TEMPLATE})
 
       cat > ${TEMPLATE} <<EOF

magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-podmaster.yaml

@@ -1,77 +0,0 @@
-#cloud-config
-write_files:
-  - path: /etc/systemd/system/enable-kube-podmaster.service
-    owner: "root:root"
-    permissions: "0644"
-    content: |
-      [Unit]
-      Description=Configure Kubernetes Podmaster
-
-      [Service]
-      Type=oneshot
-      ExecStart=/etc/sysconfig/enable-kube-podmaster.sh
-
-      [Install]
-      WantedBy=multi-user.target
-
-  - path: /etc/sysconfig/enable-kube-podmaster.sh
-    owner: "root:root"
-    permissions: "0755"
-    content: |
-      #!/bin/sh
-
-      . /etc/sysconfig/heat-params
-      myip=$(ip addr show eth0 |
-             awk '$1 == "inet" {print $2}' | cut -f1 -d/)
-
-      TEMPLATE=/etc/kubernetes/manifests/kube-podmaster.yaml
-      mkdir -p $(dirname ${TEMPLATE})
-
-      cat > ${TEMPLATE} <<EOF
-      apiVersion: v1
-      kind: Pod
-      metadata:
-        name: kube-podmaster
-        namespace: kube-system
-      spec:
-        hostNetwork: true
-        containers:
-        - name: scheduler-elector
-          image: gcr.io/google_containers/podmaster:1.1
-          command:
-          - /podmaster
-          - --etcd-servers=http://127.0.0.1:2379
-          - --key=scheduler
-          - --whoami=${ADVERTISE_IP}
-          - --source-file=/src/manifests/kube-scheduler.yaml
-          - --dest-file=/dst/manifests/kube-scheduler.yaml
-          volumeMounts:
-          - mountPath: /src/manifests
-            name: manifest-src
-            readOnly: true
-          - mountPath: /dst/manifests
-            name: manifest-dst
-        - name: controller-manager-elector
-          image: gcr.io/google_containers/podmaster:1.1
-          command:
-          - /podmaster
-          - --etcd-servers=http://127.0.0.1:2379
-          - --key=controller
-          - --whoami=${myip}
-          - --source-file=/src/manifests/kube-controller-manager.yaml
-          - --dest-file=/dst/manifests/kube-controller-manager.yaml
-          terminationMessagePath: /dev/termination-log
-          volumeMounts:
-          - mountPath: /src/manifests
-            name: manifest-src
-            readOnly: true
-          - mountPath: /dst/manifests
-            name: manifest-dst
-        volumes:
-        - hostPath:
-            path: /srv/kubernetes/manifests
-          name: manifest-src
-        - hostPath:
-            path: /etc/kubernetes/manifests
-          name: manifest-dst
-      EOF

magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-scheduler.yaml

@@ -22,7 +22,7 @@ write_files:
 
       . /etc/sysconfig/heat-params
 
-      TEMPLATE=/srv/kubernetes/manifests/kube-scheduler.yaml
+      TEMPLATE=/etc/kubernetes/manifests/kube-scheduler.yaml
       mkdir -p $(dirname ${TEMPLATE})
 
       cat > ${TEMPLATE} <<EOF

magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml

@@ -276,12 +276,6 @@ resources:
       group: ungrouped
       config: {get_file: fragments/enable-kube-scheduler.yaml}
 
-  enable_kube_podmaster:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config: {get_file: fragments/enable-kube-podmaster.yaml}
-
   wc_notify:
     type: OS::Heat::SoftwareConfig
     properties:
@@ -311,7 +305,6 @@ resources:
             $enable_kube_apiserver
             $create_kube_namespace
             $enable_kube_proxy
-            $enable_kube_podmaster
             $enable_kube_controller_manager
             $enable_kube_scheduler
             $wc_notify
@@ -339,8 +332,6 @@ resources:
                   command: "start"
                 - name: "enable-kube-scheduler.service"
                   command: "start"
-                - name: "enable-kube-podmaster.service"
-                  command: "start"
                 - name: "wc-notify.service"
                   command: "start"
           params:
@@ -356,7 +347,6 @@ resources:
             "$enable_kube_proxy": {get_attr: [enable_kube_proxy, config]}
             "$enable_kube_controller_manager": {get_attr: [enable_kube_controller_manager, config]}
             "$enable_kube_scheduler": {get_attr: [enable_kube_scheduler, config]}
-            "$enable_kube_podmaster": {get_attr: [enable_kube_podmaster, config]}
             "$wc_notify": {get_attr: [wc_notify, config]}
 
   ######################################################################