Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Simon Rüegg <[email protected]>
  • Loading branch information
corvus-ch and Simon Rüegg authored Jul 2, 2020
1 parent b4c24ee commit ab42945
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions component/main.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ local machineSet = function(name, set)
},
},
spec+: {
metadata+: {
labels+: {
'machine.openshift.io/cluster-api-machine-role': role,
},
},
providerSpec+: {
value+: {
machineType: set.instanceType,
Expand Down
10 changes: 5 additions & 5 deletions docs/modules/ROOT/pages/references/parameters.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ The parent key for all of the following parameters is `openshift4_nodes`.
[CAUTION]
====
This component relies on deep merge of values from several parameters and hierarchy layers.
This works pretty strait forward for scalar values and dictionaries.
This works pretty straightforward for scalar values and dictionaries.
Values of arrays will be appended to each other.
There is no way to override values of set on lover precedence location.
There is no way to override values which were set on a lower precedence location.
====

== `availabilityZones`
Expand Down Expand Up @@ -52,8 +52,8 @@ See also https://github.com/appuio/component-openshift4-nodes/issues/2[Get a clu

[TIP]
====
This is most like to be configured on cluster level itself.
Configuring that higher up in the hierarchy, can result in unexpected behavior.
This is most likely to be configured on cluster level itself.
Configuring this higher up in the hierarchy can result in unexpected behavior.
====

== `namespace`
Expand Down Expand Up @@ -116,7 +116,7 @@ type:: string
default:: worker

The role of the created Nodes.
The value will be added as the `node-role.kubernetes.io/<role>: ""` label to node.
The value will be added as the `node-role.kubernetes.io/<role>: ""` label to nodes.

[NOTE]
====
Expand Down

0 comments on commit ab42945

Please sign in to comment.