Merge pull request #96 from projectsyn/fix/k8up-v1-v2-reclass

Restructure K8up image specification
projectsyn · Jul 25, 2022 · 84db41d · 84db41d
2 parents 0fd5ceb + 168fbe7
commit 84db41d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/class/backup-k8up.yml b/class/backup-k8up.yml
@@ -7,15 +7,15 @@ parameters:
         version: ${backup_k8up:charts:k8up:version}
         output_path: dependencies/backup-k8up/helmcharts/v${backup_k8up:charts:k8up:version}
       - type: https
-        source: https://github.com/vshn/k8up/releases/download/${backup_k8up:_k8upImage:${backup_k8up:majorVersion}:tag}/${backup_k8up:crd}
-        output_path: dependencies/backup-k8up/crds/${backup_k8up:_k8upImage:${backup_k8up:majorVersion}:tag}/02_k8up_crds.yaml
+        source: https://github.com/vshn/k8up/releases/download/${backup_k8up:images:k8up:tag}/${backup_k8up:crd}
+        output_path: dependencies/backup-k8up/crds/${backup_k8up:images:k8up:tag}/02_k8up_crds.yaml
     compile:
       - input_paths:
           - backup-k8up/component/app.jsonnet
         input_type: jsonnet
         output_path: apps/
       - input_paths:
-          - backup-k8up/crds/${backup_k8up:_k8upImage:${backup_k8up:majorVersion}:tag}/
+          - backup-k8up/crds/${backup_k8up:images:k8up:tag}/
         output_path: ${_instance}
         input_type: copy
         output_type: yaml

diff --git a/class/defaults.yml b/class/defaults.yml
@@ -14,7 +14,11 @@ parameters:
         registry: ghcr.io
         repository: k8up-io/k8up
         tag: v1.2.0
-      v2: ${backup_k8up:images:k8up}
+      v2:
+        registry: ghcr.io
+        repository: k8up-io/k8up
+        tag: v2.4.0
+        pullPolicy: IfNotPresent
     =_chartVersion:
       v1: 1.1.0
       v2: 3.0.0
@@ -34,11 +38,7 @@ parameters:
         version: ${backup_k8up:_chartVersion:${backup_k8up:majorVersion}}
 
     images:
-      k8up:
-        registry: ghcr.io
-        repository: k8up-io/k8up
-        tag: v2.4.0
-        pullPolicy: IfNotPresent
+      k8up: ${backup_k8up:_k8upImage:${backup_k8up:majorVersion}}
       # This image is deprecated since K8up v2 support
       wrestic:
         registry: ghcr.io
@@ -54,7 +54,7 @@ parameters:
 
     helmValues:
       replicaCount: 1
-      image: ${backup_k8up:_k8upImage:${backup_k8up:majorVersion}}
+      image: ${backup_k8up:images:k8up}
       k8up:
         enableLeaderElection: true
         timezone: "Etc/UTC"