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

[Kubernetes] Rename minions to Kubernetes nodes

Browse Source 
Change-Id: I64b8b199d536bb56529c5b2c4d2879c8deac3cb8
Closes-Bug: #1466348
This commit is contained in:
Stan Lagun 2015-10-22 23:14:40 +03:00
parent 84e7e83cb6
commit 095dece649
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ Methods:
External: $.exposeCAdvisor External: $.exposeCAdvisor
- $._environment.securityGroupManager.addGroupIngress($securityGroupIngress) - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
- $._environment.reporter.report($, 'Setup Kubernetes Minion on {0}'.format($.instance.name)) - $._environment.reporter.report($, 'Setup Kubernetes Node on {0}'.format($.instance.name))
- $template: $resources.yaml('KubeMinionSetup.template').bind(dict( - $template: $resources.yaml('KubeMinionSetup.template').bind(dict(
name => $.instance.name, name => $.instance.name,
ip => $.getIp(), ip => $.getIp(),
@ -98,7 +98,7 @@ Methods:
Body: Body:
- If: $.getAttr(nodeConfigured, false) - If: $.getAttr(nodeConfigured, false)
Then: Then:
- $._environment.reporter.report($this, 'Deleting Kubernetes Minion') - $._environment.reporter.report($this, 'Deleting Kubernetes Node')
- $resources: new(sys:Resources) - $resources: new(sys:Resources)
- $template: $resources.yaml('EtcdRemoveMember.template').bind(dict( - $template: $resources.yaml('EtcdRemoveMember.template').bind(dict(
nodeId => $.getIp() nodeId => $.getIp()

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

@ -12,7 +12,7 @@
FormatVersion: 2.0.0 FormatVersion: 2.0.0
Version: 1.0.0 Version: 1.0.0
Name: Setup Kubernetes Minion Name: Setup Kubernetes Node
Parameters: Parameters:
name: $name name: $name

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

@ -12,7 +12,7 @@
FormatVersion: 2.0.0 FormatVersion: 2.0.0
Version: 1.0.0 Version: 1.0.0
Name: Remove Minion Name: Remove Kubernetes Node
Parameters: Parameters:
nodeId: $nodeId nodeId: $nodeId

2
Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh
View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
echo "Deleting a Minion" >> /tmp/murano-kube.log echo "Deleting Kubernetes Node" >> /tmp/murano-kube.log
/opt/bin/kubectl delete node $1 >> /tmp/murano-kube.log /opt/bin/kubectl delete node $1 >> /tmp/murano-kube.log

10
Kubernetes/KubernetesCluster/package/UI/ui.yaml
View File

@ -83,20 +83,20 @@ Forms:
underline are allowed underline are allowed
- name: minionCount - name: minionCount
type: integer type: integer
label: Initial/current number of minions label: Initial/current number of Kubernetes nodes
initial: 2 initial: 2
minValue: 1 minValue: 1
required: true required: true
description: >- description: >-
Select number of minions Select number of Kubernetes nodes
- name: maxMinionCount - name: maxMinionCount
type: integer type: integer
label: Maximum number of minions label: Maximum number of Kubernetes nodes
initial: 3 initial: 3
required: true required: true
minValue: 1 minValue: 1
description: >- description: >-
Select maximum number of minions Select maximum number of Kubernetes nodes
- name: assignFloatingIP - name: assignFloatingIP
type: boolean type: boolean
initial: true initial: true
@ -128,7 +128,7 @@ Forms:
type: integer type: integer
label: Initial/current number of gateway nodes label: Initial/current number of gateway nodes
initial: 1 initial: 1
minValue: 0 minValue: 1
required: true required: true
description: >- description: >-
External traffic will be routed through gateway nodes. External traffic will be routed through gateway nodes.