build: remove unused CRS tooling for Nutanix CCM

The CRS strategy is not supported for the Nutanix CCM, removing it until we actually need it.
d2iq-labs · Apr 10, 2024 · 5e41c8f · 5e41c8f
1 parent 3992ca5
commit 5e41c8f
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 241 deletions.
diff --git a/charts/cluster-api-runtime-extensions-nutanix/README.md b/charts/cluster-api-runtime-extensions-nutanix/README.md
@@ -32,7 +32,6 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | deployment.replicas | int | `1` |  |
 | env | object | `{}` |  |
 | helmAddonsConfigMap | string | `"default-helm-addons-config"` |  |
-| hooks.ccm.nutanix.crsStrategy.defaultInstallationConfigMap.name | string | `"nutanix-ccm"` |  |
 | hooks.ccm.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.ccm.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nutanix-ccm-helm-values-template"` |  |
 | hooks.clusterAutoscaler.crsStrategy.defaultInstallationConfigMap.name | string | `"cluster-autoscaler"` |  |

diff --git a/...api-runtime-extensions-nutanix/templates/ccm/nutanix/manifests/nutanix-ccm-configmap.yaml b/...api-runtime-extensions-nutanix/templates/ccm/nutanix/manifests/nutanix-ccm-configmap.yaml
diff --git a/charts/cluster-api-runtime-extensions-nutanix/values.yaml b/charts/cluster-api-runtime-extensions-nutanix/values.yaml
@@ -51,9 +51,6 @@ hooks:
           name: default-nutanix-csi-helm-values-template
   ccm:
     nutanix:
-      crsStrategy:
-        defaultInstallationConfigMap:
-          name: nutanix-ccm
       helmAddonStrategy:
         defaultValueTemplateConfigMap:
           create: true

diff --git a/hack/addons/kustomize/nutanix-ccm/helm-values.yaml b/hack/addons/kustomize/nutanix-ccm/helm-values.yaml
diff --git a/hack/addons/update-nutanix-ccm.sh b/hack/addons/update-nutanix-ccm.sh
diff --git a/make/addons.mk b/make/addons.mk
@@ -18,7 +18,7 @@ export AWS_CCM_CHART_VERSION_128 := 0.0.8
 export NUTANIX_CCM_CHART_VERSION := 0.3.3
 
 .PHONY: addons.sync
-addons.sync: $(addprefix update-addon.,calico cilium nfd cluster-autoscaler aws-ebs-csi aws-ccm.127 nutanix-storage-csi aws-ccm.128 nutanix-ccm)
+addons.sync: $(addprefix update-addon.,calico cilium nfd cluster-autoscaler aws-ebs-csi aws-ccm.127 nutanix-storage-csi aws-ccm.128)
 
 .PHONY: update-addon.calico
 update-addon.calico: ; $(info $(M) updating calico manifests)
@@ -48,10 +48,6 @@ update-addon.aws-ccm.%: ; $(info $(M) updating aws ccm $* manifests)
 update-addon.nutanix-storage-csi: ; $(info $(M) updating nutanix-storage csi manifests)
 	./hack/addons/update-nutanix-csi.sh
 
-.PHONY: update-addon.nutanix-ccm
-update-addon.nutanix-ccm: ; $(info $(M) updating nutanix ccm $* manifests)
-	./hack/addons/update-nutanix-ccm.sh
-
 .PHONY: generate-helm-configmap
 generate-helm-configmap:
 	go run hack/tools/helm-cm/main.go -kustomize-directory="./hack/addons/kustomize" -output-file="./charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml"