From d9f1fac36dc1319831657b3020833e4ee9673e73 Mon Sep 17 00:00:00 2001
From: jackgr <jackgr@google.com>
Date: Tue, 29 Mar 2016 20:58:26 -0700
Subject: [PATCH 1/3] Fix client property parsing

---
 cmd/helm/properties.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/helm/properties.go b/cmd/helm/properties.go
index 3e58352de..df8797f78 100644
--- a/cmd/helm/properties.go
+++ b/cmd/helm/properties.go
@@ -40,15 +40,15 @@ func parseProperties(kvstr string) (map[string]interface{}, error) {
 		// Allow for "k=v, k=v"
 		p = strings.TrimSpace(p)
 		pair := strings.Split(p, "=")
-		if len(pair) == 1 {
+		if len(pair) < 2 {
 			return properties, errInvalidProperty
 		}
 
 		// If the value looks int-like, convert it.
 		if i, err := strconv.Atoi(pair[1]); err == nil {
-			properties[pair[0]] = pair[1]
-		} else {
 			properties[pair[0]] = i
+		} else {
+			properties[pair[0]] = pair[1]
 		}
 	}
 

From 7cc0a496cf269dc31c91dffd335c6986ed3521e7 Mon Sep 17 00:00:00 2001
From: jackgr <jackgr@google.com>
Date: Tue, 29 Mar 2016 20:58:51 -0700
Subject: [PATCH 2/3] Fix replicatedservice namespace

---
 examples/charts/replicatedservice-3.tgz       | Bin 2848 -> 2843 bytes
 .../templates/replicatedservice.py            |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/charts/replicatedservice-3.tgz b/examples/charts/replicatedservice-3.tgz
index adc9cf39b0efab4db5b038d8fdfe76737ee3a745..c528450a290064441cc70aafb18c642d62212531 100644
GIT binary patch
delta 2811
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
N|Nl#f?3(~O006REW0(K{

delta 2816
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
S9RCdf0RR6Oac%<uIsgFUFKl!G

diff --git a/examples/charts/replicatedservice/templates/replicatedservice.py b/examples/charts/replicatedservice/templates/replicatedservice.py
index 7d20e3015..b5aa16831 100644
--- a/examples/charts/replicatedservice/templates/replicatedservice.py
+++ b/examples/charts/replicatedservice/templates/replicatedservice.py
@@ -41,9 +41,9 @@ def GenerateConfig(context):
       'properties': {
           'apiVersion': 'v1',
           'kind': 'Service',
-          'namespace': namespace,
           'metadata': {
               'name': service_name,
+              'namespace': namespace,
               'labels': GenerateLabels(context, service_name),
           },
           'spec': {

From 0b3f545bf46fc227a3d1ff24ed02a26673e0df42 Mon Sep 17 00:00:00 2001
From: jackgr <jackgr@google.com>
Date: Tue, 29 Mar 2016 21:14:59 -0700
Subject: [PATCH 3/3] Fix expansion test

---
 cmd/expandybird/expander/expander_test.go     |  62 +++++++++---------
 examples/charts/replicatedservice-3.tgz       | Bin 2843 -> 2853 bytes
 .../templates/replicatedservice.py            |  14 ++--
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/cmd/expandybird/expander/expander_test.go b/cmd/expandybird/expander/expander_test.go
index 337318fb4..52336d8e3 100644
--- a/cmd/expandybird/expander/expander_test.go
+++ b/cmd/expandybird/expander/expander_test.go
@@ -756,44 +756,16 @@ func TestReplicatedService(t *testing.T) {
 		&expansion.ServiceResponse{
 			Resources: []interface{}{
 				map[string]interface{}{
-					"type": "Service",
-					"name": "test_invocation-service",
-					"properties": map[string]interface{}{
-						"kind":       "Service",
-						"apiVersion": "v1",
-						"namespace":  "default",
-						"metadata": map[string]interface{}{
-							"name": "test_invocation-service",
-							"labels": map[string]interface{}{
-								"name": "test_invocation-service",
-							},
-						},
-						"spec": map[string]interface{}{
-							"ports": []interface{}{
-								map[string]interface{}{
-									"name":       "test_invocation",
-									"port":       1234.0,
-									"targetPort": 1234.0,
-								},
-							},
-							"selector": map[string]interface{}{
-								"name": "test_invocation",
-							},
-						},
-					},
-				},
-				map[string]interface{}{
-					"type": "ReplicationController",
 					"name": "test_invocation-rc",
 					"properties": map[string]interface{}{
-						"kind":       "ReplicationController",
 						"apiVersion": "v1",
-						"namespace":  "default",
+						"kind":       "ReplicationController",
 						"metadata": map[string]interface{}{
-							"name": "test_invocation-rc",
 							"labels": map[string]interface{}{
 								"name": "test_invocation-rc",
 							},
+							"name":      "test_invocation-rc",
+							"namespace": "default",
 						},
 						"spec": map[string]interface{}{
 							"replicas": 3.0,
@@ -824,6 +796,34 @@ func TestReplicatedService(t *testing.T) {
 							},
 						},
 					},
+					"type": "ReplicationController",
+				},
+				map[string]interface{}{
+					"name": "test_invocation-service",
+					"properties": map[string]interface{}{
+						"apiVersion": "v1",
+						"kind":       "Service",
+						"metadata": map[string]interface{}{
+							"labels": map[string]interface{}{
+								"name": "test_invocation-service",
+							},
+							"name":      "test_invocation-service",
+							"namespace": "default",
+						},
+						"spec": map[string]interface{}{
+							"ports": []interface{}{
+								map[string]interface{}{
+									"name":       "test_invocation",
+									"port":       1234.0,
+									"targetPort": 1234.0,
+								},
+							},
+							"selector": map[string]interface{}{
+								"name": "test_invocation",
+							},
+						},
+					},
+					"type": "Service",
 				},
 			},
 		},
diff --git a/examples/charts/replicatedservice-3.tgz b/examples/charts/replicatedservice-3.tgz
index c528450a290064441cc70aafb18c642d62212531..ebbcc18025ca3f2c54477a376ab43bc5109a2bb4 100644
GIT binary patch
delta 2821
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
X^?7~%oX>v)00960Bx?#B06G8wVt91{

delta 2811
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
N|Nl#f?3(~O008MiW1Rp1

diff --git a/examples/charts/replicatedservice/templates/replicatedservice.py b/examples/charts/replicatedservice/templates/replicatedservice.py
index b5aa16831..73fc6203d 100644
--- a/examples/charts/replicatedservice/templates/replicatedservice.py
+++ b/examples/charts/replicatedservice/templates/replicatedservice.py
@@ -37,20 +37,20 @@ def GenerateConfig(context):
 
   service = {
       'name': service_name,
-      'type': service_type,
       'properties': {
           'apiVersion': 'v1',
           'kind': 'Service',
           'metadata': {
+              'labels': GenerateLabels(context, service_name),
               'name': service_name,
               'namespace': namespace,
-              'labels': GenerateLabels(context, service_name),
           },
           'spec': {
               'ports': [GenerateServicePorts(context, container_name)],
               'selector': GenerateLabels(context, name)
           }
-      }
+      },
+      'type': service_type,
   }
   set_up_external_lb = context.properties.get('external_service', None)
   if set_up_external_lb:
@@ -58,7 +58,6 @@ def GenerateConfig(context):
   cluster_ip = context.properties.get('cluster_ip', None)
   if cluster_ip:
     service['properties']['spec']['clusterIP'] = cluster_ip
-  config['resources'].append(service)
 
   rc = {
       'name': rc_name,
@@ -66,10 +65,10 @@ def GenerateConfig(context):
       'properties': {
           'apiVersion': 'v1',
           'kind': 'ReplicationController',
-          'namespace': namespace,
           'metadata': {
-              'name': rc_name,
               'labels': GenerateLabels(context, rc_name),
+              'name': rc_name,
+              'namespace': namespace,
           },
           'spec': {
               'replicas': context.properties['replicas'],
@@ -82,8 +81,8 @@ def GenerateConfig(context):
                       'containers': [
                           {
                               'env': GenerateEnv(context),
-                              'name': container_name,
                               'image': context.properties['image'],
+                              'name': container_name,
                               'ports': [
                                   {
                                       'name': container_name,
@@ -121,6 +120,7 @@ def GenerateConfig(context):
     }
 
   config['resources'].append(rc)
+  config['resources'].append(service)
   return yaml.dump(config)