feat: copy charts to pvc

Author: faiq

.goreleaser.yml

@@ -108,6 +108,7 @@ dockers:
       - hack/addons/mindthegap-helm-registry/repos.yaml
     build_flag_templates:
       - "--platform=linux/amd64"
+      - '--version=v{{ trimprefix .Version "v" }}'
       - "--pull"
       - "--label=org.opencontainers.image.created={{.CommitDate}}"
       - "--label=org.opencontainers.image.title=caren-helm-reg"
@@ -124,6 +125,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/arm64"
       - "--pull"
+      - '--version=v{{ trimprefix .Version "v" }}'
       - "--label=org.opencontainers.image.created={{.CommitDate}}"
       - "--label=org.opencontainers.image.title=caren-helm-reg"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"

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

@@ -32,9 +32,9 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | deployment.replicas | int | `1` |  |
 | env | object | `{}` |  |
 | helmAddonsConfigMap | string | `"default-helm-addons-config"` |  |
-| helmRepositoryImage.pullPolicy | string | `"IfNotPresent"` |  |
-| helmRepositoryImage.repository | string | `"ghcr.io/nutanix-cloud-native/caren-helm-reg"` |  |
-| helmRepositoryImage.tag | string | `""` |  |
+| helmChartsImage.pullPolicy | string | `"IfNotPresent"` |  |
+| helmChartsImage.repository | string | `"ghcr.io/nutanix-cloud-native/caren-helm-reg"` |  |
+| helmChartsImage.tag | string | `""` |  |
 | hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-aws-ccm-helm-values-template"` |  |
 | hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.27" | string | `"v1.27.9"` |  |
@@ -86,6 +86,9 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | image.repository | string | `"ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix"` |  |
 | image.tag | string | `""` |  |
 | imagePullSecrets | list | `[]` | Optional secrets used for pulling the container image |
+| mindthegap.pullPolicy | string | `"IfNotPresent"` |  |
+| mindthegap.repository | string | `"ghcr.io/mesosphere/mindthegap"` |  |
+| mindthegap.tag | string | `"v1.14.4"` |  |
 | namespaceSync.enabled | bool | `true` |  |
 | namespaceSync.sourceNamespace | string | `""` |  |
 | namespaceSync.targetNamespaceLabelKey | string | `"caren.nutanix.com/namespace-sync"` |  |

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

@@ -26,6 +26,21 @@ spec:
     kind: Issuer
   secretName: helm-repository-tls
 ---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  finalizers:
+  - kubernetes.io/pvc-protection
+  name: charts-pvc
+  namespace: default
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 2Gi
+  volumeMode: Filesystem
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -45,18 +60,34 @@ spec:
       labels:
         app: helm-repository  # pods have this label, and Service and Deployment depend on it
     spec:
+      initContainers:
+      - name: init-container
+        image: "{{ .Values.helmChartsImage.repository }}:{{ default $.Chart.AppVersion .Values.helmChartsImage.tag }}"
+        command: ["/bin/sh", "-c", "cp /charts/*.tar /helm-charts"]
+        imagePullPolicy: "{{ .Values.image.pullPolicy }}"
       containers:
       - name: helm-repository
         ports:
           - name: serve
             protocol: TCP
             containerPort: 5000
-        image: "{{ .Values.helmRepositoryImage.repository }}:{{ default $.Chart.AppVersion .Values.helmRepositoryImage.tag }}"
-        imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+        image: "{{ .Values.mindthegap.repository }}:{{ .Values.mindthegap.tag }}"
+        imagePullPolicy: "{{ .Values.mindthegap.pullPolicy }}"
+        args:
+          - serve
+          - bundle
+          - --bundle=/helm-charts/helm-charts-*.tar
+          - --listen-port=5000
+          - --listen-address=0.0.0.0
+          - --tls-private-key-file=/certs/tls.key
+          - --tls-cert-file=/certs/tls.crt
         volumeMounts:
         - name: certs-vol
           mountPath: "/certs"
           readOnly: true
+        - name: charts-volume
+          mountPath: "/helm-charts"
+          readOnly: true
         livenessProbe:
           tcpSocket:
             port: serve
@@ -73,6 +104,9 @@ spec:
       - name: certs-vol
         secret:
           secretName: helm-repository-tls
+      - name: charts-volume
+        persistentVolumeClaim:
+          claimName: charts-pvc
 ---
 apiVersion: v1
 kind: Service

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

@@ -38,7 +38,7 @@
         "helmAddonsConfigMap": {
             "type": "string"
         },
-        "helmRepositoryImage": {
+        "helmChartsImage": {
             "properties": {
                 "pullPolicy": {
                     "type": "string"
@@ -505,6 +505,20 @@
         "imagePullSecrets": {
             "type": "array"
         },
+        "mindthegap": {
+            "properties": {
+                "pullPolicy": {
+                    "type": "string"
+                },
+                "repository": {
+                    "type": "string"
+                },
+                "tag": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "namespaceSync": {
             "properties": {
                 "enabled": {

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

@@ -132,11 +132,16 @@ image:
   tag: ""
   pullPolicy: IfNotPresent
 
-helmRepositoryImage:
+helmChartsImage:
   repository: ghcr.io/nutanix-cloud-native/caren-helm-reg
   tag: ""
   pullPolicy: IfNotPresent
 
+mindthegap:
+  repository: ghcr.io/mesosphere/mindthegap
+  tag: "v1.14.4"
+  pullPolicy: IfNotPresent
+
 # -- Optional secrets used for pulling the container image
 imagePullSecrets: []
 # - name: Secret with Registry credentials

hack/addons/mindthegap-helm-registry/Dockerfile

@@ -1,16 +1,9 @@
-ARG MINDTHEGAP_VERSION=v1.14.4
-
+ARG VERSION
+ARG MINDTHEGAP_VERSION
 FROM --platform=${BUILDPLATFORM} ghcr.io/mesosphere/mindthegap:${MINDTHEGAP_VERSION} as bundle_builder
 # this gets called by goreleaser so the copy source has to be the path relative to the repo root.
 RUN --mount=source=./hack/addons/mindthegap-helm-registry/repos.yaml,target=/repos.yaml \
-    ["/ko-app/mindthegap", "create", "bundle", "--helm-charts-file=/repos.yaml", "--output-file=/tmp/helm-charts.tar"]
+    ["/ko-app/mindthegap", "create", "bundle", "--helm-charts-file=/repos.yaml", "--output-file=/tmp/helm-charts-${VERSION}.tar"]
 
-FROM --platform=${TARGETPLATFORM} ghcr.io/mesosphere/mindthegap:${MINDTHEGAP_VERSION}
-COPY --from=bundle_builder /tmp/helm-charts.tar /tmp/helm-charts.tar
-VOLUME /certs
-CMD [ "serve", "bundle", \
-      "--bundle=/tmp/helm-charts.tar", \
-      "--listen-port=5000", \
-      "--listen-address=0.0.0.0", \
-      "--tls-private-key-file=/certs/tls.key", \
-      "--tls-cert-file=/certs/tls.crt" ]
+FROM --platform=${TARGETPLATFORM} alpine
+COPY --from=bundle_builder /tmp/helm-charts-${VERSION}.tar /charts/helm-charts-${VERSION}.tar