From 0b3f545bf46fc227a3d1ff24ed02a26673e0df42 Mon Sep 17 00:00:00 2001 From: jackgr Date: Tue, 29 Mar 2016 21:14:59 -0700 Subject: [PATCH] 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 zcmV+g3;Oh%7Nr)DJb(R9+ent5{a1{rbOv2834|a;s!n^9p3t=vQPk54AvCckWDdvU zwa00r9{>BjH(wqnPQp>jYHzXBhIroh*St5AXzS-c-EO~od~~$cJ?kWEc z_;k-!?_h8|7#toR9}M9Aalbd%B1bPE+g4RdS^&!*rDGMbpMQUl=VU?)8O`Z5{dqjP zy>55V@2~X#VYhGmf7ClXJOKFK!BKaMyoeG1BEQ9ldH2&=j1I3jkaNM zdD6CgS&MbzqzZ!on&>h42g_Iiwt$r}zuQ5v**Ce1Z7;}RSAFZFb|;J4O{t70XfGoR z*qe}Fin|gC5n{*=$(3!!&6@}i7%Afkn^I+W^M9V?g~(YUIV+LUC6iT=8DhUE_7sAm zARlSQ$E=iuqKLo#^6>)!KY}2URsjBgqhH5LL6{M!BwtxrFmfkQV6eT82E|^*&*cgE zi&Z2b7V|Cn4p^nAikOw*kX+w91ZFsZHLDNHX4fIU3vV>47W8%jtX40ADA);`fT0em zU4KKqgqT@}>|g*d1gFv}mEmrnbl2GfYJ;w&)*iJzI*aEQ(^aJNt}|U zES92JqqEH(Ct$E3Xox=d^v18a_Mkj2Z>#(k2tlc*>1{e%6Ic$)27iZ~i%c=+<9`-X zx`Y|vYd>6WuC?XhQwev2wflph$=_*8vlvS@v762<&({?b2h^0Ne*Y*b4EWiF5~W5C zRMxa4gh{eR8=DM!wiIdK&z>(~j2bI*WkJox@-w7~=^{|VWd~o^%TG^?B}Ch0w}`XJ zoR2qaE9)h*Y%-5qcV$AAloe3;tbd~5D8ZKPiG7;QTo=?PSOb+$p_N6E}{CC z&rFgkCo_>&&{IrBmC4dn+7*>qgO;`|>oQ!#EB67Lmwr{QggG ziLk^$>D&qTv7y}yccT=W`g{lf)}1C)Im|9Y^I0tz(L85avg7%FsYaVb@pM_Lsm>4% zuBl~9XxWY>Vd**)yQHTKXMaQ`#*+-<+-OzTFVqCFCYbYr&v?pUmIXJxr)l|20bR1V zD!81VXue9t+5IS2|0t>ka9M|OS_~3XTT@486%#8^9^IXY121xiMwWt$k~`=!m3Mgl;<;+b)0EE zyLuLV?3sj>FQ%E@3V)RnV`wzRSJbMu!mye4Mx;HW9flUMGPN9IBs`Xu1Clk^c+jNp z9A`AG)VaizN_U#`{14X~Tu!tU*#>wn6#9~c}v0F1$h=2E{2v2_s^ zwV=(~s$d#rRWY?)h^x#Bu0GxkcRNH@Pj-y{Qm3c zpnG8M|GI~R0l@VJgTvSRzZZFUHWrvBlFJnGwY~xL?q?dm1^bW6spq;gL|V^sZ-|7R z@$OJH5P$3L4}*gJR&nU7hru3ECs9GrEWgb|9$kviG(&TN7U)UTGwnH!>|Sf*D5!>9 zOt}Orn+p~&8Gt2G(7aT73LBg5OHB5hg==Q+-1V`X^xay03Fsz6Fl&>gyIBK%rf^%X z#Eu(7`-j(#JVug*R&KEcj22oXpCov{h2H8eG=FL~Z5v7Xo#|?d&6e&-^3~y__A-6S zy^+#+HHECgY0;v1&g43ciOzt>IO3g%?=hti-WSjkM`C(p@u`W?zhU}VrdCgZu)U}A zNH-WhCM^m&Uq)Qn3OPEYrJJfVtW{BBx}H@Ki&t5`oFgGpMzdu}&(tLsiYAMSbwEFq z)ql|DGQfS>-}+dv3i)Q4}yL~(wa&gfq^|_D<9#jFB%dFtHV0&9W@JE zQ!hnHoA-!DpQyt=zd>$sUmV9MIWU!H;r|w{K$6Gvb zb0**M@?Py?=kGsbK0%E-wN-#(3fi!5v)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)