From 680df5703d2cc7fb73569ee774cf1b962d3b1664 Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka.garcia@spectrocloud.com>
Date: Tue, 13 Jun 2023 17:42:27 +0200
Subject: [PATCH] Bump fips packages (#281)

---
 packages/system/immucore/collection.yaml      |  4 +--
 packages/system/kairos-agent/build.yaml       |  2 +-
 packages/system/kairos-agent/collection.yaml  | 27 ++++++++++---------
 packages/system/kcrypt-challenger/build.yaml  |  4 +--
 .../system/kcrypt-challenger/collection.yaml  | 27 ++++++++++---------
 packages/system/kcrypt/collection.yaml        | 25 ++++++++---------
 6 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/packages/system/immucore/collection.yaml b/packages/system/immucore/collection.yaml
index ee5e686..5c4333b 100644
--- a/packages/system/immucore/collection.yaml
+++ b/packages/system/immucore/collection.yaml
@@ -1,7 +1,7 @@
 packages:
   - name: "immucore"
     category: "system"
-    version: "0.1.1-rc1"
+    version: "0.1.1-rc1+1"
     labels:
       github.repo: "immucore"
       autobump.revdeps: "true"
@@ -12,7 +12,7 @@ packages:
     description: "The Kairos immutability management interface"
   - name: "immucore"
     category: "fips"
-    version: "0.1.1-rc1"
+    version: "0.1.1-rc1+1"
     labels:
       github.repo: "immucore"
       autobump.revdeps: "true"
diff --git a/packages/system/kairos-agent/build.yaml b/packages/system/kairos-agent/build.yaml
index 244e5a2..1350358 100644
--- a/packages/system/kairos-agent/build.yaml
+++ b/packages/system/kairos-agent/build.yaml
@@ -12,7 +12,7 @@ requires:
 prelude:
   - apt-get update && apt-get install -y npm gcc
   - mkdir /go/src/github.com/${GITHUB_ORG}/ -p
-  - cd /go/src/github.com/${GITHUB_ORG}/ && git clone --branch v${PACKAGE_VERSION} https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git
+  - PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && cd /go/src/github.com/${GITHUB_ORG}/ && git clone --branch v${PACKAGE_VERSION} https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git
 env:
   - GITHUB_ORG={{ ( index .Values.labels "github.owner" ) }}
   - HUGO_VERSION=0.110.0
diff --git a/packages/system/kairos-agent/collection.yaml b/packages/system/kairos-agent/collection.yaml
index 53b501e..10b9a86 100644
--- a/packages/system/kairos-agent/collection.yaml
+++ b/packages/system/kairos-agent/collection.yaml
@@ -1,19 +1,7 @@
 packages:
   - name: "kairos-agent"
     category: "system"
-    version: "2.1.3"
-    arch: "amd64"
-    labels:
-      github.repo: "kairos-agent"
-      autobump.revdeps: "true"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/kairos-agent
-    license: "Apache License v2"
-    description: "Lyfecycle agent for kairos"
-  - name: "kairos-agent"
-    category: "fips"
-    version: "2.1.3"
+    version: "2.1.3+1"
     arch: "amd64"
     labels:
       github.repo: "kairos-agent"
@@ -23,3 +11,16 @@ packages:
       - https://github.com/kairos-io/kairos-agent
     license: "Apache License v2"
     description: "Lyfecycle agent for kairos"
+# Disabled as it cant be build with go 1.19.10
+  #- name: "kairos-agent"
+    #category: "fips"
+    #version: "2.1.3+1"
+    #arch: "amd64"
+    #labels:
+      #github.repo: "kairos-agent"
+      #autobump.revdeps: "true"
+      #github.owner: "kairos-io"
+    #uri:
+      #- https://github.com/kairos-io/kairos-agent
+    #license: "Apache License v2"
+    #description: "Lyfecycle agent for kairos"
diff --git a/packages/system/kcrypt-challenger/build.yaml b/packages/system/kcrypt-challenger/build.yaml
index 6141d90..037ed67 100644
--- a/packages/system/kcrypt-challenger/build.yaml
+++ b/packages/system/kcrypt-challenger/build.yaml
@@ -17,7 +17,7 @@ prelude:
   - apt-get update && apt-get install -y gcc libssl-dev
   - cd go/src/github.com/${GITHUB_ORG}/ && git clone https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git
 {{ if ne .Values.live "yes" }}
-  - cd go/src/github.com/${GITHUB_ORG}/ && git checkout v"${PACKAGE_VERSION}" -b build
+  - cd go/src/github.com/${GITHUB_ORG}/ && git checkout 3912abcec424521725ccd335181f2fde90510081 -b build
 {{ end }}
 env:
   - GOPATH=/luetbuild/go/
@@ -32,7 +32,7 @@ env:
 
 steps:
   - |
-    PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \
+    PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \
     mkdir -p /system/discovery && \
     cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/ && go build -o {{ .Values.binary_name }} ./cmd/discovery/main.go && mv {{ .Values.binary_name }} /system/discovery
   - chmod +x /system/discovery/{{ .Values.binary_name }}
diff --git a/packages/system/kcrypt-challenger/collection.yaml b/packages/system/kcrypt-challenger/collection.yaml
index 81c5e2f..da4ae7f 100644
--- a/packages/system/kcrypt-challenger/collection.yaml
+++ b/packages/system/kcrypt-challenger/collection.yaml
@@ -3,19 +3,7 @@ packages:
     binary_name: kcrypt-discovery-challenger
     category: system
     live: "yes"
-    version: "0.4.0"
-    labels:
-      github.repo: "kcrypt-challenger"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/kcrypt-challenger
-    license: "Apache License v2"
-    description: "Cloud native guardian for persistent data in the edge"
-  - name: kcrypt-challenger
-    binary_name: kcrypt-discovery-challenger
-    category: fips
-    live: "yes"
-    version: "0.4.0"
+    version: "0.4.0+1"
     labels:
       github.repo: "kcrypt-challenger"
       github.owner: "kairos-io"
@@ -23,4 +11,17 @@ packages:
       - https://github.com/kairos-io/kcrypt-challenger
     license: "Apache License v2"
     description: "Cloud native guardian for persistent data in the edge"
+# Disabled as it cant be build with go 1.19.10
+  #- name: kcrypt-challenger
+    #binary_name: kcrypt-discovery-challenger
+    #category: fips
+    #live: "yes"
+    #version: "0.4.0+1"
+    #labels:
+      #github.repo: "kcrypt-challenger"
+      #github.owner: "kairos-io"
+    #uri:
+      #- https://github.com/kairos-io/kcrypt-challenger
+    #license: "Apache License v2"
+    #description: "Cloud native guardian for persistent data in the edge"
 
diff --git a/packages/system/kcrypt/collection.yaml b/packages/system/kcrypt/collection.yaml
index 3890e64..7ea4384 100644
--- a/packages/system/kcrypt/collection.yaml
+++ b/packages/system/kcrypt/collection.yaml
@@ -1,18 +1,7 @@
 packages:
   - name: kcrypt
     category: system
-    version: "0.6.0"
-    labels:
-      github.repo: "kcrypt"
-      autobump.revdeps: "true"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/kcrypt
-    license: "Apache License v2"
-    description: "Cloud native guardian for persistent data in the edge"
-  - name: kcrypt
-    category: fips
-    version: "0.6.0"
+    version: "0.6.0+1"
     labels:
       github.repo: "kcrypt"
       autobump.revdeps: "true"
@@ -21,3 +10,15 @@ packages:
       - https://github.com/kairos-io/kcrypt
     license: "Apache License v2"
     description: "Cloud native guardian for persistent data in the edge"
+# Disabled as it cant be build with go 1.19.10
+#  - name: kcrypt
+    #category: fips
+    #version: "0.6.0+1"
+    #labels:
+      #github.repo: "kcrypt"
+      #autobump.revdeps: "true"
+      #github.owner: "kairos-io"
+    #uri:
+      #- https://github.com/kairos-io/kcrypt
+    #license: "Apache License v2"
+    #description: "Cloud native guardian for persistent data in the edge"