fix: minor cleanups to use OCI for hcp

Author: faiq

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

@@ -69,6 +69,6 @@ spec:
   selector:
     app: mindthegap
   ports:
-  - port: 80
+  - port: 443
     targetPort: 5000
-  type: NodePort
+  type: ClusterIP

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

@@ -10,44 +10,39 @@ data:
   cilium: |
     ChartName: cilium
     ChartVersion: 1.15.0
-    RepositoryURL: registry.{{ .Release.Namespace }}.svc
+    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc
   cluster-autoscaler: |
     ChartName: cluster-autoscaler
     ChartVersion: 9.37.0
-    RepositoryURL: registry.{{ .Release.Namespace }}.svc
+    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc
   local-path-provisioner-csi: |
     ChartName: local-path-provisioner
     ChartVersion: v0.0.29
     RepositoryURL: https://charts.containeroo.ch
   metallb: |
     ChartName: metallb
     ChartVersion: v0.14.5
-    RepositoryURL: registry.{{ .Release.Namespace }}.svc
+    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc
   nfd: |
     ChartName: node-feature-discovery
     ChartVersion: v0.15.2
-    RepositoryURL: registry.{{ .Release.Namespace }}.svc
+    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc
   nutanix-ccm: |
     ChartName: nutanix-cloud-provider
     ChartVersion: 0.3.3
-    RepositoryURL: registry.{{ .Release.Namespace }}.svc
+    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc
   nutanix-snapshot-csi: |
     ChartName: nutanix-csi-snapshot
     ChartVersion: 6.3.2
-    RepositoryURL: registry.{{ .Release.Namespace }}.svc
+    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc
   nutanix-storage-csi: |
     ChartName: nutanix-csi-storage
     ChartVersion: v3.0.0-beta.1912
-    RepositoryURL: registry.{{ .Release.Namespace }}.svc
+    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc
   tigera-operator: |
     ChartName: tigera-operator
-<<<<<<< HEAD
     ChartVersion: v3.28.0
-    RepositoryURL: https://docs.tigera.io/calico/charts
-=======
-    ChartVersion: v3.26.4
-    RepositoryURL: registry.{{ .Release.Namespace }}.svc
->>>>>>> 3c3c0d8 (feat: self host helm charts with mindthegap)
+    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc
 kind: ConfigMap
 metadata:
   creationTimestamp: null

make/addons.mk

@@ -78,4 +78,4 @@ generate-mindthegap-repofile: generate-helm-configmap ; $(info $(M) generating h
 
 .PHONY: replace-with-mindthegap ## this is used by gorealeaser to set the helm value to this.
 replace-with-mindthegap: generate-mindthegap-repofile
-	sed -i 's/RepositoryURL:.*/RepositoryURL: registry.{{ .Release.Namespace }}.svc/g' "./charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml"
+	sed -i 's/RepositoryURL:.*/RepositoryURL: oci:\/\/mindthegap.{{ .Release.Namespace }}.svc/g' "./charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml"

pkg/handlers/generic/lifecycle/nfd/strategy_helmaddon.go

@@ -68,7 +68,7 @@ func (s helmAddonStrategy) apply(
 
 	values += fmt.Sprintf(`
 image:
-  tag: v%s-minimal
+  tag: %s-minimal
 `, s.helmChart.Version)
 
 	hcp := &caaphv1.HelmChartProxy{