fix: fix/update-helm-version

stuttgart-things · Feb 3, 2025 · e3217e9 · e3217e9
1 parent 6d1e8a9
commit e3217e9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -88,6 +88,7 @@ tasks:
     cmds:
       - |
         BUILD_IMAGE=$(ko build {{ .MODULE }} --image-label org.opencontainers.image.source=https://github.com/stuttgart-things/clusterbook --push)
+        VERSION={{ .VERSION }}
         echo ${BUILD_IMAGE}
         dagger call -m github.com/jpadams/daggerverse/[email protected] scan-image --image-ref ${BUILD_IMAGE}
 
@@ -101,8 +102,8 @@ tasks:
         # UPDATE HELM CHART
         sed -i "s|^\(\s*image:\s*\).*|\1$(echo ${BUILD_IMAGE} | awk -F':' '{print $1}')|" {{ .CHART_DIR }}/{{ .PROJECT_NAME }}/values.yaml
         sed -i "s|^\(\s*tag:\s*\).*|\1$(echo ${BUILD_IMAGE} | awk -F':' '{print $2}')|" {{ .CHART_DIR }}//{{ .PROJECT_NAME }}/values.yaml
-        sed -i "s/^version: .*/version: {{ .VERSION }}-chart/" {{ .META_PATH }}
-        sed -i "s/^appVersion: .*/appVersion: {{ .VERSION }}/" {{ .META_PATH }}
+        sed -i "s/^version: .*/version: ${VERSION}-chart/" {{ .META_PATH }}
+        sed -i "s/^appVersion: .*/appVersion: ${VERSION}/" {{ .META_PATH }}
 
         # UPDATE HELMFILE
         yq eval ".imageTag = \"$(echo ${BUILD_IMAGE} | awk -F':' '{print $2}')\"" -i {{ .PATH_HELM_ENV }}/{{ .K8S_ENV }}.yaml

diff --git a/helm/clusterbook/Chart.yaml b/helm/clusterbook/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: clusterbook
 description: A Helm chart for Kubernetes
 type: application
-version: v1.2.0-chart
-appVersion: v1.2.0
+version: dev-v1.2.0-chart
+appVersion: dev-v1.2.0
 dependencies:
   - name: sthings-helm-toolkit
     version: 2.4.74

diff --git a/helm/clusterbook/values.yaml b/helm/clusterbook/values.yaml
@@ -40,10 +40,10 @@ deployment:
       memory: 128Mi
   containers:
     clusterbook:
-      image: ghcr.io/stuttgart-things/clusterbook/clusterbook-5f3bb9105a15fafb0e52842968611a61@sha256
+      image: ghcr.io/stuttgart-things/clusterbook/clusterbook
       replicaCount: 1
       imagePullPolicy: Always
-      tag: 66bf3b7ce1d609af5b767f84d0b30c2f2e635a0db8f25025c29719daa99f0adb
+      tag: v1.2.1
       securityContext:
         capabilities: {}
 

diff --git a/helm/env/dev.yaml b/helm/env/dev.yaml
@@ -4,4 +4,4 @@ enableCertificateRequest: true
 ingressDomain: fluxdev-3.sthings-vsphere.labul.sva.de #rke2.sthings-vsphere.labul.sva.de
 issuerKind: ClusterIssuer
 issuerName: vault-approle
-imageTag: 66bf3b7ce1d609af5b767f84d0b30c2f2e635a0db8f25025c29719daa99f0adb
+imageTag: v1.2.1