feat: direct use cert-generator in karpor (#49)

* feat: direct use cert-generator in karpor * refactor: update job image
KusionStack · Aug 7, 2024 · 1f4a979 · 1f4a979
1 parent 3446b6a
commit 1f4a979
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/charts/karpor/Chart.yaml b/charts/karpor/Chart.yaml
@@ -3,10 +3,10 @@
 apiVersion: v2
 name: karpor
 # The Chart Version
-version: 0.5.7
+version: 0.6.0
 type: application
 # The Application Version in the Chart
-appVersion: 0.4.6
+appVersion: 0.4.7
 description: A Helm chart for Karpor, a modern kubernetes visualization tool.
 home: https://github.com/KusionStack/karpor
 icon: https://kusionstack.io/karpor/assets/logo/logo.svg

diff --git a/charts/karpor/README.md b/charts/karpor/README.md
@@ -1,6 +1,6 @@
 # Karpor Chart
 
-![Version: 0.5.7](https://img.shields.io/badge/Version-0.5.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.6](https://img.shields.io/badge/AppVersion-0.4.6-informational?style=flat-square)
+![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.7](https://img.shields.io/badge/AppVersion-0.4.7-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/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
@@ -116,6 +116,6 @@ etcd:
 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: ""