Skip to content
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.

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

[WIP] Set up ci-entrypoint to work with AKS management cluster #5241

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Prev Previous commit
Next Next commit
Update ILB config
  • Loading branch information
Jont828 committed Nov 19, 2024
commit 9f52cdd8fa97d9c69c65403c27f6b357e1851903
12 changes: 10 additions & 2 deletions templates/cluster-template-aad.yaml

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

12 changes: 10 additions & 2 deletions templates/cluster-template-azure-bastion.yaml

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

12 changes: 10 additions & 2 deletions templates/cluster-template-azure-cni-v1.yaml

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

11 changes: 5 additions & 6 deletions templates/cluster-template-dual-stack.yaml

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

12 changes: 10 additions & 2 deletions templates/cluster-template-edgezone.yaml

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

12 changes: 10 additions & 2 deletions templates/cluster-template-ephemeral.yaml

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

12 changes: 10 additions & 2 deletions templates/cluster-template-flatcar.yaml

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

11 changes: 5 additions & 6 deletions templates/cluster-template-ipv6.yaml

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

12 changes: 10 additions & 2 deletions templates/cluster-template-nvidia-gpu.yaml

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

12 changes: 10 additions & 2 deletions templates/cluster-template-windows.yaml

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

12 changes: 10 additions & 2 deletions templates/cluster-template.yaml
Original file line number Diff line number Diff line change
@@ -35,12 +35,20 @@ spec:
publicIP:
dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com
name: ${CLUSTER_NAME}-api-lb
- name: ${CLUSTER_NAME}-internal-lb-private-ip
privateIP: 10.0.0.100
subnets:
- name: control-plane-subnet
- cidrBlocks:
- 10.0.0.0/24
name: control-plane-subnet
role: control-plane
- name: node-subnet
- cidrBlocks:
- 10.1.0.0/24
name: node-subnet
role: node
vnet:
cidrBlocks:
- 10.0.0.0/16
name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet}
resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}}
subscriptionID: ${AZURE_SUBSCRIPTION_ID}
2 changes: 1 addition & 1 deletion templates/flavors/aad/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ 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/azure-cluster-cidrs-and-frontend-ips.yaml
- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml

sortOptions:
2 changes: 1 addition & 1 deletion templates/flavors/azure-bastion/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ resources:
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/azure-cluster-cidrs-and-frontend-ips.yaml
- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml

sortOptions:
2 changes: 1 addition & 1 deletion templates/flavors/azure-cni-v1/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ patches:
- 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/azure-cluster-cidrs-and-frontend-ips.yaml
- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml

sortOptions:
2 changes: 1 addition & 1 deletion templates/flavors/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ resources:

patches:
- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
- path: ../../internal-load-balancer/azure-cluster-cidrs-and-frontend-ips.yaml
- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml

sortOptions:
2 changes: 1 addition & 1 deletion templates/flavors/dual-stack/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ 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/azure-cluster-cidrs-and-frontend-ips.yaml
- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml

sortOptions:
2 changes: 1 addition & 1 deletion templates/flavors/edgezone/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ 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/azure-cluster-cidrs-and-frontend-ips.yaml
- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml

sortOptions:
2 changes: 1 addition & 1 deletion templates/flavors/ephemeral/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ patches:
kind: AzureMachineTemplate
name: .*-control-plane
version: v1beta1
- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
- path: ../../internal-load-balancer/azure-cluster-cidrs-and-frontend-ips.yaml
- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml

sortOptions:
2 changes: 1 addition & 1 deletion templates/flavors/flatcar/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ 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/azure-cluster-cidrs-and-frontend-ips.yaml
- target:
kind: KubeadmConfigTemplate
patch: |-
2 changes: 1 addition & 1 deletion templates/flavors/ipv6/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ patches:
- path: patches/ipv6.yaml
- path: patches/kubeadm-controlplane.yaml
- path: patches/controlplane-azuremachinetemplate.yaml
- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
- path: ../../internal-load-balancer/azure-cluster-cidrs-and-frontend-ips.yaml
- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml

sortOptions:
2 changes: 1 addition & 1 deletion templates/flavors/nvidia-gpu/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ generatorOptions:

patches:
- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
- path: ../../internal-load-balancer/azure-cluster-cidrs-and-frontend-ips.yaml
- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml

sortOptions:
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: AzureCluster
metadata:
name: ${CLUSTER_NAME}
spec:
networkSpec:
apiServerLB:
# We pre-create this public IP and the DNS name to use it in the
# worker node's /etc/hosts.
frontendIPs:
- name: ${CLUSTER_NAME}-api-lb
publicIP:
name: ${CLUSTER_NAME}-api-lb
dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com
- name: ${CLUSTER_NAME}-internal-lb-private-ip
privateIP: 10.0.0.100
vnet:
cidrBlocks:
- 10.0.0.0/16
subnets:
- name: control-plane-subnet
role: control-plane
cidrBlocks:
- 10.0.0.0/24
- name: node-subnet
role: node
cidrBlocks:
- 10.1.0.0/24
Loading