diff --git a/base/calico/ippool.yaml b/base/calico/ippool.yaml deleted file mode 100644 index 7dc1c96..0000000 --- a/base/calico/ippool.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: projectcalico.org/v3 -items: -- apiVersion: projectcalico.org/v3 - kind: IPPool - metadata: - name: default-ipv4-ippool - spec: - cidr: 192.0.0.0/16 - ipipMode: Always - natOutgoing: true - disabled: true -- apiVersion: projectcalico.org/v3 - kind: IPPool - metadata: - name: pod-ip-pool - spec: - cidr: 10.244.0.0/24 - ipipMode: Always - natOutgoing: true diff --git a/base/calico/kustomization.yaml b/base/calico/kustomization.yaml index 39c29ab..7aff301 100644 --- a/base/calico/kustomization.yaml +++ b/base/calico/kustomization.yaml @@ -1,3 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + resources: - - https://raw.githubusercontent.com/projectcalico/calico/v3.24.5/manifests/calico.yaml - - ippool.yaml + - https://raw.githubusercontent.com/projectcalico/calico/v3.24.5/manifests/calico.yaml \ No newline at end of file diff --git a/base/metallb/advertise.yaml b/base/ipadresspool/advertise.yaml similarity index 100% rename from base/metallb/advertise.yaml rename to base/ipadresspool/advertise.yaml diff --git a/base/metallb/ipaddresspoool.yaml b/base/ipadresspool/ipaddresspoool.yaml similarity index 100% rename from base/metallb/ipaddresspoool.yaml rename to base/ipadresspool/ipaddresspoool.yaml diff --git a/base/ipadresspool/kustomization.yaml b/base/ipadresspool/kustomization.yaml new file mode 100644 index 0000000..df9be42 --- /dev/null +++ b/base/ipadresspool/kustomization.yaml @@ -0,0 +1,5 @@ +namespace: metallb-system + +resources: + - ipaddresspoool.yaml + - advertise.yaml diff --git a/base/kustomization.yaml b/base/kustomization.yaml index 9584139..a6e31d3 100644 --- a/base/kustomization.yaml +++ b/base/kustomization.yaml @@ -3,9 +3,10 @@ kind: Kustomization bases: - ./calico + - ./metallb - https://github.com/cert-manager/cert-manager/releases/download/v1.10.0/cert-manager.yaml - ./postgresql - ./redis - - ./metallb - ./minio - ./nginx + - ./ipaddresspool