Revert "Update self-managed templates to use internal LB for node-to-…

…node communication"
kubernetes-sigs · Nov 21, 2024 · 2991dfa · 2991dfa
1 parent be37836
commit 2991dfa
Show file tree

Hide file tree

Showing 25 changed files with 6 additions and 354 deletions.
diff --git a/templates/cluster-template-aad.yaml b/templates/cluster-template-aad.yaml
diff --git a/templates/cluster-template-dual-stack.yaml b/templates/cluster-template-dual-stack.yaml
diff --git a/templates/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml
diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml
diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml
diff --git a/templates/flavors/aad/kustomization.yaml b/templates/flavors/aad/kustomization.yaml
@@ -8,8 +8,6 @@ resources:
 patches:
 - path: patches/kubeadm-controlplane.yaml
 - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
-- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
-- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml
 
 sortOptions:
   order: fifo
diff --git a/templates/flavors/azure-bastion/kustomization.yaml b/templates/flavors/azure-bastion/kustomization.yaml
@@ -2,14 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-- ../base
-- machine-deployment.yaml
-- ../../azure-cluster-identity
+- ../default
 patches:
-- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
 - path: patches/azure-cluster.yaml
-- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
-- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml
 
 sortOptions:
   order: fifo
diff --git a/templates/flavors/azure-bastion/machine-deployment.yaml b/templates/flavors/azure-bastion/machine-deployment.yaml
diff --git a/templates/flavors/azure-cni-v1/kustomization.yaml b/templates/flavors/azure-cni-v1/kustomization.yaml
@@ -2,17 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-- ../base
-- machine-deployment.yaml
-- ../../azure-cluster-identity
+- ../default
 patches:
 - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
 - path: patches/azure-machine-template-controlplane.yaml
 - path: patches/azure-machine-template.yaml
 - path: patches/kubeadm-control-plane.yaml
 - path: patches/kubeadm-worker-node.yaml
-- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
-- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml
 
 sortOptions:
   order: fifo
diff --git a/templates/flavors/azure-cni-v1/machine-deployment.yaml b/templates/flavors/azure-cni-v1/machine-deployment.yaml
diff --git a/templates/flavors/default/kustomization.yaml b/templates/flavors/default/kustomization.yaml
@@ -8,8 +8,8 @@ resources:
 
 patches:
 - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
-- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
-- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml
+- path: patches/control-plane.yaml
+- path: patches/kubeadm-config-template.yaml
 
 sortOptions:
   order: fifo
diff --git a/...d-balancer/azure-cluster-frontend-ip.yaml → ...lavors/default/patches/control-plane.yaml b/...d-balancer/azure-cluster-frontend-ip.yaml → ...lavors/default/patches/control-plane.yaml
diff --git a/.../kubeadm-config-template-worker-node.yaml → ...ault/patches/kubeadm-config-template.yaml b/.../kubeadm-config-template-worker-node.yaml → ...ault/patches/kubeadm-config-template.yaml
diff --git a/templates/flavors/dual-stack/kustomization.yaml b/templates/flavors/dual-stack/kustomization.yaml
@@ -10,8 +10,6 @@ patches:
 - path: patches/kubeadm-controlplane.yaml
 - path: patches/controlplane-azuremachinetemplate.yaml
 - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
-- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
-- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml
 
 sortOptions:
   order: fifo
diff --git a/templates/flavors/edgezone/kustomization.yaml b/templates/flavors/edgezone/kustomization.yaml
@@ -2,16 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-- ../base
-- machine-deployment.yaml
-- ../../azure-cluster-identity
-
+- ../default
 patches:
-- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
 - path: patches/azure-extendedlocation.yaml
 - path: patches/azure-remove-natgateway.yaml
-- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
-- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml
 
 sortOptions:
   order: fifo
diff --git a/templates/flavors/edgezone/machine-deployment.yaml b/templates/flavors/edgezone/machine-deployment.yaml
diff --git a/templates/flavors/ephemeral/kustomization.yaml b/templates/flavors/ephemeral/kustomization.yaml
@@ -2,12 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-- ../base
-- machine-deployment.yaml
-- ../../azure-cluster-identity
+- ../default
 
 patches:
-- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
 - path: patches/ephemeral.yaml
   target:
     group: infrastructure.cluster.x-k8s.io
@@ -20,8 +17,6 @@ patches:
     kind: AzureMachineTemplate
     name: .*-control-plane
     version: v1beta1
-- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
-- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml
 
 sortOptions:
   order: fifo