djpbessems/Packer.Images
djpbessems/Packer.Images
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Refactor kustomize templates
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Danny Bessems 2023-07-06 12:58:31 +02:00
parent 31b21c9b7a
commit 7482054904
2 changed files with 165 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.cluster-template.j2
View File

@ -3,8 +3,8 @@ kind: Kustomization
resources: resources:
- cluster-template.yaml - cluster-template.yaml
patchesStrategicMerge: patches:
- |- - patch: |-
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
@ -32,7 +32,7 @@ patchesStrategicMerge:
[Network] [Network]
public-network = "${VSPHERE_NETWORK}" public-network = "${VSPHERE_NETWORK}"
type: Opaque type: Opaque
- |- - patch: |-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
kind: KubeadmControlPlane kind: KubeadmControlPlane
metadata: metadata:
@ -42,7 +42,7 @@ patchesStrategicMerge:
kubeadmConfigSpec: kubeadmConfigSpec:
clusterConfiguration: clusterConfiguration:
imageRepository: registry.{{ _template.network.fqdn }}/kubeadm imageRepository: registry.{{ _template.network.fqdn }}/kubeadm
- |- - patch: |-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
metadata: metadata:
@ -53,7 +53,7 @@ patchesStrategicMerge:
spec: spec:
clusterConfiguration: clusterConfiguration:
imageRepository: registry.{{ _template.network.fqdn }}/kubeadm imageRepository: registry.{{ _template.network.fqdn }}/kubeadm
- |- - patch: |-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
metadata: metadata:
@ -86,7 +86,7 @@ patchesStrategicMerge:
{{ _template.rootca | indent(width=14, first=False) | trim }} {{ _template.rootca | indent(width=14, first=False) | trim }}
owner: root:root owner: root:root
path: /usr/local/share/ca-certificates/root_ca.crt path: /usr/local/share/ca-certificates/root_ca.crt
- |- - patch: |-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: VSphereMachineTemplate kind: VSphereMachineTemplate
metadata: metadata:
@ -105,7 +105,7 @@ patchesStrategicMerge:
nameservers: nameservers:
- {{ _template.network.dnsserver }} - {{ _template.network.dnsserver }}
networkName: '${VSPHERE_NETWORK}' networkName: '${VSPHERE_NETWORK}'
- |- - patch: |-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: VSphereMachineTemplate kind: VSphereMachineTemplate
metadata: metadata:
@ -125,132 +125,131 @@ patchesStrategicMerge:
- {{ _template.network.dnsserver }} - {{ _template.network.dnsserver }}
networkName: '${VSPHERE_NETWORK}' networkName: '${VSPHERE_NETWORK}'
patchesJson6902: - target:
- target: group: controlplane.cluster.x-k8s.io
group: controlplane.cluster.x-k8s.io version: v1beta1
version: v1beta1 kind: KubeadmControlPlane
kind: KubeadmControlPlane name: .*
name: .* patch: |-
patch: |- - op: add
- op: add path: /spec/kubeadmConfigSpec/files/-
path: /spec/kubeadmConfigSpec/files/- value:
value: content: |
content: | [plugins."io.containerd.grpc.v1.cri".registry]
[plugins."io.containerd.grpc.v1.cri".registry] config_path = "/etc/containerd/certs.d"
config_path = "/etc/containerd/certs.d" append: true
append: true path: /etc/containerd/config.toml
path: /etc/containerd/config.toml
{% for registry in _template.registries %} {% for registry in _template.registries %}
- op: add - op: add
path: /spec/kubeadmConfigSpec/files/- path: /spec/kubeadmConfigSpec/files/-
value: value:
content: | content: |
server = "https://{{ registry }}" server = "https://{{ registry }}"
[host."https://registry.{{ _template.network.fqdn }}/v2/library/{{ registry }}"] [host."https://registry.{{ _template.network.fqdn }}/v2/library/{{ registry }}"]
capabilities = ["pull", "resolve"] capabilities = ["pull", "resolve"]
override_path = true override_path = true
owner: root:root owner: root:root
path: /etc/containerd/certs.d/{{ registry }}/hosts.toml path: /etc/containerd/certs.d/{{ registry }}/hosts.toml
{% endfor %} {% endfor %}
- op: add - op: add
path: /spec/kubeadmConfigSpec/files/- path: /spec/kubeadmConfigSpec/files/-
value: value:
content: | content: |
network: {config: disabled} network: {config: disabled}
owner: root:root owner: root:root
path: /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg path: /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
- op: add - op: add
path: /spec/kubeadmConfigSpec/files/- path: /spec/kubeadmConfigSpec/files/-
value: value:
content: | content: |
{{ _template.rootca | indent(width=12, first=False) | trim }} {{ _template.rootca | indent(width=12, first=False) | trim }}
owner: root:root owner: root:root
path: /usr/local/share/ca-certificates/root_ca.crt path: /usr/local/share/ca-certificates/root_ca.crt
- target: - target:
group: bootstrap.cluster.x-k8s.io group: bootstrap.cluster.x-k8s.io
version: v1beta1 version: v1beta1
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
name: .* name: .*
patch: |- patch: |-
{% for cmd in _template.runcmds %} {% for cmd in _template.runcmds %}
- op: add - op: add
path: /spec/template/spec/preKubeadmCommands/- path: /spec/template/spec/preKubeadmCommands/-
value: {{ cmd }} value: {{ cmd }}
{% endfor %} {% endfor %}
- target: - target:
group: controlplane.cluster.x-k8s.io group: controlplane.cluster.x-k8s.io
version: v1beta1 version: v1beta1
kind: KubeadmControlPlane kind: KubeadmControlPlane
name: .* name: .*
patch: |- patch: |-
{% for cmd in _template.runcmds %} {% for cmd in _template.runcmds %}
- op: add - op: add
path: /spec/kubeadmConfigSpec/preKubeadmCommands/- path: /spec/kubeadmConfigSpec/preKubeadmCommands/-
value: {{ cmd }} value: {{ cmd }}
{% endfor %} {% endfor %}
- target: - target:
group: infrastructure.cluster.x-k8s.io group: infrastructure.cluster.x-k8s.io
version: v1beta1 version: v1beta1
kind: VSphereMachineTemplate kind: VSphereMachineTemplate
name: \${CLUSTER_NAME} name: \${CLUSTER_NAME}
patch: |- patch: |-
- op: replace - op: replace
path: /metadata/name path: /metadata/name
value: ${CLUSTER_NAME}-master value: ${CLUSTER_NAME}-master
- target: - target:
group: controlplane.cluster.x-k8s.io group: controlplane.cluster.x-k8s.io
version: v1beta1 version: v1beta1
kind: KubeadmControlPlane kind: KubeadmControlPlane
name: \${CLUSTER_NAME} name: \${CLUSTER_NAME}
patch: |- patch: |-
- op: replace - op: replace
path: /metadata/name path: /metadata/name
value: ${CLUSTER_NAME}-master value: ${CLUSTER_NAME}-master
- op: replace - op: replace
path: /spec/machineTemplate/infrastructureRef/name path: /spec/machineTemplate/infrastructureRef/name
value: ${CLUSTER_NAME}-master value: ${CLUSTER_NAME}-master
- target: - target:
group: cluster.x-k8s.io group: cluster.x-k8s.io
version: v1beta1 version: v1beta1
kind: Cluster kind: Cluster
name: \${CLUSTER_NAME} name: \${CLUSTER_NAME}
patch: |- patch: |-
- op: replace - op: replace
path: /spec/controlPlaneRef/name path: /spec/controlPlaneRef/name
value: ${CLUSTER_NAME}-master value: ${CLUSTER_NAME}-master
- target: - target:
group: infrastructure.cluster.x-k8s.io group: infrastructure.cluster.x-k8s.io
version: v1beta1 version: v1beta1
kind: VSphereMachineTemplate kind: VSphereMachineTemplate
name: \${CLUSTER_NAME}-worker name: \${CLUSTER_NAME}-worker
patch: |- patch: |-
- op: replace - op: replace
path: /spec/template/spec/numCPUs path: /spec/template/spec/numCPUs
value: {{ _template.nodesize.cpu }} value: {{ _template.nodesize.cpu }}
- op: replace - op: replace
path: /spec/template/spec/memoryMiB path: /spec/template/spec/memoryMiB
value: {{ _template.nodesize.memory }} value: {{ _template.nodesize.memory }}
- target: - target:
group: cluster.x-k8s.io group: cluster.x-k8s.io
version: v1beta1 version: v1beta1
kind: MachineDeployment kind: MachineDeployment
name: \${CLUSTER_NAME}-md-0 name: \${CLUSTER_NAME}-md-0
patch: |- patch: |-
- op: replace - op: replace
path: /metadata/name path: /metadata/name
value: ${CLUSTER_NAME}-worker value: ${CLUSTER_NAME}-worker
- op: replace - op: replace
path: /spec/template/spec/bootstrap/configRef/name path: /spec/template/spec/bootstrap/configRef/name
value: ${CLUSTER_NAME}-worker value: ${CLUSTER_NAME}-worker
- target: - target:
group: bootstrap.cluster.x-k8s.io group: bootstrap.cluster.x-k8s.io
version: v1beta1 version: v1beta1
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
name: \${CLUSTER_NAME}-md-0 name: \${CLUSTER_NAME}-md-0
patch: |- patch: |-
- op: replace - op: replace
path: /metadata/name path: /metadata/name
value: ${CLUSTER_NAME}-worker value: ${CLUSTER_NAME}-worker

79
ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.nodepool.j2
View File

@ -5,8 +5,8 @@ resources:
- manifests/machinedeployment-{{ _template.cluster.name }}-worker.yaml - manifests/machinedeployment-{{ _template.cluster.name }}-worker.yaml
- manifests/vspheremachinetemplate-{{ _template.cluster.name }}-worker.yaml - manifests/vspheremachinetemplate-{{ _template.cluster.name }}-worker.yaml
patchesStrategicMerge: patches:
- |- - patch: |-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
metadata: metadata:
@ -31,7 +31,7 @@ patchesStrategicMerge:
mounts: mounts:
- - LABEL=blockstorage - - LABEL=blockstorage
- /mnt/blockstorage - /mnt/blockstorage
- |- - patch: |-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: VSphereMachineTemplate kind: VSphereMachineTemplate
metadata: metadata:
@ -43,42 +43,41 @@ patchesStrategicMerge:
additionalDisksGiB: additionalDisksGiB:
- {{ _template.nodepool.additionaldisk }} - {{ _template.nodepool.additionaldisk }}
patchesJson6902: - target:
- target: group: bootstrap.cluster.x-k8s.io
group: bootstrap.cluster.x-k8s.io version: v1beta1
version: v1beta1 kind: KubeadmConfigTemplate
kind: KubeadmConfigTemplate name: {{ _template.cluster.name }}-worker
name: {{ _template.cluster.name }}-worker patch: |-
patch: |- - op: replace
- op: replace path: /metadata/name
path: /metadata/name value: {{ _template.cluster.name }}-worker-storage
value: {{ _template.cluster.name }}-worker-storage
- target: - target:
group: cluster.x-k8s.io group: cluster.x-k8s.io
version: v1beta1 version: v1beta1
kind: MachineDeployment kind: MachineDeployment
name: {{ _template.cluster.name }}-worker name: {{ _template.cluster.name }}-worker
patch: |- patch: |-
- op: replace - op: replace
path: /metadata/name path: /metadata/name
value: {{ _template.cluster.name }}-worker-storage value: {{ _template.cluster.name }}-worker-storage
- op: replace - op: replace
path: /spec/template/spec/bootstrap/configRef/name path: /spec/template/spec/bootstrap/configRef/name
value: {{ _template.cluster.name }}-worker-storage value: {{ _template.cluster.name }}-worker-storage
- op: replace - op: replace
path: /spec/template/spec/infrastructureRef/name path: /spec/template/spec/infrastructureRef/name
value: {{ _template.cluster.name }}-worker-storage value: {{ _template.cluster.name }}-worker-storage
- op: replace - op: replace
path: /spec/replicas path: /spec/replicas
value: {{ _template.nodepool.size }} value: {{ _template.nodepool.size }}
- target: - target:
group: infrastructure.cluster.x-k8s.io group: infrastructure.cluster.x-k8s.io
version: v1beta1 version: v1beta1
kind: VSphereMachineTemplate kind: VSphereMachineTemplate
name: {{ _template.cluster.name }}-worker name: {{ _template.cluster.name }}-worker
patch: |- patch: |-
- op: replace - op: replace
path: /metadata/name path: /metadata/name
value: {{ _template.cluster.name }}-worker-storage value: {{ _template.cluster.name }}-worker-storage