Skip to content

Commit c79e174

Browse files
pre commit changes
1 parent 2076544 commit c79e174

File tree

13 files changed

+35
-33
lines changed

13 files changed

+35
-33
lines changed

charts/cluster-api-runtime-extensions-nutanix/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
8787
| hooks.csi.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nutanix-csi-helm-values-template"` | |
8888
| hooks.csi.snapshot-controller.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | |
8989
| hooks.csi.snapshot-controller.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-snapshot-controller-helm-values-template"` | |
90+
| hooks.k8sRegistrationAgent.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | |
91+
| hooks.k8sRegistrationAgent.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-k8s-registrationagent-helm-values-template"` | |
9092
| hooks.nfd.crsStrategy.defaultInstallationConfigMap.name | string | `"node-feature-discovery"` | |
9193
| hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | |
9294
| hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nfd-helm-values-template"` | |
@@ -96,8 +98,6 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
9698
| hooks.registrySyncer.defaultValueTemplateConfigMap.name | string | `"default-registry-syncer-helm-values-template"` | |
9799
| hooks.serviceLoadBalancer.metalLB.defaultValueTemplateConfigMap.create | bool | `true` | |
98100
| hooks.serviceLoadBalancer.metalLB.defaultValueTemplateConfigMap.name | string | `"default-metallb-helm-values-template"` | |
99-
| hooks.k8sRegistrationAgent.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | |
100-
| hooks.k8sRegistrationAgent.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-k8s-registrationagent-helm-values-template"` | |
101101
| image.pullPolicy | string | `"IfNotPresent"` | |
102102
| image.repository | string | `"ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix"` | |
103103
| image.tag | string | `""` | |

charts/cluster-api-runtime-extensions-nutanix/addons/k8s-registration-agent/values-template.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ pc:
88
k8sClusterName: {{ .ClusterName }}
99

1010
createSecret: false
11-

charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ data:
3434
k8s-registration-agent: |
3535
ChartName: nutanix-k8s-agent
3636
ChartVersion: 0.0.1-alpha.1
37-
RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}http://192.168.1.16:8080{{ end }}'
37+
RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}http://192.168.1.10:8080{{ end }}'
3838
local-path-provisioner-csi: |
3939
ChartName: local-path-provisioner
4040
ChartVersion: 0.0.31

charts/cluster-api-runtime-extensions-nutanix/values.schema.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -407,27 +407,6 @@
407407
}
408408
}
409409
},
410-
"k8sRegistrationAgent": {
411-
"properties": {
412-
"helmAddonStrategy": {
413-
"properties": {
414-
"defaultValueTemplateConfigMap": {
415-
"properties": {
416-
"create": {
417-
"type": "boolean"
418-
},
419-
"name": {
420-
"type": "string"
421-
}
422-
},
423-
"type": "object"
424-
}
425-
},
426-
"type": "object"
427-
}
428-
},
429-
"type": "object"
430-
},
431410
"csi": {
432411
"type": "object",
433412
"properties": {
@@ -517,6 +496,27 @@
517496
}
518497
}
519498
},
499+
"k8sRegistrationAgent": {
500+
"type": "object",
501+
"properties": {
502+
"helmAddonStrategy": {
503+
"type": "object",
504+
"properties": {
505+
"defaultValueTemplateConfigMap": {
506+
"type": "object",
507+
"properties": {
508+
"create": {
509+
"type": "boolean"
510+
},
511+
"name": {
512+
"type": "string"
513+
}
514+
}
515+
}
516+
}
517+
}
518+
}
519+
},
520520
"nfd": {
521521
"type": "object",
522522
"properties": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ spec:
7474
provider: Calico
7575
strategy: ClusterResourceSet
7676
cosi: {}
77-
k8sRegistrationAgent: {}
7877
csi:
7978
defaultStorage:
8079
provider: nutanix
@@ -91,6 +90,7 @@ spec:
9190
strategy: HelmAddon
9291
snapshotController:
9392
strategy: HelmAddon
93+
k8sRegistrationAgent: {}
9494
nfd:
9595
strategy: ClusterResourceSet
9696
serviceLoadBalancer:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ spec:
7272
cni:
7373
provider: Calico
7474
cosi: {}
75-
k8sRegistrationAgent: {}
7675
csi:
7776
defaultStorage:
7877
provider: nutanix
@@ -89,6 +88,7 @@ spec:
8988
strategy: HelmAddon
9089
snapshotController:
9190
strategy: HelmAddon
91+
k8sRegistrationAgent: {}
9292
nfd: {}
9393
serviceLoadBalancer:
9494
configuration:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ spec:
7474
provider: Cilium
7575
strategy: ClusterResourceSet
7676
cosi: {}
77-
k8sRegistrationAgent: {}
7877
csi:
7978
defaultStorage:
8079
provider: nutanix
@@ -91,6 +90,7 @@ spec:
9190
strategy: HelmAddon
9291
snapshotController:
9392
strategy: HelmAddon
93+
k8sRegistrationAgent: {}
9494
nfd:
9595
strategy: ClusterResourceSet
9696
serviceLoadBalancer:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ spec:
7272
cni:
7373
provider: Cilium
7474
cosi: {}
75-
k8sRegistrationAgent: {}
7675
csi:
7776
defaultStorage:
7877
provider: nutanix
@@ -89,6 +88,7 @@ spec:
8988
strategy: HelmAddon
9089
snapshotController:
9190
strategy: HelmAddon
91+
k8sRegistrationAgent: {}
9292
nfd: {}
9393
serviceLoadBalancer:
9494
configuration:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ spec:
110110
provider: Cilium
111111
strategy: ClusterResourceSet
112112
cosi: {}
113-
k8sRegistrationAgent: {}
114113
csi:
115114
defaultStorage:
116115
provider: nutanix
@@ -127,6 +126,7 @@ spec:
127126
strategy: HelmAddon
128127
snapshotController:
129128
strategy: HelmAddon
129+
k8sRegistrationAgent: {}
130130
nfd:
131131
strategy: ClusterResourceSet
132132
serviceLoadBalancer:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ spec:
108108
cni:
109109
provider: Cilium
110110
cosi: {}
111-
k8sRegistrationAgent: {}
112111
csi:
113112
defaultStorage:
114113
provider: nutanix
@@ -125,6 +124,7 @@ spec:
125124
strategy: HelmAddon
126125
snapshotController:
127126
strategy: HelmAddon
127+
k8sRegistrationAgent: {}
128128
nfd: {}
129129
serviceLoadBalancer:
130130
configuration:

0 commit comments

Comments
 (0)