Skip to content

Commit 0e7399b

Browse files
nawazkhnawazkh
committed
bastion, azure cni v1, ephemeral, edgezone are independent of default templates
1 parent 92cb2e5 commit 0e7399b

File tree

10 files changed

+246
-12
lines changed

10 files changed

+246
-12
lines changed

‎templates/cluster-template-edgezone.yaml‎

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/flavors/azure-bastion/kustomization.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: default
44
resources:
5-
- ../default
5+
- ../base
6+
- machine-deployment.yaml
7+
- ../../azure-cluster-identity
68
patches:
9+
- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
710
- path: patches/azure-cluster.yaml
811
- path: ../../internal-load-balancer/azure-cluster-frontend-ip.yaml
912
- path: ../../internal-load-balancer/kubeadm-config-template-worker-node.yaml

‎templates/flavors/azure-bastion/machine-deployment.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
apiVersion: cluster.x-k8s.io/v1beta1
3+
kind: MachineDeployment
4+
metadata:
5+
name: "${CLUSTER_NAME}-md-0"
6+
spec:
7+
clusterName: "${CLUSTER_NAME}"
8+
replicas: ${WORKER_MACHINE_COUNT:=2}
9+
selector:
10+
matchLabels:
11+
template:
12+
spec:
13+
clusterName: "${CLUSTER_NAME}"
14+
version: "${KUBERNETES_VERSION}"
15+
bootstrap:
16+
configRef:
17+
name: "${CLUSTER_NAME}-md-0"
18+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
19+
kind: KubeadmConfigTemplate
20+
infrastructureRef:
21+
name: "${CLUSTER_NAME}-md-0"
22+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
23+
kind: AzureMachineTemplate
24+
---
25+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
26+
kind: AzureMachineTemplate
27+
metadata:
28+
name: "${CLUSTER_NAME}-md-0"
29+
spec:
30+
template:
31+
spec:
32+
vmSize: ${AZURE_NODE_MACHINE_TYPE}
33+
osDisk:
34+
osType: "Linux"
35+
diskSizeGB: 128
36+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
37+
---
38+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
39+
kind: KubeadmConfigTemplate
40+
metadata:
41+
name: "${CLUSTER_NAME}-md-0"
42+
spec:
43+
template:
44+
spec:
45+
preKubeadmCommands: []
46+
joinConfiguration:
47+
nodeRegistration:
48+
name: '{{ ds.meta_data["local_hostname"] }}'
49+
kubeletExtraArgs:
50+
cloud-provider: external
51+
files:
52+
- contentFrom:
53+
secret:
54+
name: ${CLUSTER_NAME}-md-0-azure-json
55+
key: worker-node-azure.json
56+
owner: root:root
57+
path: /etc/kubernetes/azure.json
58+
permissions: "0644"

‎templates/flavors/azure-cni-v1/kustomization.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: default
44
resources:
5-
- ../default
5+
- ../base
6+
- machine-deployment.yaml
7+
- ../../azure-cluster-identity
68
patches:
79
- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
810
- path: patches/azure-machine-template-controlplane.yaml

‎templates/flavors/azure-cni-v1/machine-deployment.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
apiVersion: cluster.x-k8s.io/v1beta1
3+
kind: MachineDeployment
4+
metadata:
5+
name: "${CLUSTER_NAME}-md-0"
6+
spec:
7+
clusterName: "${CLUSTER_NAME}"
8+
replicas: ${WORKER_MACHINE_COUNT:=2}
9+
selector:
10+
matchLabels:
11+
template:
12+
spec:
13+
clusterName: "${CLUSTER_NAME}"
14+
version: "${KUBERNETES_VERSION}"
15+
bootstrap:
16+
configRef:
17+
name: "${CLUSTER_NAME}-md-0"
18+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
19+
kind: KubeadmConfigTemplate
20+
infrastructureRef:
21+
name: "${CLUSTER_NAME}-md-0"
22+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
23+
kind: AzureMachineTemplate
24+
---
25+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
26+
kind: AzureMachineTemplate
27+
metadata:
28+
name: "${CLUSTER_NAME}-md-0"
29+
spec:
30+
template:
31+
spec:
32+
vmSize: ${AZURE_NODE_MACHINE_TYPE}
33+
osDisk:
34+
osType: "Linux"
35+
diskSizeGB: 128
36+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
37+
---
38+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
39+
kind: KubeadmConfigTemplate
40+
metadata:
41+
name: "${CLUSTER_NAME}-md-0"
42+
spec:
43+
template:
44+
spec:
45+
preKubeadmCommands: []
46+
joinConfiguration:
47+
nodeRegistration:
48+
name: '{{ ds.meta_data["local_hostname"] }}'
49+
kubeletExtraArgs:
50+
cloud-provider: external
51+
files:
52+
- contentFrom:
53+
secret:
54+
name: ${CLUSTER_NAME}-md-0-azure-json
55+
key: worker-node-azure.json
56+
owner: root:root
57+
path: /etc/kubernetes/azure.json
58+
permissions: "0644"

‎templates/flavors/edgezone/kustomization.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: default
44
resources:
5-
- ../default
5+
- ../base
6+
- machine-deployment.yaml
7+
- ../../azure-cluster-identity
68

79
patches:
810
- path: patches/azure-extendedlocation.yaml

‎templates/flavors/edgezone/machine-deployment.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
apiVersion: cluster.x-k8s.io/v1beta1
3+
kind: MachineDeployment
4+
metadata:
5+
name: "${CLUSTER_NAME}-md-0"
6+
spec:
7+
clusterName: "${CLUSTER_NAME}"
8+
replicas: ${WORKER_MACHINE_COUNT:=2}
9+
selector:
10+
matchLabels:
11+
template:
12+
spec:
13+
clusterName: "${CLUSTER_NAME}"
14+
version: "${KUBERNETES_VERSION}"
15+
bootstrap:
16+
configRef:
17+
name: "${CLUSTER_NAME}-md-0"
18+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
19+
kind: KubeadmConfigTemplate
20+
infrastructureRef:
21+
name: "${CLUSTER_NAME}-md-0"
22+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
23+
kind: AzureMachineTemplate
24+
---
25+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
26+
kind: AzureMachineTemplate
27+
metadata:
28+
name: "${CLUSTER_NAME}-md-0"
29+
spec:
30+
template:
31+
spec:
32+
vmSize: ${AZURE_NODE_MACHINE_TYPE}
33+
osDisk:
34+
osType: "Linux"
35+
diskSizeGB: 128
36+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
37+
---
38+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
39+
kind: KubeadmConfigTemplate
40+
metadata:
41+
name: "${CLUSTER_NAME}-md-0"
42+
spec:
43+
template:
44+
spec:
45+
preKubeadmCommands: []
46+
joinConfiguration:
47+
nodeRegistration:
48+
name: '{{ ds.meta_data["local_hostname"] }}'
49+
kubeletExtraArgs:
50+
cloud-provider: external
51+
files:
52+
- contentFrom:
53+
secret:
54+
name: ${CLUSTER_NAME}-md-0-azure-json
55+
key: worker-node-azure.json
56+
owner: root:root
57+
path: /etc/kubernetes/azure.json
58+
permissions: "0644"

‎templates/flavors/ephemeral/kustomization.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: default
44
resources:
5-
- ../default
5+
- ../base
6+
- machine-deployment.yaml
7+
- ../../azure-cluster-identity
68

79
patches:
10+
- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
811
- path: patches/ephemeral.yaml
912
target:
1013
group: infrastructure.cluster.x-k8s.io

‎templates/flavors/ephemeral/machine-deployment.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
apiVersion: cluster.x-k8s.io/v1beta1
3+
kind: MachineDeployment
4+
metadata:
5+
name: "${CLUSTER_NAME}-md-0"
6+
spec:
7+
clusterName: "${CLUSTER_NAME}"
8+
replicas: ${WORKER_MACHINE_COUNT:=2}
9+
selector:
10+
matchLabels:
11+
template:
12+
spec:
13+
clusterName: "${CLUSTER_NAME}"
14+
version: "${KUBERNETES_VERSION}"
15+
bootstrap:
16+
configRef:
17+
name: "${CLUSTER_NAME}-md-0"
18+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
19+
kind: KubeadmConfigTemplate
20+
infrastructureRef:
21+
name: "${CLUSTER_NAME}-md-0"
22+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
23+
kind: AzureMachineTemplate
24+
---
25+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
26+
kind: AzureMachineTemplate
27+
metadata:
28+
name: "${CLUSTER_NAME}-md-0"
29+
spec:
30+
template:
31+
spec:
32+
vmSize: ${AZURE_NODE_MACHINE_TYPE}
33+
osDisk:
34+
osType: "Linux"
35+
diskSizeGB: 128
36+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
37+
---
38+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
39+
kind: KubeadmConfigTemplate
40+
metadata:
41+
name: "${CLUSTER_NAME}-md-0"
42+
spec:
43+
template:
44+
spec:
45+
preKubeadmCommands: []
46+
joinConfiguration:
47+
nodeRegistration:
48+
name: '{{ ds.meta_data["local_hostname"] }}'
49+
kubeletExtraArgs:
50+
cloud-provider: external
51+
files:
52+
- contentFrom:
53+
secret:
54+
name: ${CLUSTER_NAME}-md-0-azure-json
55+
key: worker-node-azure.json
56+
owner: root:root
57+
path: /etc/kubernetes/azure.json
58+
permissions: "0644"

‎templates/test/ci/cluster-template-prow-edgezone.yaml‎

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)