feat: hide self contained registry behind a flag

Author: faiq

.goreleaser.yml

@@ -49,7 +49,7 @@ before:
       sh -ec 'gojq --yaml-input --yaml-output \
         ".releaseSeries |= (. + [{contract: \"v1beta1\", major: {{ .Major }}, minor: {{ .Minor }}}] | unique)" \
         metadata.yaml >release-metadata.yaml'
-    - make replace-with-mindthegap
+    - make template-mindthegap
 
 
 builds:

.pre-commit-config.yaml

@@ -36,7 +36,7 @@ repos:
     pass_filenames: false
   - id: addons-repo-yaml
     name: addons-repo-yaml
-    entry: make replace-with-mindthegap
+    entry: make template-mindthegap
     language: system
     files: "hack/addons/mindthegap-helm-registry/repos.yaml"
     pass_filenames: false

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

@@ -80,6 +80,8 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | resources.requests.cpu | string | `"100m"` |  |
 | resources.requests.memory | string | `"128Mi"` |  |
 | securityContext.runAsUser | int | `65532` |  |
+| selfHostedRegistry | bool | `false` |  |
+| selfHostedRegistryURI | string | `"oci://mindthegap.{{ .Release.Namespace }}.svc/charts"` |  |
 | service.annotations | object | `{}` |  |
 | service.port | int | `443` |  |
 | service.type | string | `"ClusterIP"` |  |

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

@@ -10,35 +10,35 @@ data:
   cilium: |
     ChartName: cilium
     ChartVersion: 1.15.0
-    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc/charts
+    RepositoryURL: {{ if .Values.selfHostedRegistry }}{{ .Values.selfHostedRegistryURI }}{{ else }}https://helm.cilium.io/{{ end }}
   cluster-autoscaler: |
     ChartName: cluster-autoscaler
     ChartVersion: 9.35.0
-    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc/charts
+    RepositoryURL: {{ if .Values.selfHostedRegistry }}{{ .Values.selfHostedRegistryURI }}{{ else }}https://kubernetes.github.io/autoscaler{{ end }}
   metallb: |
     ChartName: metallb
     ChartVersion: v0.14.5
-    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc/charts
+    RepositoryURL: {{ if .Values.selfHostedRegistry }}{{ .Values.selfHostedRegistryURI }}{{ else }}https://metallb.github.io/metallb{{ end }}
   nfd: |
     ChartName: node-feature-discovery
     ChartVersion: 0.15.2
-    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc/charts
+    RepositoryURL: {{ if .Values.selfHostedRegistry }}{{ .Values.selfHostedRegistryURI }}{{ else }}https://kubernetes-sigs.github.io/node-feature-discovery/charts{{ end }}
   nutanix-ccm: |
     ChartName: nutanix-cloud-provider
     ChartVersion: 0.3.3
-    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc/charts
+    RepositoryURL: {{ if .Values.selfHostedRegistry }}{{ .Values.selfHostedRegistryURI }}{{ else }}https://nutanix.github.io/helm/{{ end }}
   nutanix-snapshot-csi: |
     ChartName: nutanix-csi-snapshot
     ChartVersion: 6.3.2
-    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc/charts
+    RepositoryURL: {{ if .Values.selfHostedRegistry }}{{ .Values.selfHostedRegistryURI }}{{ else }}https://nutanix.github.io/helm/{{ end }}
   nutanix-storage-csi: |
     ChartName: nutanix-csi-storage
     ChartVersion: 3.0.0-beta.1912
-    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc/charts
+    RepositoryURL: {{ if .Values.selfHostedRegistry }}{{ .Values.selfHostedRegistryURI }}{{ else }}https://nutanix.github.io/helm-releases/{{ end }}
   tigera-operator: |
     ChartName: tigera-operator
     ChartVersion: v3.26.4
-    RepositoryURL: oci://mindthegap.{{ .Release.Namespace }}.svc/charts
+    RepositoryURL: {{ if .Values.selfHostedRegistry }}{{ .Values.selfHostedRegistryURI }}{{ else }}https://docs.tigera.io/calico/charts{{ end }}
 kind: ConfigMap
 metadata:
   creationTimestamp: null

charts/cluster-api-runtime-extensions-nutanix/templates/mindthegap.yaml

@@ -3,6 +3,7 @@
 # This file contains the manifests to run a mindthegap deployment which contains helm charts for our addons.
 # The pod is built via goreleaser with configuration from hack/addons.
 #
+{{ if .Values.selfHostedRegistry }}
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
@@ -74,3 +75,4 @@ spec:
   - port: 443
     targetPort: 5000
   type: ClusterIP
+{{ end }}

charts/cluster-api-runtime-extensions-nutanix/values.yaml

@@ -84,6 +84,10 @@ hooks:
 
 helmAddonsConfigMap: default-helm-addons-config
 
+selfHostedRegistry: false
+selfHostedRegistryURI: oci://mindthegap.{{ .Release.Namespace }}.svc/charts
+
+
 deployDefaultClusterClasses: true
 
 deployment:

make/addons.mk

@@ -63,6 +63,6 @@ generate-helm-configmap: ; $(info $(M) genrating helm configmap) ## this file is
 generate-mindthegap-repofile: generate-helm-configmap ; $(info $(M) generating helm repofile for mindthgap)
 	./hack/addons/generate-mindthegap-repofile.sh
 
-.PHONY: replace-with-mindthegap
-replace-with-mindthegap: generate-mindthegap-repofile ## this is used by gorealeaser to set the helm value to this.
-	sed -i 's/RepositoryURL:.*/RepositoryURL: oci:\/\/mindthegap.{{ .Release.Namespace }}.svc\/charts/g' "./charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml"
+.PHONY: template-mindthegap
+template-mindthegap: generate-mindthegap-repofile ## this is used by gorealeaser to set the helm value to this.
+	sed -i '/RepositoryURL:/s#\(RepositoryURL: *\)\(.*\)#\1{{ if .Values.selfHostedRegistry }}{{ .Values.selfHostedRegistryURI }}{{ else }}\2{{ end }}#'  "./charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml"