From af82c130c692263cd1f4b467ff6c9c20c8a2e90e Mon Sep 17 00:00:00 2001
From: iwilltry42 <iwilltry42@gmail.com>
Date: Wed, 18 Aug 2021 19:31:57 +0200
Subject: [PATCH] manifests: strip v prefix from semver

---
 dind-manifest.tmpl  | 10 +++++-----
 manifest.tmpl       | 10 +++++-----
 proxy/manifest.tmpl | 10 +++++-----
 tools/manifest.tmpl | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dind-manifest.tmpl b/dind-manifest.tmpl
index d28f5f21..20448a1b 100644
--- a/dind-manifest.tmpl
+++ b/dind-manifest.tmpl
@@ -1,4 +1,4 @@
-image: rancher/k3d:{{#if build.tag}}{{build.tag}}{{else}}latest{{/if}}dind
+image: rancher/k3d:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}dind
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
@@ -6,21 +6,21 @@ tags:
 {{/each}}
 {{/if}}
 manifests:
-  - image: rancher/k3d:{{#if build.tag}}{{build.tag}}-{{/if}}dind-linux-amd64
+  - image: rancher/k3d:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}dind-linux-amd64
     platform:
       architecture: amd64
       os: linux
-  - image: rancher/k3d:{{#if build.tag}}{{build.tag}}-{{/if}}dind-linux-arm64
+  - image: rancher/k3d:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}dind-linux-arm64
     platform:
       variant: v8
       architecture: arm64
       os: linux
-  - image: rancher/k3d:{{#if build.tag}}{{build.tag}}-{{/if}}dind-linux-arm
+  - image: rancher/k3d:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}dind-linux-arm
     platform:
       variant: v7
       architecture: arm
       os: linux
-  - image: rancher/k3d:{{#if build.tag}}{{build.tag}}-{{/if}}dind-linux-arm
+  - image: rancher/k3d:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}dind-linux-arm
     platform:
       variant: v6
       architecture: arm
diff --git a/manifest.tmpl b/manifest.tmpl
index 44606f58..dc73c676 100644
--- a/manifest.tmpl
+++ b/manifest.tmpl
@@ -1,4 +1,4 @@
-image: rancher/k3d:{{#if build.tag}}{{build.tag}}{{else}}latest{{/if}}
+image: rancher/k3d:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
@@ -6,21 +6,21 @@ tags:
 {{/each}}
 {{/if}}
 manifests:
-  - image: rancher/k3d:{{#if build.tag}}{{build.tag}}-{{/if}}linux-amd64
+  - image: rancher/k3d:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
     platform:
       architecture: amd64
       os: linux
-  - image: rancher/k3d:{{#if build.tag}}{{build.tag}}-{{/if}}linux-arm64
+  - image: rancher/k3d:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
     platform:
       variant: v8
       architecture: arm64
       os: linux
-  - image: rancher/k3d:{{#if build.tag}}{{build.tag}}-{{/if}}linux-arm
+  - image: rancher/k3d:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
     platform:
       variant: v7
       architecture: arm
       os: linux
-  - image: rancher/k3d:{{#if build.tag}}{{build.tag}}-{{/if}}linux-arm
+  - image: rancher/k3d:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
     platform:
       variant: v6
       architecture: arm
diff --git a/proxy/manifest.tmpl b/proxy/manifest.tmpl
index 3a64f87c..0dd79bc6 100644
--- a/proxy/manifest.tmpl
+++ b/proxy/manifest.tmpl
@@ -1,4 +1,4 @@
-image: rancher/k3d-proxy:{{#if build.tag}}{{build.tag}}{{else}}latest{{/if}}
+image: rancher/k3d-proxy:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
@@ -6,21 +6,21 @@ tags:
 {{/each}}
 {{/if}}
 manifests:
-  - image: rancher/k3d-proxy:{{#if build.tag}}{{build.tag}}-{{/if}}linux-amd64
+  - image: rancher/k3d-proxy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
     platform:
       architecture: amd64
       os: linux
-  - image: rancher/k3d-proxy:{{#if build.tag}}{{build.tag}}-{{/if}}linux-arm64
+  - image: rancher/k3d-proxy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
     platform:
       variant: v8
       architecture: arm64
       os: linux
-  - image: rancher/k3d-proxy:{{#if build.tag}}{{build.tag}}-{{/if}}linux-arm
+  - image: rancher/k3d-proxy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
     platform:
       variant: v7
       architecture: arm
       os: linux
-  - image: rancher/k3d-proxy:{{#if build.tag}}{{build.tag}}-{{/if}}linux-arm
+  - image: rancher/k3d-proxy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
     platform:
       variant: v6
       architecture: arm
diff --git a/tools/manifest.tmpl b/tools/manifest.tmpl
index c0557364..d762785c 100644
--- a/tools/manifest.tmpl
+++ b/tools/manifest.tmpl
@@ -1,4 +1,4 @@
-image: rancher/k3d-tools:{{#if build.tag}}{{build.tag}}{{else}}latest{{/if}}
+image: rancher/k3d-tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
@@ -6,21 +6,21 @@ tags:
 {{/each}}
 {{/if}}
 manifests:
-  - image: rancher/k3d-tools:{{#if build.tag}}{{build.tag}}-{{/if}}linux-amd64
+  - image: rancher/k3d-tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
     platform:
       architecture: amd64
       os: linux
-  - image: rancher/k3d-tools:{{#if build.tag}}{{build.tag}}-{{/if}}linux-arm64
+  - image: rancher/k3d-tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
     platform:
       variant: v8
       architecture: arm64
       os: linux
-  - image: rancher/k3d-tools:{{#if build.tag}}{{build.tag}}-{{/if}}linux-arm
+  - image: rancher/k3d-tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
     platform:
       variant: v7
       architecture: arm
       os: linux
-  - image: rancher/k3d-tools:{{#if build.tag}}{{build.tag}}-{{/if}}linux-arm
+  - image: rancher/k3d-tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
     platform:
       variant: v6
       architecture: arm