Move kustomize pattern to strategic merge;Fix regex patterns;Update description
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
c385baf630
commit
2f91c0f7c3
@ -104,8 +104,8 @@
|
||||
clustersize: >-
|
||||
{{ {
|
||||
'controlplane': vapp['deployment.type'] | regex_findall('^cp(\d)+') | first,
|
||||
'worker': vapp['deployment.type'] | regex_findall('w(\d)+$') | first,
|
||||
'workerstorage': vapp['deployment.type'] | regex_findall('ws(\d)+') | first
|
||||
'worker': vapp['deployment.type'] | regex_findall('w(\d)+') | first,
|
||||
'workerstorage': vapp['deployment.type'] | regex_findall('ws(\d)+$') | first
|
||||
} }}
|
||||
|
||||
- name: Generate workload cluster manifest
|
||||
|
@ -27,6 +27,17 @@ patchesStrategicMerge:
|
||||
mounts:
|
||||
- - LABEL=blockstorage
|
||||
- /mnt/blockstorage
|
||||
- |-
|
||||
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
|
||||
kind: VSphereMachineTemplate
|
||||
metadata:
|
||||
name: {{ _template.cluster.name }}-worker
|
||||
namespace: default
|
||||
spec:
|
||||
template:
|
||||
spec:
|
||||
additionalDisksGiB:
|
||||
- {{ _template.nodepool.additionaldisk }}
|
||||
|
||||
patchesJson6902:
|
||||
- target:
|
||||
@ -67,8 +78,3 @@ patchesJson6902:
|
||||
- op: replace
|
||||
path: /metadata/name
|
||||
value: {{ _template.cluster.name }}-worker-storage
|
||||
- op: add
|
||||
path: /spec/template/spec
|
||||
value:
|
||||
additionalDisksGiB:
|
||||
- {{ _template.nodepool.additionaldisk }}
|
||||
|
@ -6,7 +6,7 @@ DeploymentConfigurations:
|
||||
|
||||
- Id: cp1w1ws1
|
||||
Label: 'Workload-cluster: 1 control-plane node/1 worker node/1 worker-storage node'
|
||||
Description: 1 control-plane node/2 worker nodes
|
||||
Description: 1 control-plane node/1 worker node/1 worker-storage node
|
||||
|
||||
- Id: core
|
||||
Label: No workload-cluster
|
||||
|
Loading…
Reference in New Issue
Block a user