Merge branch 'master' into supportKarporSigningKey

KusionStack · Aug 21, 2024 · 6a1db3c · 6a1db3c
2 parents b03e248 + f1ad6c2
commit 6a1db3c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/charts/karpor/README.md b/charts/karpor/README.md
@@ -1,6 +1,6 @@
 # Karpor Chart
 
-![Version: 0.5.6](https://img.shields.io/badge/Version-0.5.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.5](https://img.shields.io/badge/AppVersion-0.4.5-informational?style=flat-square)
+![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.8](https://img.shields.io/badge/AppVersion-0.4.8-informational?style=flat-square)
 
 A Helm chart for Karpor, a modern kubernetes visualization tool.
 
@@ -122,8 +122,8 @@ This one-time job is used to generate root certificates and some preliminary wor
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| job.image.repo | string | `"golang"` | Repository for the Job image. |
-| job.image.tag | string | `"1.19"` | Specific tag for the Job image. |
+| job.image.repo | string | `"kusionstack/karpor"` | Repository for the Job image. |
+| job.image.tag | string | `""` | Tag for Karpor image. Defaults to the chart's appVersion if not specified. |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)
diff --git a/charts/karpor/templates/etcd.yml b/charts/karpor/templates/etcd.yml
@@ -49,7 +49,17 @@ spec:
     - metadata:
         name: data
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes:
+        {{- range .Values.etcd.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
         resources:
           requests:
-            storage: 10Gi
+            storage: {{ .Values.etcd.persistence.size | quote }}
+        {{- if .Values.etcd.persistence.storageClass }}
+        {{- if (eq "-" .Values.etcd.persistence.storageClass) }}
+        storageClassName: ""
+        {{- else }}
+        storageClassName: "{{ .Values.etcd.persistence.storageClass }}"
+        {{- end }}
+        {{- end }}
diff --git a/charts/karpor/templates/job.yml b/charts/karpor/templates/job.yml
@@ -9,13 +9,13 @@ spec:
     spec:
       containers:
         - name: karpor-generate-cert
-          image: {{ include "karpor.realImage" (dict "context" . "repo" .Values.job.image.repo "tag" .Values.job.image.tag) }}
+          image: {{ include "karpor.realImage" (dict "context" . "repo" .Values.job.image.repo "tag" .Values.job.image.tag "needV" (not (hasPrefix "v" .Values.job.image.tag))) }}
           imagePullPolicy: {{ .Values.global.image.imagePullPolicy }} 
           command:
           - /bin/sh
           - -c
           args:
-          - go install github.com/KusionStack/karpor/hack/cert-generator@latest && cert-generator --ca-name=karpor-secret --kubeconfig-name=karpor-kubeconfig
+          - /cert-generator --ca-name=karpor-secret --kubeconfig-name=karpor-kubeconfig
       restartPolicy: OnFailure
 ---
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/charts/karpor/values.yaml b/charts/karpor/values.yaml
@@ -111,11 +111,23 @@ etcd:
       cpu: 500m
       memory: 1Gi
       ephemeral-storage: 10Gi
+  persistence:
+    # enabled: true
+    size: 10Gi
+    accessModes:
+      - ReadWriteOnce
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    ##
+    # storageClass: "-"
 
 # Configuration for Jobs
 job:
   image:
     # -- Repository for the Job image.
-    repo: golang
-    # -- Specific tag for the Job image.
-    tag: "1.19"
+    repo: kusionstack/karpor
+    # -- Tag for Karpor image. Defaults to the chart's appVersion if not specified.
+    tag: ""