From e26ea309ae1e3cc3b9f387b54b017bfd83334027 Mon Sep 17 00:00:00 2001 From: David Landry Date: Sun, 21 Sep 2025 16:07:34 -0400 Subject: [PATCH] chore(mgmt): move metallb to cluster resource space --- apps/metallb/overlays/system/config.json | 11 ----------- .../system/crd-bgppeers.patch-caBundle.yaml | 10 ---------- .../overlays/system/kustomization.yaml | 6 ------ .../k8s-home}/kustomization.yaml | 3 ++- .../k8s-home/metallb/kustomization.yaml | 7 +++++++ .../k8s-home/metallb/pool.external.yaml | 18 ++++++++++++++++++ .../k8s-home/metallb/pool.internal.yaml | 19 +++++++++++++++++++ 7 files changed, 46 insertions(+), 28 deletions(-) delete mode 100644 apps/metallb/overlays/system/config.json delete mode 100644 apps/metallb/overlays/system/crd-bgppeers.patch-caBundle.yaml delete mode 100644 apps/metallb/overlays/system/kustomization.yaml rename {apps/metallb/base => bootstrap/cluster-resources/k8s-home}/kustomization.yaml (56%) create mode 100644 bootstrap/cluster-resources/k8s-home/metallb/kustomization.yaml create mode 100644 bootstrap/cluster-resources/k8s-home/metallb/pool.external.yaml create mode 100644 bootstrap/cluster-resources/k8s-home/metallb/pool.internal.yaml diff --git a/apps/metallb/overlays/system/config.json b/apps/metallb/overlays/system/config.json deleted file mode 100644 index 19f619a..0000000 --- a/apps/metallb/overlays/system/config.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "appName": "metallb", - "userGivenName": "metallb", - "destNamespace": "metallb-system", - "destServer": "https://kubernetes.default.svc", - "srcPath": "apps/metallb/overlays/system", - "srcRepoURL": "ssh://git@gitea-ssh.gitops.svc.cluster.local:2222/davad/argo.git", - "srcTargetRevision": "", - "labels": null, - "annotations": null -} diff --git a/apps/metallb/overlays/system/crd-bgppeers.patch-caBundle.yaml b/apps/metallb/overlays/system/crd-bgppeers.patch-caBundle.yaml deleted file mode 100644 index 9917edb..0000000 --- a/apps/metallb/overlays/system/crd-bgppeers.patch-caBundle.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: bgppeers.metallb.io -spec: - conversion: - webhook: - clientConfig: - caBundle: >- - LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURFRENDQWZpZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFoTVJBd0RnWURWUVFLRXdkdFpYUmgKYkd4aU1RMHdDd1lEVlFRREV3UmpaWEowTUI0WERUSTBNRGd5T0RBeE16RXlNRm9YRFRNME1EZ3lOakF5TXpFeQpNRm93SVRFUU1BNEdBMVVFQ2hNSGJXVjBZV3hzWWpFTk1Bc0dBMVVFQXhNRVkyVnlkRENDQVNJd0RRWUpLb1pJCmh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTitNRFRoRXhtdkllWURXVlovWW5IajJQR0VLSTkyQmM1cnQKbEw3ZGFSMGh1VUlRWTF2bHRZWjJtRDNvOU9IOTl6UnI3TnBYaGZIVTBEVHJBa01hOVJCSmNsd1U0Kzhndk1kdgpFR2p1L1p4WjhMWDQ2cEZEVklNRTBUdUtpQXdpT01iSFE2amtIR0dySEpXYTIzQUlCbU44eTMzYlNnYWdYdHhzCnNraTgzUHVjYVFML2w4S1NiUXpCNTd4b3k3OEtyeTBPdWJzQUF3OTdmYnl1T1V3L21mYm5yV0FqdzMzcFBpRUoKNXhUUlZiSG9IR1RPaytSbWQwYXBpU2c4cTVLNG04MG03VGdoemVySlZLenFwdjliNW1uU2VUZG9zbStpZXFaegpGRTRra0JkWVFWRWxDZzE4cE9memJkL3dFLzJzdVNFL1dCYnhHYUhGU0NGeFlwVERuWWtDQXdFQUFhTlRNRkV3CkRnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCL3dRRk1BTUJBZjh3SFFZRFZSME9CQllFRkVxZHhaUWYKdXp2ZFZ6bndVZDM0UVEzdTI2aFhNQThHQTFVZEVRUUlNQWFDQkdObGNuUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF2U1IyTElQT2ZhMmZGTUlXZForc0xFQVF5Q01FRXZDdXZwT3EwRjdiUGM0QnRWdU9BYzdUTUdoRW5mCnpHVk5TdmlaSllSMEYzZk5OR2xOelQwMUw0cXZVV0JBbmludGxnS3VldzdGOFdDWDJRV0RJVkFScktKWmVWUFMKUTFrWkRUVzNUdVZkU3c5aWZvU0IwTUFvSi9sRzBQNk41RC92NVNLbVBDaDJTUlR5R2VaL0NsNnkzU0RGV09Bdgo3aGovWEN1Vm0xcGZOa3NVZ0pWYVM1aHIvR1lVMUtCZnZHYi9scU00cndvKy8zL1c0cjhNVWhtYTJ1aEZLQmZrCkxlNGVHQ2psbGdrQStHN0Q0dnBGdjhrRUdlTGF1akRRdUNHRDE2WTRyemtSSWQ3SEo1TG4yV1lNaEc2Nnpwc1MKVTQ5Q2dadUlScG1BQ1pBRmJsZldSeVVCVlkwPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== diff --git a/apps/metallb/overlays/system/kustomization.yaml b/apps/metallb/overlays/system/kustomization.yaml deleted file mode 100644 index fb84eb5..0000000 --- a/apps/metallb/overlays/system/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ../../base -patches: - - path: crd-bgppeers.patch-caBundle.yaml diff --git a/apps/metallb/base/kustomization.yaml b/bootstrap/cluster-resources/k8s-home/kustomization.yaml similarity index 56% rename from apps/metallb/base/kustomization.yaml rename to bootstrap/cluster-resources/k8s-home/kustomization.yaml index 6dfa762..2150393 100644 --- a/apps/metallb/base/kustomization.yaml +++ b/bootstrap/cluster-resources/k8s-home/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - github.com/metallb/metallb/config/native?ref=v0.14.8 +- cnpg-1.24.0.yaml +- metallb/ diff --git a/bootstrap/cluster-resources/k8s-home/metallb/kustomization.yaml b/bootstrap/cluster-resources/k8s-home/metallb/kustomization.yaml new file mode 100644 index 0000000..5e9ec5c --- /dev/null +++ b/bootstrap/cluster-resources/k8s-home/metallb/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: metallb-system +resources: + - github.com/metallb/metallb/config/native?ref=v0.15.2 + - ./pool.internal.yaml + # - ./pool.external.yaml diff --git a/bootstrap/cluster-resources/k8s-home/metallb/pool.external.yaml b/bootstrap/cluster-resources/k8s-home/metallb/pool.external.yaml new file mode 100644 index 0000000..d786efe --- /dev/null +++ b/bootstrap/cluster-resources/k8s-home/metallb/pool.external.yaml @@ -0,0 +1,18 @@ +apiVersion: metallb.io/v1beta1 +kind: IPAddressPool +metadata: + name: external + namespace: metallb-system +spec: + addresses: + - 2600:1700:4a50:8a9f::/64 + +--- +apiVersion: metallb.io/v1beta1 +kind: L2Advertisement +metadata: + name: external + namespace: metallb-system +spec: + ipAddressPools: + - external diff --git a/bootstrap/cluster-resources/k8s-home/metallb/pool.internal.yaml b/bootstrap/cluster-resources/k8s-home/metallb/pool.internal.yaml new file mode 100644 index 0000000..252053c --- /dev/null +++ b/bootstrap/cluster-resources/k8s-home/metallb/pool.internal.yaml @@ -0,0 +1,19 @@ +apiVersion: metallb.io/v1beta1 +kind: IPAddressPool +metadata: + name: internal + namespace: metallb-system +spec: + addresses: + - 192.168.1.99-192.168.1.200 +# - fe80::aa20:66ff:fe16:4966/64 # This is causing issues with traefik right now + +--- +apiVersion: metallb.io/v1beta1 +kind: L2Advertisement +metadata: + name: internal + namespace: metallb-system +spec: + ipAddressPools: + - internal