Include IPAM in-cluster provider
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Danny Bessems 2022-12-04 11:22:17 +01:00
parent f3224416cb
commit f68189e3b7
4 changed files with 21 additions and 1 deletions

View File

@ -47,6 +47,11 @@
# Finally, workload clusters will need a CNI plugin # Finally, workload clusters will need a CNI plugin
- url: https://raw.githubusercontent.com/projectcalico/calico/{{ components.clusterapi.workload.version.calico }}/manifests/calico.yaml - url: https://raw.githubusercontent.com/projectcalico/calico/{{ components.clusterapi.workload.version.calico }}/manifests/calico.yaml
dest: cni-calico/{{ components.clusterapi.workload.version.calico }}/calico.yaml dest: cni-calico/{{ components.clusterapi.workload.version.calico }}/calico.yaml
# IPAM in-cluster provider (w/ metadata.yaml)
- url: https://github.com/telekom/cluster-api-ipam-provider-in-cluster/releases/download/{{ components.clusterapi.management.version.ipam_incluster }}/ipam-components.yaml
dest: ipam-incluster/{{ components.clusterapi.management.version.ipam_incluster }}/ipam-components.yaml
- url: https://github.com/telekom/cluster-api-ipam-provider-in-cluster/releases/download/{{ components.clusterapi.management.version.ipam_incluster }}/metadata.yaml
dest: ipam-incluster/{{ components.clusterapi.management.version.ipam_incluster }}/metadata.yaml
loop_control: loop_control:
label: "{{ item.url | basename }}" label: "{{ item.url | basename }}"
retries: 5 retries: 5

View File

@ -8,6 +8,7 @@
base: "{{ components.clusterapi.management.version.base }}" base: "{{ components.clusterapi.management.version.base }}"
cert_manager: "{{ components.clusterapi.management.version.cert_manager }}" cert_manager: "{{ components.clusterapi.management.version.cert_manager }}"
infrastructure_vsphere: "{{ components.clusterapi.management.version.infrastructure_vsphere }}" infrastructure_vsphere: "{{ components.clusterapi.management.version.infrastructure_vsphere }}"
ipam_incluster: "{{ components.clusterapi.management.version.ipam_incluster }}"
hv: hv:
fqdn: "{{ vapp['hv.fqdn'] }}" fqdn: "{{ vapp['hv.fqdn'] }}"
tlsthumbprint: "{{ tls_thumbprint.stdout }}" tlsthumbprint: "{{ tls_thumbprint.stdout }}"
@ -26,5 +27,11 @@
- name: Initialize Cluster API management cluster - name: Initialize Cluster API management cluster
ansible.builtin.shell: ansible.builtin.shell:
cmd: clusterctl init -v5 -i vsphere:{{ components.clusterapi.management.version.infrastructure_vsphere }} --config ./clusterctl.yaml --kubeconfig {{ kubeconfig.path }} cmd: >-
clusterctl init \
-v5 \
--infrastructure vsphere:{{ components.clusterapi.management.version.infrastructure_vsphere }} \
--ipam in-cluster:{{ components.clusterapi.management.version.ipam_incluster }}
--config ./clusterctl.yaml \
--kubeconfig {{ kubeconfig.path }}
chdir: /opt/metacluster/cluster-api chdir: /opt/metacluster/cluster-api

View File

@ -11,6 +11,9 @@ providers:
- name: "vsphere" - name: "vsphere"
url: "/opt/metacluster/cluster-api/infrastructure-vsphere/{{ _template.version.infrastructure_vsphere }}/infrastructure-components.yaml" url: "/opt/metacluster/cluster-api/infrastructure-vsphere/{{ _template.version.infrastructure_vsphere }}/infrastructure-components.yaml"
type: "InfrastructureProvider" type: "InfrastructureProvider"
- name: "in-cluster"
url: "/opt/metacluster/cluster-api/ipam-incluster/{{ _template.version.ipam_incluster }}/ipam-components.yaml"
type: "IPAMProvider"
cert-manager: cert-manager:
url: "/opt/metacluster/cluster-api/cert-manager/{{ _template.version.cert_manager }}/cert-manager.yaml" url: "/opt/metacluster/cluster-api/cert-manager/{{ _template.version.cert_manager }}/cert-manager.yaml"

View File

@ -87,6 +87,7 @@ components:
# Must match the version referenced at `components.cert-manager.helm.version` # Must match the version referenced at `components.cert-manager.helm.version`
cert_manager: v1.10.1 cert_manager: v1.10.1
infrastructure_vsphere: v1.5.0 infrastructure_vsphere: v1.5.0
ipam_incluster: v0.1.0-alpha.1
workload: workload:
version: version:
calico: v3.24.5 calico: v3.24.5
@ -147,6 +148,10 @@ components:
harborAdminPassword: "{{ vapp['guestinfo.rootpw'] }}" harborAdminPassword: "{{ vapp['guestinfo.rootpw'] }}"
notary: notary:
enabled: false enabled: false
persistence:
persistentVolumeClaim:
registry:
size: 25Gi
longhorn: longhorn:
helm: helm: