Skip to content

Commit 69e75fa

Browse files
deepakm-ntnxdeepakm-ntnx
committed
patches
1 parent 25aeaf6 commit 69e75fa

File tree

5 files changed

+129
-233
lines changed

5 files changed

+129
-233
lines changed

‎examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml

Lines changed: 0 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,5 @@
11
apiVersion: cluster.x-k8s.io/v1beta1
22
kind: Cluster
3-
metadata:
4-
labels:
5-
ccm: nutanix
6-
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
7-
cluster.x-k8s.io/provider: infrastructure-nutanix
8-
name: ${CLUSTER_NAME}
9-
spec:
10-
clusterNetwork:
11-
pods:
12-
cidrBlocks:
13-
- ${POD_CIDR:-192.168.0.0/16}
14-
serviceDomain: cluster.local
15-
services:
16-
cidrBlocks:
17-
- ${SERVICE_CIDR:-10.128.0.0/12}
18-
topology:
19-
class: test-cre
20-
controlPlane:
21-
metadata: {}
22-
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
23-
variables:
24-
- name: clusterConfig
25-
value:
26-
addons:
27-
cni:
28-
provider: Cilium
29-
strategy: ClusterResourceSet
30-
nutanix: {}
31-
version: ${KUBERNETES_VERSION}
32-
workers:
33-
machineDeployments:
34-
- class: ${CLUSTER_CLASS_NAME}-worker
35-
metadata: {}
36-
name: md-0
37-
replicas: ${WORKER_MACHINE_COUNT}
38-
---
39-
apiVersion: cluster.x-k8s.io/v1beta1
40-
kind: Cluster
41-
metadata:
42-
labels:
43-
ccm: nutanix
44-
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
45-
cluster.x-k8s.io/provider: infrastructure-nutanix
46-
name: ${CLUSTER_NAME}
47-
spec:
48-
clusterNetwork:
49-
pods:
50-
cidrBlocks:
51-
- ${POD_CIDR:-192.168.0.0/16}
52-
serviceDomain: cluster.local
53-
services:
54-
cidrBlocks:
55-
- ${SERVICE_CIDR:-10.128.0.0/12}
56-
topology:
57-
class: test-cre
58-
controlPlane:
59-
metadata: {}
60-
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
61-
variables:
62-
- name: clusterConfig
63-
value:
64-
addons:
65-
cni:
66-
provider: Cilium
67-
strategy: HelmAddon
68-
nutanix: {}
69-
version: ${KUBERNETES_VERSION}
70-
workers:
71-
machineDeployments:
72-
- class: ${CLUSTER_CLASS_NAME}-worker
73-
metadata: {}
74-
name: md-0
75-
replicas: ${WORKER_MACHINE_COUNT}
76-
---
77-
apiVersion: cluster.x-k8s.io/v1beta1
78-
kind: Cluster
79-
metadata:
80-
labels:
81-
ccm: nutanix
82-
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
83-
cluster.x-k8s.io/provider: infrastructure-nutanix
84-
name: ${CLUSTER_NAME}
85-
spec:
86-
clusterNetwork:
87-
pods:
88-
cidrBlocks:
89-
- ${POD_CIDR:-192.168.0.0/16}
90-
serviceDomain: cluster.local
91-
services:
92-
cidrBlocks:
93-
- ${SERVICE_CIDR:-10.128.0.0/12}
94-
topology:
95-
class: test-cre
96-
controlPlane:
97-
metadata: {}
98-
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
99-
variables:
100-
- name: clusterConfig
101-
value:
102-
addons:
103-
cni:
104-
provider: Calico
105-
strategy: ClusterResourceSet
106-
nutanix: {}
107-
version: ${KUBERNETES_VERSION}
108-
workers:
109-
machineDeployments:
110-
- class: ${CLUSTER_CLASS_NAME}-worker
111-
metadata: {}
112-
name: md-0
113-
replicas: ${WORKER_MACHINE_COUNT}
114-
---
115-
apiVersion: cluster.x-k8s.io/v1beta1
116-
kind: Cluster
1173
metadata:
1184
labels:
1195
ccm: nutanix

‎examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml

Lines changed: 0 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -26,120 +26,6 @@ spec:
2626
addons:
2727
cni:
2828
provider: Cilium
29-
strategy: ClusterResourceSet
30-
nutanix: {}
31-
version: ${KUBERNETES_VERSION}
32-
workers:
33-
machineDeployments:
34-
- class: ${CLUSTER_CLASS_NAME}-worker
35-
metadata: {}
36-
name: md-0
37-
replicas: ${WORKER_MACHINE_COUNT}
38-
---
39-
apiVersion: cluster.x-k8s.io/v1beta1
40-
kind: Cluster
41-
metadata:
42-
labels:
43-
ccm: nutanix
44-
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
45-
cluster.x-k8s.io/provider: infrastructure-nutanix
46-
name: ${CLUSTER_NAME}
47-
spec:
48-
clusterNetwork:
49-
pods:
50-
cidrBlocks:
51-
- ${POD_CIDR:-192.168.0.0/16}
52-
serviceDomain: cluster.local
53-
services:
54-
cidrBlocks:
55-
- ${SERVICE_CIDR:-10.128.0.0/12}
56-
topology:
57-
class: test-cre
58-
controlPlane:
59-
metadata: {}
60-
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
61-
variables:
62-
- name: clusterConfig
63-
value:
64-
addons:
65-
cni:
66-
provider: Cilium
67-
strategy: HelmAddon
68-
nutanix: {}
69-
version: ${KUBERNETES_VERSION}
70-
workers:
71-
machineDeployments:
72-
- class: ${CLUSTER_CLASS_NAME}-worker
73-
metadata: {}
74-
name: md-0
75-
replicas: ${WORKER_MACHINE_COUNT}
76-
---
77-
apiVersion: cluster.x-k8s.io/v1beta1
78-
kind: Cluster
79-
metadata:
80-
labels:
81-
ccm: nutanix
82-
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
83-
cluster.x-k8s.io/provider: infrastructure-nutanix
84-
name: ${CLUSTER_NAME}
85-
spec:
86-
clusterNetwork:
87-
pods:
88-
cidrBlocks:
89-
- ${POD_CIDR:-192.168.0.0/16}
90-
serviceDomain: cluster.local
91-
services:
92-
cidrBlocks:
93-
- ${SERVICE_CIDR:-10.128.0.0/12}
94-
topology:
95-
class: test-cre
96-
controlPlane:
97-
metadata: {}
98-
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
99-
variables:
100-
- name: clusterConfig
101-
value:
102-
addons:
103-
cni:
104-
provider: Calico
105-
strategy: ClusterResourceSet
106-
nutanix: {}
107-
version: ${KUBERNETES_VERSION}
108-
workers:
109-
machineDeployments:
110-
- class: ${CLUSTER_CLASS_NAME}-worker
111-
metadata: {}
112-
name: md-0
113-
replicas: ${WORKER_MACHINE_COUNT}
114-
---
115-
apiVersion: cluster.x-k8s.io/v1beta1
116-
kind: Cluster
117-
metadata:
118-
labels:
119-
ccm: nutanix
120-
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
121-
cluster.x-k8s.io/provider: infrastructure-nutanix
122-
name: ${CLUSTER_NAME}
123-
spec:
124-
clusterNetwork:
125-
pods:
126-
cidrBlocks:
127-
- ${POD_CIDR:-192.168.0.0/16}
128-
serviceDomain: cluster.local
129-
services:
130-
cidrBlocks:
131-
- ${SERVICE_CIDR:-10.128.0.0/12}
132-
topology:
133-
class: test-cre
134-
controlPlane:
135-
metadata: {}
136-
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
137-
variables:
138-
- name: clusterConfig
139-
value:
140-
addons:
141-
cni:
142-
provider: Calico
14329
strategy: HelmAddon
14430
nutanix: {}
14531
version: ${KUBERNETES_VERSION}

‎examples/capi-quick-start/nutanix-final-example.yaml

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
apiVersion: cluster.x-k8s.io/v1beta1
2+
kind: Cluster
3+
metadata:
4+
labels:
5+
ccm: nutanix
6+
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
7+
cluster.x-k8s.io/provider: infrastructure-nutanix
8+
name: ${CLUSTER_NAME}
9+
spec:
10+
clusterNetwork:
11+
pods:
12+
cidrBlocks:
13+
- ${POD_CIDR:-192.168.0.0/16}
14+
serviceDomain: cluster.local
15+
services:
16+
cidrBlocks:
17+
- ${SERVICE_CIDR:-10.128.0.0/12}
18+
topology:
19+
class: test-cre
20+
controlPlane:
21+
metadata: {}
22+
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
23+
variables:
24+
- name: clusterConfig
25+
value:
26+
etcd:
27+
image:
28+
repository: my-registry.io/my-org/my-repo
29+
tag: "v3.5.99_custom.0"
30+
extraAPIServerCertSANs:
31+
- a.b.c.example.com
32+
- d.e.f.example.com
33+
globalImageRegistryMirror:
34+
url: https://example.com
35+
credentials:
36+
secretRef:
37+
name: my-mirror-ca-cert
38+
proxy:
39+
http: http://example.com
40+
https: http://example.com
41+
additionalNo:
42+
- no-proxy-1.example.com
43+
- no-proxy-2.example.com
44+
imageRegistries:
45+
- url: https://my-registry.io
46+
credentials:
47+
secretRef:
48+
name: my-registry-credentials
49+
kubernetesImageRepository: "my-registry.io/my-org/my-repo"
50+
prismCentralEndpoint:
51+
address: "PC-ip-fqdn"
52+
port: 9440
53+
insecure: false
54+
additionalTrustBundle: "trust-bundle-root-ca"
55+
controlPlane:
56+
nutanix:
57+
endpoint:
58+
host: "api-server-ip-fqdn"
59+
port: 6443
60+
users:
61+
- name: capxuser
62+
sshKey: ssh-key-expample-1
63+
bootType: legacy
64+
cluster:
65+
name: PE1
66+
type: name
67+
image:
68+
name: image1
69+
type: name
70+
memorySize: 4Gi
71+
systemDiskSize: 40Gi
72+
vcpuSockets: 2
73+
vcpusPerSocket: 1
74+
subnet:
75+
name: subnet1
76+
type: name
77+
project: prj1
78+
additionalCategories:
79+
- key1: value1
80+
- key2: value2
81+
gpus:
82+
- type: name
83+
name: gpu1
84+
- type: name
85+
name: gpu2
86+
addons:
87+
cni:
88+
provider: Cilium
89+
strategy: HelmAddon
90+
csi: {}
91+
nfd: {}
92+
- name: workerConfig
93+
value:
94+
nutanix:
95+
bootType: legacy
96+
cluster:
97+
name: PE1
98+
type: name
99+
image:
100+
name: image1
101+
type: name
102+
memorySize: 4Gi
103+
systemDiskSize: 40Gi
104+
vcpuSockets: 2
105+
vcpusPerSocket: 1
106+
subnet:
107+
name: subnet1
108+
type: name
109+
project: prj1
110+
additionalCategories:
111+
- key1: value1
112+
- key2: value2
113+
gpus:
114+
- type: name
115+
name: gpu1
116+
- type: name
117+
name: gpu2
118+
version: ${KUBERNETES_VERSION}
119+
workers:
120+
machineDeployments:
121+
- class: ${CLUSTER_CLASS_NAME}-worker
122+
metadata: {}
123+
name: md-0
124+
replicas: ${WORKER_MACHINE_COUNT}

‎hack/examples/sync.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ kustomize build ./hack/examples |
111111
>(
112112
gojq --yaml-input --yaml-output 'select(.metadata.labels["cluster.x-k8s.io/provider"] == "infrastructure-nutanix"
113113
and .kind == "Cluster"
114-
# and .spec.topology.variables[0].value.addons.cni.provider == "Calico"
115-
# and .spec.topology.variables[0].value.addons.cni.strategy == "HelmAddon"
114+
and .spec.topology.variables[0].value.addons.cni.provider == "Calico"
115+
and .spec.topology.variables[0].value.addons.cni.strategy == "HelmAddon"
116116
)' >"${EXAMPLE_CLUSTERS_DIR}/nutanix-cluster-calico-helm-addon.yaml"
117117
) \
118118
>(
@@ -126,8 +126,8 @@ kustomize build ./hack/examples |
126126
>(
127127
gojq --yaml-input --yaml-output 'select(.metadata.labels["cluster.x-k8s.io/provider"] == "infrastructure-nutanix"
128128
and .kind == "Cluster"
129-
# and .spec.topology.variables[0].value.addons.cni.provider == "Cilium"
130-
# and .spec.topology.variables[0].value.addons.cni.strategy == "HelmAddon"
129+
and .spec.topology.variables[0].value.addons.cni.provider == "Cilium"
130+
and .spec.topology.variables[0].value.addons.cni.strategy == "HelmAddon"
131131
)' >"${EXAMPLE_CLUSTERS_DIR}/nutanix-cluster-cilium-helm-addon.yaml"
132132
) \
133133
>/dev/null

‎make/clusterctl.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ clusterctl.init:
1010
AWS_B64ENCODED_CREDENTIALS= \
1111
clusterctl init \
1212
--kubeconfig=$(KIND_KUBECONFIG) \
13-
--infrastructure docker,aws \
13+
--infrastructure docker,aws,nutanix \
1414
--addon helm \
1515
--wait-providers
1616

0 commit comments

Comments
 (0)