Merge "[k8s_fedora_atomic] Remove podmaster"

magnum/drivers/common/templates/kubernetes/fragments/enable-kube-controller-manager-scheduler.sh

@@ -3,67 +3,13 @@
 . /etc/sysconfig/heat-params
 
 if [ -n "${INSECURE_REGISTRY_URL}" ]; then
-    PODMASTER_IMAGE="${INSECURE_REGISTRY_URL}/google_containers/podmaster:1.1"
     HYPERKUBE_IMAGE="${INSECURE_REGISTRY_URL}/google_containers/hyperkube:${KUBE_VERSION}"
 else
-    PODMASTER_IMAGE="gcr.io/google_containers/podmaster:1.1"
     HYPERKUBE_IMAGE="gcr.io/google_containers/hyperkube:${KUBE_VERSION}"
 fi
 
 
 init_templates () {
-    local TEMPLATE=/etc/kubernetes/manifests/kube-podmaster.yaml
-    [ -f ${TEMPLATE} ] || {
-        echo "TEMPLATE: $TEMPLATE"
-        mkdir -p $(dirname ${TEMPLATE})
-        cat << EOF > ${TEMPLATE}
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kube-podmaster
-  namespace: kube-system
-spec:
-  hostNetwork: true
-  containers:
-  - name: scheduler-elector
-    image: ${PODMASTER_IMAGE}
-    command:
-    - /podmaster
-    - --etcd-servers=http://127.0.0.1:2379
-    - --key=scheduler
-    - --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: ${PODMASTER_IMAGE}
-    command:
-    - /podmaster
-    - --etcd-servers=http://127.0.0.1:2379
-    - --key=controller
-    - --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
-    }
-
     local SERVICE_ACCOUNT_PRIVATE_KEY_FILE=/etc/kubernetes/ssl/server.key
     local ROOT_CA_FILE=/etc/kubernetes/ssl/ca.crt
 
@@ -72,7 +18,7 @@ EOF
         ROOT_CA_FILE=
     fi
 
-    local TEMPLATE=/srv/kubernetes/manifests/kube-controller-manager.yaml
+    local TEMPLATE=/etc/kubernetes/manifests/kube-controller-manager.yaml
     [ -f ${TEMPLATE} ] || {
         echo "TEMPLATE: $TEMPLATE"
         mkdir -p $(dirname ${TEMPLATE})
@@ -124,7 +70,7 @@ spec:
 EOF
     }
 
-    local TEMPLATE=/srv/kubernetes/manifests/kube-scheduler.yaml
+    local TEMPLATE=/etc/kubernetes/manifests/kube-scheduler.yaml
     [ -f ${TEMPLATE} ] || {
         echo "TEMPLATE: $TEMPLATE"
         mkdir -p $(dirname ${TEMPLATE})

magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

@@ -316,11 +316,11 @@ resources:
       group: ungrouped
       config: {get_file: ../../common/templates/kubernetes/fragments/network-service.sh}
 
-  enable_kube_podmaster:
+  enable_kube_controller_manager_scheduler:
     type: OS::Heat::SoftwareConfig
     properties:
       group: ungrouped
-      config: {get_file: ../../common/templates/kubernetes/fragments/enable-kube-podmaster.sh}
+      config: {get_file: ../../common/templates/kubernetes/fragments/enable-kube-controller-manager-scheduler.sh}
 
   kube_system_namespace_service:
     type: OS::Heat::SoftwareConfig
@@ -375,7 +375,7 @@ resources:
         - config: {get_resource: network_config_service}
         - config: {get_resource: network_service}
         - config: {get_resource: kube_system_namespace_service}
-        - config: {get_resource: enable_kube_podmaster}
+        - config: {get_resource: enable_kube_controller_manager_scheduler}
         - config: {get_resource: enable_kube_proxy}
         - config: {get_resource: kube_ui_service}
         - config: {get_resource: kube_examples}

magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml

@@ -319,11 +319,11 @@ resources:
       group: ungrouped
       config: {get_file: ../../common/templates/kubernetes/fragments/network-service.sh}
 
-  enable_kube_podmaster:
+  enable_kube_controller_manager_scheduler:
     type: OS::Heat::SoftwareConfig
     properties:
       group: ungrouped
-      config: {get_file: ../../common/templates/kubernetes/fragments/enable-kube-podmaster.sh}
+      config: {get_file: ../../common/templates/kubernetes/fragments/enable-kube-controller-manager-scheduler.sh}
 
   kube_system_namespace_service:
     type: OS::Heat::SoftwareConfig
@@ -378,7 +378,7 @@ resources:
         - config: {get_resource: network_config_service}
         - config: {get_resource: network_service}
         - config: {get_resource: kube_system_namespace_service}
-        - config: {get_resource: enable_kube_podmaster}
+        - config: {get_resource: enable_kube_controller_manager_scheduler}
         - config: {get_resource: enable_kube_proxy}
         - config: {get_resource: kube_ui_service}
         - config: {get_resource: kube_examples}