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

Fixed issue re-setup the network 

Then you scale nodes down or up,
network re-setup

Change-Id: Iad68e5e7a7c3d197576aec980943aff40d4c2b50
This commit is contained in:
Artem Tiumentcev 2017-02-09 18:22:25 +03:00
parent 2d32a114e8
commit 5ca09f16f8
3 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml
View File

@ -57,6 +57,8 @@ Methods:
setupCalico: setupCalico:
Body: Body:
- If: not $.getAttr(calicoSetup, false)
Then:
- $._environment.reporter.report($this, 'Setup Calico network on gateway node {0}'.format($.instance.name)) - $._environment.reporter.report($this, 'Setup Calico network on gateway node {0}'.format($.instance.name))
- $resources: new(sys:Resources) - $resources: new(sys:Resources)
- $template: $resources.yaml('SetupCalicoNode.template').bind(dict( - $template: $resources.yaml('SetupCalicoNode.template').bind(dict(
@ -65,14 +67,19 @@ Methods:
)) ))
- $.instance.agent.call($template, $resources) - $.instance.agent.call($template, $resources)
- $._enableCalicoTraffic() - $._enableCalicoTraffic()
- $.setAttr(calicoSetup, true)
setupFlannel: setupFlannel:
Body: Body:
- If: not $.getAttr(flannelSetup, false)
Then:
- $._environment.reporter.report($this, 'Setup Flannel network on gateway node {0}'.format($.instance.name)) - $._environment.reporter.report($this, 'Setup Flannel network on gateway node {0}'.format($.instance.name))
- $resources: new(sys:Resources) - $resources: new(sys:Resources)
- $template: $resources.yaml('SetupFlannelNode.template') - $template: $resources.yaml('SetupFlannelNode.template')
- $.instance.agent.call($template, $resources) - $.instance.agent.call($template, $resources)
- $.setAttr(flannelSetup, true)
setupNode: setupNode:

7
Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
View File

@ -65,6 +65,8 @@ Methods:
setupCalico: setupCalico:
Body: Body:
- If: not $.getAttr(calicoSetup, false)
Then:
- $._environment.reporter.report($this, 'Setup Calico network on node {0}'.format($.instance.name)) - $._environment.reporter.report($this, 'Setup Calico network on node {0}'.format($.instance.name))
- $resources: new(sys:Resources) - $resources: new(sys:Resources)
- $template: $resources.yaml('SetupCalicoNode.template').bind(dict( - $template: $resources.yaml('SetupCalicoNode.template').bind(dict(
@ -73,14 +75,19 @@ Methods:
)) ))
- $.instance.agent.call($template, $resources) - $.instance.agent.call($template, $resources)
- $._enableCalicoTraffic() - $._enableCalicoTraffic()
- $.setAttr(calicoSetup, true)
setupFlannel: setupFlannel:
Body: Body:
- If: not $.getAttr(flannelSetup, false)
Then:
- $._environment.reporter.report($this, 'Setup Flannel network on node {0}'.format($.instance.name)) - $._environment.reporter.report($this, 'Setup Flannel network on node {0}'.format($.instance.name))
- $resources: new(sys:Resources) - $resources: new(sys:Resources)
- $template: $resources.yaml('SetupFlannelNode.template') - $template: $resources.yaml('SetupFlannelNode.template')
- $.instance.agent.call($template, $resources) - $.instance.agent.call($template, $resources)
- $.setAttr(flannelSetup, true)
setupNode: setupNode:

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

@ -18,7 +18,7 @@ Parameters:
nodeId: $nodeId nodeId: $nodeId
Body: | Body: |
removeMinion(args.nodeId) removeMinion('{0}'.format(args.nodeId))
Scripts: Scripts:
removeMinion: removeMinion: