Merge "Fixing volume entry definitions"

Docker/DockerInterfacesLibrary/package/Classes/DockerHostVolume.yaml

@@ -24,7 +24,7 @@ Properties:
 Methods:
   getType:
     Body:
-      Return: HostDir
+      Return: HostPath
 
   getParameters:
     Body:

Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/patchService.sh

@@ -3,4 +3,4 @@
 # $1 - service name
 # $2 - publicIPs JSON
 
-/opt/bin/kubectl update service "$1" --patch="$2"
+/opt/bin/kubectl replace service "$1" --patch="$2"

Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/updatePod.sh

@@ -15,5 +15,5 @@ if [ "$1" == "True" ]; then
   /opt/bin/kubectl create -f "${fileName}" >> /tmp/murano-kube.log
 else
   echo "Updating a Pod" >> /tmp/murano-kube.log
-  /opt/bin/kubectl update -f "${fileName}" >> /tmp/murano-kube.log
+  /opt/bin/kubectl replace -f "${fileName}" >> /tmp/murano-kube.log
 fi

Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/updateReplicationController.sh

@@ -3,6 +3,6 @@ if [ "$1" == "True" ]; then
   echo "Creating a new Replication Controller" >> /tmp/murano-kube.log
   /opt/bin/kubectl create -f /tmp/controller.json >> /tmp/murano-kube.log
 else
-  echo "Updating a Replication Controller" >> /tmp/murano-kube.log
-  /opt/bin/kubectl update -f /tmp/controller.json >> /tmp/murano-kube.log
+  echo "Replacing a Replication Controller" >> /tmp/murano-kube.log
+  /opt/bin/kubectl replace -f /tmp/controller.json >> /tmp/murano-kube.log
 fi

Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/updateService.sh

@@ -14,5 +14,5 @@ if [ "$1" == "True" ]; then
   /opt/bin/kubectl create -f "${fileName}" >> /tmp/murano-kube.log
 else
   echo "Updating a Service" >> /tmp/murano-kube.log
-  /opt/bin/kubectl update -f "${fileName}" >> /tmp/murano-kube.log
+  /opt/bin/kubectl replace -f "${fileName}" >> /tmp/murano-kube.log
 fi

Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/updatePod.sh

@@ -20,5 +20,5 @@ if [ "$1" == "True" ]; then
   /opt/bin/kubectl create -f /tmp/pod.json >> /tmp/murano-kube.log
 else
   echo "Updating a Pod" >> /tmp/murano-kube.log
-  /opt/bin/kubectl update -f /tmp/pod.json >> /tmp/murano-kube.log
+  /opt/bin/kubectl replace -f /tmp/pod.json >> /tmp/murano-kube.log
 fi

Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/updateReplicationController.sh

@@ -16,5 +16,5 @@ if [ "$1" == "True" ]; then
   /opt/bin/kubectl create -f /tmp/controller.json >> /tmp/murano-kube.log
 else
   echo "Updating a Replication Controller" >> /tmp/murano-kube.log
-  /opt/bin/kubectl update -f /tmp/controller.json >> /tmp/murano-kube.log
+  /opt/bin/kubectl replace -f /tmp/controller.json >> /tmp/murano-kube.log
 fi

Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/updateService.sh

@@ -16,5 +16,5 @@ if [ "$1" == "True" ]; then
   /opt/bin/kubectl create -f /tmp/service.json >> /tmp/murano-kube.log
 else
   echo "Updating a Service" >> /tmp/murano-kube.log
-  /opt/bin/kubectl update -f /tmp/service.json >> /tmp/murano-kube.log
+  /opt/bin/kubectl replace -f /tmp/service.json >> /tmp/murano-kube.log
 fi

Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml

@@ -169,9 +169,9 @@ Methods:
       - $type: $volume.getType()
       - Value: $type
         Match:
-          HostDir:
+          HostPath:
             - $spec:
-                hostDir:
+                hostPath:
                   path: $volume.getParameters()
           TempVolume:
             - $spec:
@@ -179,9 +179,10 @@ Methods:
         Default:
           - Throw: UnknownDockerVolumeType
             Message: format('Unknown docker volume type {0}', $type)
-      - Return:
+      - $result:
           name: $._generateVolumeName($name, $volume)
-          source: $spec
+
+      - Return: $result.mergeWith($spec)
 
 
   _deleteContainer:

Docker/Kubernetes/README.rst

@@ -176,7 +176,7 @@ deploying both Kubernetes and it's nodes.
 
     Check each port in applicationPorts and creates or updates it if the port
     differs from what it was before (or did not exist). Calls
-    `kubectl update` or `kubectl create` on master node.
+    `kubectl replace` or `kubectl create` on master node.
 
 `deleteServices(applicationName, podId)`
     * `applicationName` a string holding application's name,