Merge pull request #5210 from nawazkh/update_dev_templates

Update self-managed templates to use internal LB for node-to-node communication
kubernetes-sigs · Nov 5, 2024 · e2ad4e2 · e2ad4e2
2 parents 40f31f5 + d753715
commit e2ad4e2
Show file tree

Hide file tree

Showing 25 changed files with 354 additions and 6 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,6 +8,8 @@ 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,9 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-- ../default
+- ../base
+- machine-deployment.yaml
+- ../../azure-cluster-identity
 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
@@ -0,0 +1,58 @@
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachineDeployment
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  clusterName: "${CLUSTER_NAME}"
+  replicas: ${WORKER_MACHINE_COUNT:=2}
+  selector:
+    matchLabels:
+  template:
+    spec:
+      clusterName: "${CLUSTER_NAME}"
+      version: "${KUBERNETES_VERSION}"
+      bootstrap:
+        configRef:
+          name: "${CLUSTER_NAME}-md-0"
+          apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+          kind: KubeadmConfigTemplate
+      infrastructureRef:
+        name: "${CLUSTER_NAME}-md-0"
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        kind: AzureMachineTemplate
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AzureMachineTemplate
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  template:
+    spec:
+      vmSize: ${AZURE_NODE_MACHINE_TYPE}
+      osDisk:
+        osType: "Linux"
+        diskSizeGB: 128
+      sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: KubeadmConfigTemplate
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  template:
+    spec:
+      preKubeadmCommands: []
+      joinConfiguration:
+        nodeRegistration:
+          name: '{{ ds.meta_data["local_hostname"] }}'
+          kubeletExtraArgs:
+            cloud-provider: external
+      files:
+      - contentFrom:
+          secret:
+            name: ${CLUSTER_NAME}-md-0-azure-json
+            key: worker-node-azure.json
+        owner: root:root
+        path: /etc/kubernetes/azure.json
+        permissions: "0644"
diff --git a/templates/flavors/azure-cni-v1/kustomization.yaml b/templates/flavors/azure-cni-v1/kustomization.yaml
@@ -2,13 +2,17 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-- ../default
+- ../base
+- machine-deployment.yaml
+- ../../azure-cluster-identity
 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
@@ -0,0 +1,58 @@
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachineDeployment
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  clusterName: "${CLUSTER_NAME}"
+  replicas: ${WORKER_MACHINE_COUNT:=2}
+  selector:
+    matchLabels:
+  template:
+    spec:
+      clusterName: "${CLUSTER_NAME}"
+      version: "${KUBERNETES_VERSION}"
+      bootstrap:
+        configRef:
+          name: "${CLUSTER_NAME}-md-0"
+          apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+          kind: KubeadmConfigTemplate
+      infrastructureRef:
+        name: "${CLUSTER_NAME}-md-0"
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        kind: AzureMachineTemplate
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AzureMachineTemplate
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  template:
+    spec:
+      vmSize: ${AZURE_NODE_MACHINE_TYPE}
+      osDisk:
+        osType: "Linux"
+        diskSizeGB: 128
+      sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: KubeadmConfigTemplate
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  template:
+    spec:
+      preKubeadmCommands: []
+      joinConfiguration:
+        nodeRegistration:
+          name: '{{ ds.meta_data["local_hostname"] }}'
+          kubeletExtraArgs:
+            cloud-provider: external
+      files:
+      - contentFrom:
+          secret:
+            name: ${CLUSTER_NAME}-md-0-azure-json
+            key: worker-node-azure.json
+        owner: root:root
+        path: /etc/kubernetes/azure.json
+        permissions: "0644"
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: patches/control-plane.yaml
-- path: patches/kubeadm-config-template.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/dual-stack/kustomization.yaml b/templates/flavors/dual-stack/kustomization.yaml
@@ -10,6 +10,8 @@ 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,10 +2,16 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-- ../default
+- ../base
+- machine-deployment.yaml
+- ../../azure-cluster-identity
+
 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
@@ -0,0 +1,58 @@
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachineDeployment
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  clusterName: "${CLUSTER_NAME}"
+  replicas: ${WORKER_MACHINE_COUNT:=2}
+  selector:
+    matchLabels:
+  template:
+    spec:
+      clusterName: "${CLUSTER_NAME}"
+      version: "${KUBERNETES_VERSION}"
+      bootstrap:
+        configRef:
+          name: "${CLUSTER_NAME}-md-0"
+          apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+          kind: KubeadmConfigTemplate
+      infrastructureRef:
+        name: "${CLUSTER_NAME}-md-0"
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        kind: AzureMachineTemplate
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AzureMachineTemplate
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  template:
+    spec:
+      vmSize: ${AZURE_NODE_MACHINE_TYPE}
+      osDisk:
+        osType: "Linux"
+        diskSizeGB: 128
+      sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: KubeadmConfigTemplate
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  template:
+    spec:
+      preKubeadmCommands: []
+      joinConfiguration:
+        nodeRegistration:
+          name: '{{ ds.meta_data["local_hostname"] }}'
+          kubeletExtraArgs:
+            cloud-provider: external
+      files:
+      - contentFrom:
+          secret:
+            name: ${CLUSTER_NAME}-md-0-azure-json
+            key: worker-node-azure.json
+        owner: root:root
+        path: /etc/kubernetes/azure.json
+        permissions: "0644"
diff --git a/templates/flavors/ephemeral/kustomization.yaml b/templates/flavors/ephemeral/kustomization.yaml
@@ -2,9 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-- ../default
+- ../base
+- machine-deployment.yaml
+- ../../azure-cluster-identity
 
 patches:
+- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
 - path: patches/ephemeral.yaml
   target:
     group: infrastructure.cluster.x-k8s.io
@@ -17,6 +20,8 @@ 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