diff --git a/clusters/atlas/flux-system/platform/metallb/kustomization.yaml b/clusters/atlas/flux-system/platform/metallb/kustomization.yaml index 9b5bf3a3..98baaff8 100644 --- a/clusters/atlas/flux-system/platform/metallb/kustomization.yaml +++ b/clusters/atlas/flux-system/platform/metallb/kustomization.yaml @@ -14,23 +14,3 @@ spec: prune: true wait: true targetNamespace: metallb-system ---- -# Temporary second wave: MetalLB rejects overlapping pools during dry-run. -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: ingress-pool-transition - namespace: flux-system -spec: - interval: 10m - retryInterval: 10s - dependsOn: - - name: metallb - sourceRef: - kind: GitRepository - name: flux-system - path: ./infrastructure/metallb/ingress-pool-transition - # The normal metallb stack adopts the pool after this one-time transition. - prune: false - wait: false - targetNamespace: metallb-system diff --git a/infrastructure/metallb/ingress-pool-transition/kustomization.yaml b/infrastructure/metallb/ingress-pool-transition/kustomization.yaml deleted file mode 100644 index 8bd7deba..00000000 --- a/infrastructure/metallb/ingress-pool-transition/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# infrastructure/metallb/ingress-pool-transition/kustomization.yaml -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ingress-pool.yaml diff --git a/infrastructure/metallb/ingress-pool-transition/ingress-pool.yaml b/infrastructure/metallb/ingress-pool.yaml similarity index 100% rename from infrastructure/metallb/ingress-pool-transition/ingress-pool.yaml rename to infrastructure/metallb/ingress-pool.yaml diff --git a/infrastructure/metallb/kustomization.yaml b/infrastructure/metallb/kustomization.yaml index bc15ceec..434c350c 100644 --- a/infrastructure/metallb/kustomization.yaml +++ b/infrastructure/metallb/kustomization.yaml @@ -5,4 +5,5 @@ resources: - namespace.yaml - helmrelease.yaml - ippool.yaml + - ingress-pool.yaml - lan-ai-pool.yaml