x/k8s-docker-suite-app-murano
Code Issues Proposed changes

Fixes k8s deployment without Replication Controller

Browse Source 
UpdatePod execution plan was using field from Pod
definition that was present in v1beta1 API but is no
longer used in v1beta3

Change-Id: Ib57a0e5cc7104d5e1fa39b07644eab182a7fdf45
Closes-Bug: #1447594
(cherry picked from commit a680bf5899e006ff1e3ecf1ee3e3c7cce4a9bebb)
This commit is contained in:
Stan Lagun 2015-04-23 17:45:58 +03:00
parent b0655459b9
commit a143180618
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kubernetes/KubernetesCluster/package/Resources/UpdatePod.template
View File

@ -25,7 +25,7 @@ Body: |
with open(fileName, 'w') as f: with open(fileName, 'w') as f:
json.dump(args.podDefinition, f) json.dump(args.podDefinition, f)
return updatePod('{0} {1} {2} {3}'.format(args.isNew, args.podDefinition['id'], args.podDefinition['kind'], fileName )).stdout return updatePod('{0} {1} {2}'.format(args.isNew, args.podDefinition['metadata']['name'], fileName)).stdout
Scripts: Scripts:
updatePod: updatePod:

5
Kubernetes/KubernetesCluster/package/Resources/scripts/updatePod.sh
View File

@ -6,9 +6,8 @@ DEFINITION_DIR=/var/run/murano-kubernetes
mkdir -p $DEFINITION_DIR mkdir -p $DEFINITION_DIR
podId=$2 podId=$2
kind=$3 fileName=$3
fileName=$4 echo "$podId Pod $fileName" >> $DEFINITION_DIR/elements.list
echo "$podId $kind $fileName" >> $DEFINITION_DIR/elements.list
if [ "$1" == "True" ]; then if [ "$1" == "True" ]; then
#new Pod #new Pod