Skip to content

Commit c422e2f

Browse files
deepakm-ntnxdeepakm-ntnx
committed
fixed examples.sync
1 parent 4a9c7e0 commit c422e2f

File tree

7 files changed

+61
-402
lines changed

7 files changed

+61
-402
lines changed

‎charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,23 @@
11
apiVersion: v1
2-
data:
3-
nutanix_config.json: |-
4-
{
5-
"prismCentral": {
6-
"address": "${NUTANIX_ENDPOINT}",
7-
"port": ${NUTANIX_PORT=9440},
8-
"insecure": ${NUTANIX_INSECURE=false},
9-
"credentialRef": {
10-
"kind": "secret",
11-
"name": "nutanix-creds",
12-
"namespace": "kube-system"
13-
},
14-
"additionalTrustBundle": {
15-
"kind": "ConfigMap",
16-
"name": "nutanix-ccm-pc-trusted-ca-bundle",
17-
"namespace": "kube-system"
18-
}
19-
},
20-
"enableCustomLabeling": ${CCM_CUSTOM_LABEL=false},
21-
"topologyDiscovery": {
22-
"type": "Prism"
23-
}
24-
}
2+
binaryData:
3+
ca.crt: ${NUTANIX_ADDITIONAL_TRUST_BUNDLE=""}
254
kind: ConfigMap
265
metadata:
276
labels:
287
cluster.x-k8s.io/provider: infrastructure-nutanix
29-
name: nutanix-config
30-
namespace: kube-system
8+
name: ${CLUSTER_NAME}-pc-trusted-ca-bundle
319
---
3210
apiVersion: v1
3311
data:
34-
nutanix-ccm-cm.yaml: |-
12+
nutanix-ccm.yaml: |
13+
---
3514
apiVersion: v1
3615
kind: ConfigMap
3716
metadata:
3817
name: nutanix-ccm-pc-trusted-ca-bundle
3918
namespace: kube-system
4019
binaryData:
41-
ca.crt: ""
42-
nutanix-ccm.yaml: |
20+
ca.crt: ${NUTANIX_ADDITIONAL_TRUST_BUNDLE=""}
4321
---
4422
# Source: nutanix-cloud-provider/templates/rbac.yaml
4523
apiVersion: v1
@@ -48,6 +26,36 @@ data:
4826
name: cloud-controller-manager
4927
namespace: kube-system
5028
---
29+
# Source: nutanix-cloud-provider/templates/cm.yaml
30+
kind: ConfigMap
31+
apiVersion: v1
32+
metadata:
33+
name: nutanix-config
34+
namespace: kube-system
35+
data:
36+
nutanix_config.json: |-
37+
{
38+
"prismCentral": {
39+
"address": "${NUTANIX_ENDPOINT}",
40+
"port": ${NUTANIX_PORT=9440},
41+
"insecure": ${NUTANIX_INSECURE=false},
42+
"credentialRef": {
43+
"kind": "secret",
44+
"name": "nutanix-creds",
45+
"namespace": "kube-system"
46+
},
47+
"additionalTrustBundle": {
48+
"kind": "ConfigMap",
49+
"name": "nutanix-ccm-pc-trusted-ca-bundle",
50+
"namespace": "kube-system"
51+
}
52+
},
53+
"enableCustomLabeling": ${CCM_CUSTOM_LABEL=false},
54+
"topologyDiscovery": {
55+
"type": "Prism"
56+
}
57+
}
58+
---
5159
# Source: nutanix-cloud-provider/templates/rbac.yaml
5260
apiVersion: rbac.authorization.k8s.io/v1
5361
kind: ClusterRole
@@ -220,13 +228,24 @@ metadata:
220228
name: nutanix-ccm
221229
---
222230
apiVersion: v1
223-
binaryData:
224-
ca.crt: ""
225-
kind: ConfigMap
231+
kind: Secret
226232
metadata:
227233
labels:
228234
cluster.x-k8s.io/provider: infrastructure-nutanix
229-
name: nutanix-quick-start-pc-trusted-ca-bundle
235+
name: ${CLUSTER_NAME}-pc-creds
236+
stringData:
237+
credentials: |
238+
[
239+
{
240+
"type": "basic_auth",
241+
"data": {
242+
"prismCentral":{
243+
"username": "${NUTANIX_USER}",
244+
"password": "${NUTANIX_PASSWORD}"
245+
}
246+
}
247+
}
248+
]
230249
---
231250
apiVersion: v1
232251
kind: Secret
@@ -257,26 +276,6 @@ stringData:
257276
]
258277
type: addons.cluster.x-k8s.io/resource-set
259278
---
260-
apiVersion: v1
261-
kind: Secret
262-
metadata:
263-
labels:
264-
cluster.x-k8s.io/provider: infrastructure-nutanix
265-
name: nutanix-quick-start-pc-creds
266-
stringData:
267-
credentials: |
268-
[
269-
{
270-
"type": "basic_auth",
271-
"data": {
272-
"prismCentral":{
273-
"username": "${NUTANIX_USER}",
274-
"password": "${NUTANIX_PASSWORD}"
275-
}
276-
}
277-
}
278-
]
279-
---
280279
apiVersion: addons.cluster.x-k8s.io/v1beta1
281280
kind: ClusterResourceSet
282281
metadata:

‎examples/capi-quick-start/aws-cluster-identity.yaml

Whitespace-only changes.

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

Lines changed: 0 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +0,0 @@
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: nutanix-quick-start
20-
controlPlane:
21-
metadata: {}
22-
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
23-
variables:
24-
- name: clusterConfig
25-
value:
26-
addons:
27-
cni:
28-
provider: Calico
29-
strategy: ClusterResourceSet
30-
controlPlane:
31-
nutanix:
32-
machineDetails:
33-
additionalCategories:
34-
- key: key1
35-
value: value1
36-
- key: key2
37-
value: value2
38-
bootType: legacy
39-
cluster:
40-
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
41-
type: name
42-
gpus:
43-
- name: gpu1
44-
type: name
45-
- name: gpu2
46-
type: name
47-
image:
48-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
49-
type: name
50-
memorySize: 4Gi
51-
project:
52-
name: prj1
53-
type: name
54-
subnet:
55-
- name: ${NUTANIX_SUBNET_NAME}
56-
type: name
57-
systemDiskSize: 40Gi
58-
vcpuSockets: 2
59-
vcpusPerSocket: 1
60-
nutanix:
61-
controlPlaneEndpoint:
62-
host: ${CONTROL_PLANE_ENDPOINT_IP}
63-
port: ${CONTROL_PLANE_ENDPOINT_PORT}
64-
failureDomains:
65-
- cluster:
66-
name: PE1
67-
type: name
68-
controlPlane: false
69-
name: fd1
70-
subnets:
71-
- name: subnet1
72-
type: name
73-
prismCentralEndpoint:
74-
additionalTrustBundle: trust-bundle-root-ca
75-
host: ${NUTANIX_ENDPOINT}
76-
insecure: ${NUTANIX_INSECURE}
77-
port: 9440
78-
- name: workerConfig
79-
value:
80-
nutanix:
81-
machineDetails:
82-
additionalCategories:
83-
- key: key1
84-
value: value1
85-
- key: key2
86-
value: value2
87-
bootType: legacy
88-
cluster:
89-
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
90-
type: name
91-
gpus:
92-
- name: gpu1
93-
type: name
94-
- name: gpu2
95-
type: name
96-
image:
97-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
98-
type: name
99-
memorySize: 4Gi
100-
project:
101-
name: prj1
102-
type: name
103-
subnet:
104-
- name: ${NUTANIX_SUBNET_NAME}
105-
type: name
106-
systemDiskSize: 40Gi
107-
vcpuSockets: 2
108-
vcpusPerSocket: 1
109-
version: ${KUBERNETES_VERSION}
110-
workers:
111-
machineDeployments:
112-
- class: nutanix-quick-start-worker
113-
metadata: {}
114-
name: md-0
115-
replicas: ${WORKER_MACHINE_COUNT}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ spec:
110110
workers:
111111
machineDeployments:
112112
- class: nutanix-quick-start-worker
113-
metadata: {}
113+
metadata:
114+
annotations:
115+
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"
116+
cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "${WORKER_MACHINE_COUNT}"
114117
name: md-0
115-
replicas: ${WORKER_MACHINE_COUNT}

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

Lines changed: 0 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +0,0 @@
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: nutanix-quick-start
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-
controlPlane:
31-
nutanix:
32-
machineDetails:
33-
additionalCategories:
34-
- key: key1
35-
value: value1
36-
- key: key2
37-
value: value2
38-
bootType: legacy
39-
cluster:
40-
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
41-
type: name
42-
gpus:
43-
- name: gpu1
44-
type: name
45-
- name: gpu2
46-
type: name
47-
image:
48-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
49-
type: name
50-
memorySize: 4Gi
51-
project:
52-
name: prj1
53-
type: name
54-
subnet:
55-
- name: ${NUTANIX_SUBNET_NAME}
56-
type: name
57-
systemDiskSize: 40Gi
58-
vcpuSockets: 2
59-
vcpusPerSocket: 1
60-
nutanix:
61-
controlPlaneEndpoint:
62-
host: ${CONTROL_PLANE_ENDPOINT_IP}
63-
port: ${CONTROL_PLANE_ENDPOINT_PORT}
64-
failureDomains:
65-
- cluster:
66-
name: PE1
67-
type: name
68-
controlPlane: false
69-
name: fd1
70-
subnets:
71-
- name: subnet1
72-
type: name
73-
prismCentralEndpoint:
74-
additionalTrustBundle: trust-bundle-root-ca
75-
host: ${NUTANIX_ENDPOINT}
76-
insecure: ${NUTANIX_INSECURE}
77-
port: 9440
78-
- name: workerConfig
79-
value:
80-
nutanix:
81-
machineDetails:
82-
additionalCategories:
83-
- key: key1
84-
value: value1
85-
- key: key2
86-
value: value2
87-
bootType: legacy
88-
cluster:
89-
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
90-
type: name
91-
gpus:
92-
- name: gpu1
93-
type: name
94-
- name: gpu2
95-
type: name
96-
image:
97-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
98-
type: name
99-
memorySize: 4Gi
100-
project:
101-
name: prj1
102-
type: name
103-
subnet:
104-
- name: ${NUTANIX_SUBNET_NAME}
105-
type: name
106-
systemDiskSize: 40Gi
107-
vcpuSockets: 2
108-
vcpusPerSocket: 1
109-
version: ${KUBERNETES_VERSION}
110-
workers:
111-
machineDeployments:
112-
- class: nutanix-quick-start-worker
113-
metadata: {}
114-
name: md-0
115-
replicas: ${WORKER_MACHINE_COUNT}

0 commit comments

Comments
 (0)