Skip to content

Update self-managed templates to use internal LB for node-to-node communication #5210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2024
Merged

Update self-managed templates to use internal LB for node-to-node communication #5210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions templates/cluster-template-aad.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions templates/cluster-template-dual-stack.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions templates/cluster-template-flatcar.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions templates/cluster-template-ipv6.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions templates/cluster-template-nvidia-gpu.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions templates/flavors/aad/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 6 additions & 1 deletion templates/flavors/azure-bastion/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
58 changes: 58 additions & 0 deletions templates/flavors/azure-bastion/machine-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 5 additions & 1 deletion templates/flavors/azure-cni-v1/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
58 changes: 58 additions & 0 deletions templates/flavors/azure-cni-v1/machine-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions templates/flavors/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions templates/flavors/dual-stack/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 7 additions & 1 deletion templates/flavors/edgezone/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
58 changes: 58 additions & 0 deletions templates/flavors/edgezone/machine-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
7 changes: 6 additions & 1 deletion templates/flavors/ephemeral/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading
Loading