From dc84a698cc7274ba7b9606475ade9a188436b279 Mon Sep 17 00:00:00 2001
From: miko-ov <miko@oostvoort.com>
Date: Fri, 15 Dec 2023 09:34:17 +0800
Subject: [PATCH] adjust helm values

---
 .github/workflows/demo1.yaml          | 16 ++++++++--------
 chart/pixelaw-core/templates/pvc.yaml | 24 ++++++++++++------------
 chart/pixelaw-core/values.yaml        | 10 +++++-----
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/demo1.yaml b/.github/workflows/demo1.yaml
index e023a1b..9332327 100644
--- a/.github/workflows/demo1.yaml
+++ b/.github/workflows/demo1.yaml
@@ -52,7 +52,7 @@ jobs:
 
       - name: Lint Helm Chart         
         run: |       
-          helm lint --values ./chart/pixelaw-core/values.yaml ./chart/pixelaw-core                  
+          helm lint --values ./chart/$PROJECTNAME/values.yaml ./chart/$PROJECTNAME                  
 
 
   deploy:
@@ -74,16 +74,16 @@ jobs:
           ARGOCD_SERVER: ${{ secrets.ARGOCD_SERVER }}
           ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_AUTH_TOKEN }}   
         run: |
-            argocd app create pixelaw-core-demo1 \
+            argocd app create $PROJECTNAME-demo1 \
                 --repo https://pixelaw.github.io/core/ \
                 --path chart/  \
-                --revision 0.0.33 \
-                --helm-chart pixelaw-core \
-                --dest-namespace pixelaw-core-demo1 \
+                --revision ${VERSION:1} \
+                --helm-chart $PROJECTNAME \
+                --dest-namespace $PROJECTNAME-demo1 \
                 --dest-server https://kubernetes.default.svc \
-                --helm-set-string dockerImage=$REGISTRY/pixelaw-core:v0.0.33 \
+                --helm-set-string dockerImage=$REGISTRY/$PROJECTNAME:${VERSION} \
                 --upsert \
                 --server $ARGOCD_SERVER \
                 --auth-token $ARGOCD_AUTH_TOKEN 
-            argocd app sync pixelaw-core
-            argocd app wait pixelaw-core
\ No newline at end of file
+            argocd app sync $PROJECTNAME
+            argocd app wait $PROJECTNAME
\ No newline at end of file
diff --git a/chart/pixelaw-core/templates/pvc.yaml b/chart/pixelaw-core/templates/pvc.yaml
index 439c857..4a6bf72 100644
--- a/chart/pixelaw-core/templates/pvc.yaml
+++ b/chart/pixelaw-core/templates/pvc.yaml
@@ -1,12 +1,12 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Values.projectName }}-{{ .Values.nameSpace }}-{{ .Values.app }}-pvc
-  namespace: {{ .Values.projectName }}-{{ .Values.nameSpace }} 
-spec:
-  storageClassName: do-block-storage  
-  accessModes:
-    - ReadWriteOnce 
-  resources:
-    requests:
-      storage: 10Gi
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: {{ .Values.projectName }}-{{ .Values.nameSpace }}-{{ .Values.app }}-pvc
+#   namespace: {{ .Values.projectName }}-{{ .Values.nameSpace }} 
+# spec:
+#   storageClassName: do-block-storage  
+#   accessModes:
+#     - ReadWriteOnce 
+#   resources:
+#     requests:
+#       storage: 10Gi
diff --git a/chart/pixelaw-core/values.yaml b/chart/pixelaw-core/values.yaml
index 10bcfd6..13aa52f 100644
--- a/chart/pixelaw-core/values.yaml
+++ b/chart/pixelaw-core/values.yaml
@@ -1,4 +1,4 @@
-projectName: pixelaw-core
+projectName: pixelaw-core-demo1
 nameSpace: main
 appType:
   frontend: webapp
@@ -32,9 +32,9 @@ grpcToriiContainerService:
 domainName: pixelaw.xyz                # {{ .Values.domainName }}
 
 subDomainName: 
-  pixelaw: demo                     # {{ .Values.subDomainName.pixelaw }}
-  katana: katana.demo           # {{ .Values.subDomainName.katana }}
-  torii: torii.demo             # {{ .Values.subDomainName.torii }}
-  grpcTorii: grpc.demo    # {{ .Values.subDomainName.grpcTorii }}
+  pixelaw: demo1                     # {{ .Values.subDomainName.pixelaw }}
+  katana: katana1.demo           # {{ .Values.subDomainName.katana }}
+  torii: torii1.demo             # {{ .Values.subDomainName.torii }}
+  grpcTorii: grpc1.demo    # {{ .Values.subDomainName.grpcTorii }}
 
 dockerImage: oostvoort/pixelaw-core:latest
\ No newline at end of file