chore: have Addon's chartLocationURL attribute setup as '.Values.addo…

…nChartLocationBase' template value (#3899)
apecloud · Jun 21, 2023 · 515f6ef · 515f6ef
1 parent de7c9f2
commit 515f6ef
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 24 deletions.
diff --git a/deploy/helm/templates/addons/alertmanager-webhook-adaptor-addon.yaml b/deploy/helm/templates/addons/alertmanager-webhook-adaptor-addon.yaml
@@ -15,7 +15,7 @@ spec:
 
   helm:
     # chartLocationURL: https://github.com/apecloud/helm-charts/releases/download/alertmanager-webhook-adaptor-0.1.4/alertmanager-webhook-adaptor-0.1.4.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/alertmanager-webhook-adaptor-0.1.4.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/alertmanager-webhook-adaptor-0.1.4.tgz
 
     installValues:
       configMapRefs:

diff --git a/deploy/helm/templates/addons/apecloud-mysql-addon.yaml b/deploy/helm/templates/addons/apecloud-mysql-addon.yaml
@@ -17,7 +17,7 @@ spec:
 
   helm:
     # chartLocationURL: https://github.com/apecloud/helm-charts/releases/download/apecloud-mysql-{{ default .Chart.Version .Values.versionOverride }}/apecloud-mysql-{{ default .Chart.Version .Values.versionOverride }}.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/apecloud-mysql-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/apecloud-mysql-{{ default .Chart.Version .Values.versionOverride }}.tgz
 
   defaultInstallValues:
     - enabled: true

diff --git a/deploy/helm/templates/addons/aws-loadbalancer-controller-addon.yaml b/deploy/helm/templates/addons/aws-loadbalancer-controller-addon.yaml
@@ -14,7 +14,7 @@ spec:
 
   helm:
     # origin: https://aws.github.io/eks-charts/aws-load-balancer-controller-1.4.8.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/aws-load-balancer-controller-1.4.8.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/aws-load-balancer-controller-1.4.8.tgz
 
     installValues:
       configMapRefs:

diff --git a/deploy/helm/templates/addons/csi-driver-addon.yaml b/deploy/helm/templates/addons/csi-driver-addon.yaml
@@ -4,14 +4,18 @@ metadata:
   name: kubeblocks-csi-driver
   labels:
     {{- include "kubeblocks.labels" . | nindent 4 }}
+  {{- if .Values.keepAddons }}
+  annotations:
+    helm.sh/resource-policy: keep
+  {{- end }}
 spec:
   description: 'Kubeblocks CSI driver provides a container storage interface used by Container Orchestrators
     to manage the lifecycle of block storage for cloud vendors.'
   type: Helm
 
   helm:
     # chartLocationURL: https://github.com/apecloud/helm-charts/releases/download/kubeblocks-csi-driver-0.1.0/kubeblocks-csi-driver-0.1.0.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/kubeblocks-csi-driver-0.1.0.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/kubeblocks-csi-driver-0.1.0.tgz
     valuesMapping:
       valueMap:
         replicaCount: controller.replicaCount

diff --git a/deploy/helm/templates/addons/csi-hostpath-driver-addon.yaml b/deploy/helm/templates/addons/csi-hostpath-driver-addon.yaml
@@ -14,7 +14,7 @@ spec:
   type: Helm
 
   helm:
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/csi-hostpath-driver-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/csi-hostpath-driver-{{ default .Chart.Version .Values.versionOverride }}.tgz
     installValues:
       configMapRefs:
         - name: csi-hostpath-driver-chart-kubeblocks-values

diff --git a/deploy/helm/templates/addons/csi-s3-addon.yaml b/deploy/helm/templates/addons/csi-s3-addon.yaml
@@ -15,7 +15,7 @@ spec:
 
   helm:
     # chartLocationURL: https://raw.githubusercontent.com/cloudve/helm-charts/master/charts/csi-s3-0.31.3.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/csi-s3-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/csi-s3-{{ default .Chart.Version .Values.versionOverride }}.tgz
     installValues:
       configMapRefs:
         - name: csi-s3-chart-kubeblocks-values

diff --git a/deploy/helm/templates/addons/grafana-addon.yaml b/deploy/helm/templates/addons/grafana-addon.yaml
@@ -15,7 +15,7 @@ spec:
 
   helm:
     # chartLocationURL: https://github.com/grafana/helm-charts/releases/download/grafana-6.43.5/grafana-6.43.5.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/grafana-6.43.5.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/grafana-6.43.5.tgz
     installValues:
       configMapRefs:
         - name: grafana-chart-kubeblocks-values

diff --git a/deploy/helm/templates/addons/migration-addon.yaml b/deploy/helm/templates/addons/migration-addon.yaml
@@ -15,7 +15,7 @@ spec:
   type: Helm
 
   helm:
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/dt-platform-0.1.0.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/dt-platform-0.1.0.tgz
     valuesMapping:
       valueMap:
         replicaCount: replicaCount

diff --git a/deploy/helm/templates/addons/milvus-addon.yaml b/deploy/helm/templates/addons/milvus-addon.yaml
@@ -15,7 +15,7 @@ spec:
   type: Helm
 
   helm:
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/milvus-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/milvus-{{ default .Chart.Version .Values.versionOverride }}.tgz
 
   installable:
     autoInstall: false

diff --git a/deploy/helm/templates/addons/mongodb-addon.yaml b/deploy/helm/templates/addons/mongodb-addon.yaml
@@ -16,7 +16,7 @@ spec:
 
   helm:
     # chartLocationURL: https://github.com/apecloud/helm-charts/releases/download/mongodb-{{ default .Chart.Version .Values.versionOverride }}/mongodb-{{ default .Chart.Version .Values.versionOverride }}.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/mongodb-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/mongodb-{{ default .Chart.Version .Values.versionOverride }}.tgz
 
   installable:
     autoInstall: true

diff --git a/deploy/helm/templates/addons/nyancat-addon.yaml b/deploy/helm/templates/addons/nyancat-addon.yaml
@@ -15,8 +15,8 @@ spec:
   type: Helm
 
   helm:
-    # chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/nyancat-{{ default .Chart.Version .Values.versionOverride }}.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/nyancat-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    # chartLocationURL: {{ .Values.addonChartLocationBase }}/nyancat-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/nyancat-{{ default .Chart.Version .Values.versionOverride }}.tgz
     valuesMapping:
       valueMap:
         replicaCount: replicaCount

diff --git a/deploy/helm/templates/addons/postgresql-addon.yaml b/deploy/helm/templates/addons/postgresql-addon.yaml
@@ -16,7 +16,7 @@ spec:
 
   helm:
     # chartLocationURL: https://github.com/apecloud/helm-charts/releases/download/postgresql-{{ default .Chart.Version .Values.versionOverride }}/postgresql-{{ default .Chart.Version .Values.versionOverride }}.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/postgresql-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/postgresql-{{ default .Chart.Version .Values.versionOverride }}.tgz
 
   installable:
     autoInstall: true

diff --git a/deploy/helm/templates/addons/prometheus-addon.yaml b/deploy/helm/templates/addons/prometheus-addon.yaml
@@ -15,7 +15,7 @@ spec:
 
   helm:
     # chartLocationURL: https://github.com/prometheus-community/helm-charts/releases/download/prometheus-15.16.1/prometheus-15.16.1.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/prometheus-15.16.1.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/prometheus-15.16.1.tgz
     installValues:
       configMapRefs:
         - name: {{ include "addon.prometheus.name" . }}-chart-kubeblocks-values

diff --git a/deploy/helm/templates/addons/qdrant-addon.yaml b/deploy/helm/templates/addons/qdrant-addon.yaml
@@ -15,7 +15,7 @@ spec:
   type: Helm
 
   helm:
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/qdrant-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/qdrant-{{ default .Chart.Version .Values.versionOverride }}.tgz
 
   installable:
     autoInstall: false

diff --git a/deploy/helm/templates/addons/redis-addon.yaml b/deploy/helm/templates/addons/redis-addon.yaml
@@ -16,7 +16,7 @@ spec:
 
   helm:
     # chartLocationURL: https://github.com/apecloud/helm-charts/releases/download/redis-{{ default .Chart.Version .Values.versionOverride }}/redis-{{ default .Chart.Version .Values.versionOverride }}.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/redis-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/redis-{{ default .Chart.Version .Values.versionOverride }}.tgz
 
   installable:
     autoInstall: true

diff --git a/deploy/helm/templates/addons/snapshot-controller-addon.yaml b/deploy/helm/templates/addons/snapshot-controller-addon.yaml
@@ -17,7 +17,7 @@ spec:
 
   helm:
     # chartLocationURL: https://github.com/piraeusdatastore/helm-charts/releases/download/snapshot-controller-1.7.2/snapshot-controller-1.7.2.tgz
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/snapshot-controller-1.7.2.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/snapshot-controller-1.7.2.tgz
     installValues:
       configMapRefs:
         - name: snapshot-controller-chart-kubeblocks-values

diff --git a/deploy/helm/templates/addons/weaviate-addon.yaml b/deploy/helm/templates/addons/weaviate-addon.yaml
@@ -15,7 +15,7 @@ spec:
   type: Helm
 
   helm:
-    chartLocationURL: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/weaviate-{{ default .Chart.Version .Values.versionOverride }}.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/weaviate-{{ default .Chart.Version .Values.versionOverride }}.tgz
 
   installable:
     autoInstall: false

diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -285,24 +285,30 @@ dataProtection:
   backupPVConfigMapNamespace: ""
 
 ## Addon controller settings, this will require cluster-admin clusterrole.
+##
+## @param addonController.enabled
+## @param addonController.jobTTL - is addon job time-to-live period, this value is time.Duration-parseable string.
+  ## default value is "5m" if not provided.
+## @param addonController.jobImagePullPolicy - addon install job image pull policy.
 addonController:
   enabled: true
-  ## @param jobTTL is addon job time-to-live period, this value is time.Duration-parseable string.
-  ## default value is "5m" if not provided.
-  ##
   jobTTL: "5m"
   jobImagePullPolicy: IfNotPresent
 
+
+## @param keepAddons - keep Addon CR objects when delete this chart.
 keepAddons: false
 
+## @param addonChartLocationBase - KubeBlocks official addon's chart location base, to be released in an air-gapped environment.
+addonChartLocationBase: https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts
+
 ## Dashboards settings
 ##
+## @param dashboards.enabled - If false, dashboards will not be installed.
 dashboards:
-  ## If false, dashboards will not be installed
-  ##
   enabled: true
 
-# Sub-charts
+# Sub-charts values (NOTES: following doesn't required @param documentations)
 prometheus:
   ## If false, prometheus sub-chart will not be installed
   ##