Add helm-chart-fluid-1.0.3, To #58466088

Signed-off-by: cheyang <[email protected]>
fluid-cloudnative · Nov 1, 2024 · f8346bf · f8346bf
1 parent 49c08ff
commit f8346bf
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 13 deletions.
diff --git a/history-versions/v1.0.3/fluid/Chart.yaml b/history-versions/v1.0.3/fluid/Chart.yaml
@@ -18,7 +18,7 @@ version: 1.0.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 1.0.3-3e38c94
+appVersion: 1.0.3-ccdf3a9
 home: https://github.com/fluid-cloudnative/fluid
 keywords:
   - category:data

diff --git a/history-versions/v1.0.3/fluid/templates/_helpers.tpl b/history-versions/v1.0.3/fluid/templates/_helpers.tpl
@@ -93,8 +93,10 @@ Create the name of the service account to use
 {{- end -}}
 
 {{- define "fluid.controlplane.resources" -}}
-{{- if .resources -}}
-{{ toYaml .resources }}
+{{- $ := index . 0 -}}
+{{- $resources := index . 1 -}}
+{{- if $resources -}}
+{{ toYaml $resources }}
 {{- end -}}
 {{- end -}}
 

diff --git a/history-versions/v1.0.3/fluid/templates/controller/alluxioruntime_controller.yaml b/history-versions/v1.0.3/fluid/templates/controller/alluxioruntime_controller.yaml
@@ -95,5 +95,5 @@ spec:
           name: metrics
           protocol: TCP
         resources:
-          {{- include "fluid.controlplane.resources" .Values.runtime.alluxio | nindent 10 }}
+          {{- include "fluid.controlplane.resources" (list $ .Values.runtime.alluxio.resources) | nindent 10 }}
       terminationGracePeriodSeconds: 10
diff --git a/history-versions/v1.0.3/fluid/templates/controller/dataset_controller.yaml b/history-versions/v1.0.3/fluid/templates/controller/dataset_controller.yaml
@@ -76,5 +76,5 @@ spec:
           name: metrics
           protocol: TCP
         resources:
-          {{- include "fluid.controlplane.resources" .Values.dataset | nindent 10 }}
+          {{- include "fluid.controlplane.resources" (list $ .Values.dataset.resources) | nindent 10 }}
       terminationGracePeriodSeconds: 10
diff --git a/history-versions/v1.0.3/fluid/templates/controller/efcruntime_controller.yaml b/history-versions/v1.0.3/fluid/templates/controller/efcruntime_controller.yaml
@@ -93,5 +93,5 @@ spec:
           name: metrics
           protocol: TCP
         resources:
-          {{- include "fluid.controlplane.resources" .Values.runtime.efc | nindent 10 }}
+          {{- include "fluid.controlplane.resources" (list $ .Values.runtime.efc.resources) | nindent 10 }}
       terminationGracePeriodSeconds: 10
diff --git a/history-versions/v1.0.3/fluid/templates/controller/fluidapp_controller.yaml b/history-versions/v1.0.3/fluid/templates/controller/fluidapp_controller.yaml
@@ -51,5 +51,5 @@ spec:
             name: metrics
             protocol: TCP
         resources:
-          {{- include "fluid.controlplane.resources" .Values.fluidapp | nindent 10 }}
+          {{- include "fluid.controlplane.resources" (list $ .Values.fluidapp.resources) | nindent 10 }}
       terminationGracePeriodSeconds: 10
diff --git a/history-versions/v1.0.3/fluid/templates/controller/goosefsruntime_controller.yaml b/history-versions/v1.0.3/fluid/templates/controller/goosefsruntime_controller.yaml
@@ -82,5 +82,5 @@ spec:
           name: metrics
           protocol: TCP
         resources:
-          {{- include "fluid.controlplane.resources" .Values.runtime.goosefs | nindent 10 }}
+          {{- include "fluid.controlplane.resources" (list $ .Values.runtime.goosefs.resources) | nindent 10 }}
       terminationGracePeriodSeconds: 10
diff --git a/history-versions/v1.0.3/fluid/templates/controller/jindoruntime_controller.yaml b/history-versions/v1.0.3/fluid/templates/controller/jindoruntime_controller.yaml
@@ -94,5 +94,5 @@ spec:
             name: metrics
             protocol: TCP
         resources:
-          {{- include "fluid.controlplane.resources" .Values.runtime.jindo | nindent 10 }}
+          {{- include "fluid.controlplane.resources" (list $ .Values.runtime.jindo.resources) | nindent 10 }}
       terminationGracePeriodSeconds: 10
diff --git a/history-versions/v1.0.3/fluid/templates/controller/juicefsruntime_controller.yaml b/history-versions/v1.0.3/fluid/templates/controller/juicefsruntime_controller.yaml
@@ -83,5 +83,5 @@ spec:
           name: metrics
           protocol: TCP
         resources:
-          {{- include "fluid.controlplane.resources" .Values.runtime.juicefs | nindent 10 }}
+          {{- include "fluid.controlplane.resources" (list $ .Values.runtime.juicefs.resources) | nindent 10 }}
       terminationGracePeriodSeconds: 10
diff --git a/history-versions/v1.0.3/fluid/templates/controller/thinruntime_controller.yaml b/history-versions/v1.0.3/fluid/templates/controller/thinruntime_controller.yaml
@@ -24,6 +24,10 @@ spec:
         controller.runtime.fluid.io/replicas: {{ .Values.runtime.thin.replicas | quote }}
       {{- end }}
     spec:
+      {{- with .Values.image.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       serviceAccountName: thinruntime-controller
       {{ include "fluid.controlplane.affinity" . | nindent 6}}
       {{- if .Values.runtime.thin.tolerations }}
@@ -62,5 +66,5 @@ spec:
             name: metrics
             protocol: TCP
         resources:
-          {{- include "fluid.controlplane.resources" .Values.runtime.thin | nindent 10 }}
+          {{- include "fluid.controlplane.resources" (list $ .Values.runtime.thin.resources) | nindent 10 }}
       terminationGracePeriodSeconds: 10
diff --git a/history-versions/v1.0.3/fluid/templates/controller/vineyardruntime_controller.yaml b/history-versions/v1.0.3/fluid/templates/controller/vineyardruntime_controller.yaml
@@ -76,5 +76,5 @@ spec:
             name: metrics
             protocol: TCP
         resources:
-          {{- include "fluid.controlplane.resources" .Values.runtime.vineyard | nindent 10 }}
+          {{- include "fluid.controlplane.resources" (list $ .Values.runtime.vineyard.resources) | nindent 10 }}
       terminationGracePeriodSeconds: 10
diff --git a/history-versions/v1.0.3/fluid/templates/upgrade/crd-upgrade.yaml b/history-versions/v1.0.3/fluid/templates/upgrade/crd-upgrade.yaml
@@ -15,6 +15,10 @@ spec:
 {{- end }}
   template:
     spec:
+      {{- with .Values.image.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       serviceAccountName: fluid-crds-upgrade
       containers:
         - name: fluid-crds-upgrade

diff --git a/history-versions/v1.0.3/fluid/values.yaml b/history-versions/v1.0.3/fluid/values.yaml
@@ -14,7 +14,7 @@ image:
 # Default registry, namespace and version tag for images managed by fluid
 imagePrefix: &defaultImagePrefix fluidcloudnative
 # imagePrefix: &defaultImagePrefix registry.aliyuncs.com/fluid
-version: &defaultVersion v1.0.3-3e38c94
+version: &defaultVersion v1.0.3-ccdf3a9
 
 crdUpgrade:
   enabled: true