⬆️ Bump go to 1.20.2 (#162)

* Bump go to 1.20.2 Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com> * Bump go-dependant packages Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com> * 🐛 Fix package version including the final dash for the build number Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com> --------- Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
2025-08-31 15:11:43 +00:00 · 2023-03-29 18:47:42 +02:00
parent b321f72e26
commit b83e8f5c0c
29 changed files with 38 additions and 39 deletions
--- a/packages/bundles/osbuilder/k3s/build.yaml
+++ b/packages/bundles/osbuilder/k3s/build.yaml
@@ -1,23 +1,22 @@
 {{ if eq .Values.init "systemd" }}
-image: golang:1.18
+image: golang:1.20
 prelude:
 - apt-get update
 - apt-get install -y git curl systemd
 {{ else }}
-image: golang:1.18-alpine
+image: golang:1.20-alpine
 prelude:
 - apk add git curl openrc bash
 {{ end }}
 - curl -sfL https://get.k3s.io > installer.sh 
 steps:
- bash installer.sh
- bash installer.sh agent
+- PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && export INSTALL_K3S_VERSION=$PACKAGE_VERSION && bash installer.sh
+- PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && export INSTALL_K3S_VERSION=$PACKAGE_VERSION && bash installer.sh agent
 - mkdir -p  /etc/rancher/k3s/ && touch /etc/rancher/k3s/.keep

 exclude:
 - etc/rancher/k3s/k3s.env
 - etc/rancher/k3s/k3s-agent.env
 env:
- INSTALL_K3S_VERSION={{.Values.version}}
 - INSTALL_K3S_SKIP_START="true"
 - INSTALL_K3S_SKIP_ENABLE="true"
--- a/packages/bundles/osbuilder/k3s/collection.yaml
+++ b/packages/bundles/osbuilder/k3s/collection.yaml
@@ -1,9 +1,9 @@
 packages:
 - name: "k3s-systemd"
  category: "osbuilder-bundles"
-  version: "v1.21.14+k3s1"
+  version: "v1.21.14+k3s1-1"
  init: systemd
 - name: "k3s-openrc"
  category: "osbuilder-bundles"
-  version: "v1.21.14+k3s1"
+  version: "v1.21.14+k3s1-1"
  init: openrc
--- a/packages/bundles/provider-kairos/build.yaml
+++ b/packages/bundles/provider-kairos/build.yaml
@@ -1,17 +1,17 @@
 {{ if .Values.init  }}
  {{ if eq .Values.init "systemd" }}
-image: golang:1.18
+image: golang:1.20
 prelude:
 - apt-get update
 - apt-get install -y git
  {{ else }}
-image: golang:1.18-alpine
+image: golang:1.20-alpine
 prelude:
 - apk add git
  {{ end }}
 - git clone https://github.com/kairos-io/provider-kairos
 - |
-    PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \
+    PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \
    cd provider-kairos && git checkout v$PACKAGE_VERSION
 steps:
 - mkdir -p /system/providers
--- a/packages/bundles/provider-kairos/collection.yaml
+++ b/packages/bundles/provider-kairos/collection.yaml
@@ -1,7 +1,7 @@
 packages:
  - name: "provider-kairos"
    category: "bundles"
-    version: "1.6.1"
+    version: "1.6.1-1"
    labels:
      github.repo: "provider-kairos"
      github.owner: "kairos-io"
--- a/packages/system/elemental/definition.yaml
+++ b/packages/system/elemental/definition.yaml
@@ -1,6 +1,6 @@
 name: "elemental-cli"
 category: "system"
-version: "0.2.0-1"
+version: "0.2.0-2"
 bin_name: "elemental"
 fips: false
 labels:
--- a/packages/system/immucore/build.yaml
+++ b/packages/system/immucore/build.yaml
@@ -12,7 +12,7 @@ env:
  - LDFLAGS="-s -w -X github.com/kairos-io/immucore/internal/version.Version=v${PACKAGE_VERSION}"
 steps:
  - |
-    PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \
+    PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \
    cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/  && git checkout v"${PACKAGE_VERSION}" -b build && go build -o {{ .Values.name }} -ldflags="${LDFLAGS}" && mv {{.Values.name}} /usr/bin/
  - chmod +x /usr/bin/{{.Values.name}}
 includes:
--- a/packages/system/immucore/definition.yaml
+++ b/packages/system/immucore/definition.yaml
@@ -1,6 +1,6 @@
 name: "immucore"
 category: "system"
-version: "0.0.15"
+version: "0.0.15-1"
 labels:
  github.repo: "immucore"
  autobump.revdeps: "true"
--- a/packages/system/kcrypt-challenger/build.yaml
+++ b/packages/system/kcrypt-challenger/build.yaml
@@ -16,7 +16,7 @@ env:
 - CGO_ENABLED=0
 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 kcrypt-discovery-challenger ./cmd/discovery/main.go && mv kcrypt-discovery-challenger /system/discovery
 - chmod +x /system/discovery/kcrypt-discovery-challenger
--- a/packages/system/kcrypt-challenger/definition.yaml
+++ b/packages/system/kcrypt-challenger/definition.yaml
@@ -1,7 +1,7 @@
 name: kcrypt-challenger
 category: system
 live: "yes"
-version: "0.2.3"
+version: "0.2.3-1"
 labels:
  github.repo: "kcrypt-challenger"
  github.owner: "kairos-io"
--- a/packages/system/kcrypt/build.yaml
+++ b/packages/system/kcrypt/build.yaml
@@ -11,7 +11,7 @@ env:
 - CGO_ENABLED=0
 steps:
 - |
-  PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \
+  PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \
  cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/  && git checkout v"${PACKAGE_VERSION}" -b build && go build -ldflags="-w -s" && mv {{.Values.name}} /usr/bin/
 - chmod +x /usr/bin/{{.Values.name}}
 includes:
--- a/packages/system/kcrypt/definition.yaml
+++ b/packages/system/kcrypt/definition.yaml
@@ -1,6 +1,6 @@
 name: kcrypt
 category: system
-version: "0.5.1"
+version: "0.5.1-1"
 labels:
  github.repo: "kcrypt"
  autobump.revdeps: "true"
--- a/packages/toolchain-go/collection.yaml
+++ b/packages/toolchain-go/collection.yaml
@@ -2,14 +2,14 @@ packages:
 - name: toolchain-go
  category: development
  variant: "alpine"
-  version: "1.18+1"
-  tag: "1.18"
+  version: "1.20.2"
+  tag: "1.20.2"
  hidden: true
 - name: toolchain-go-ubuntu
  variant: ""
  category: development
-  version: "1.18+1"
-  tag: "1.18"
+  version: "1.20.2"
+  tag: "1.20.2"
  hidden: true
 - name: toolchain-go
  category: development
--- a/packages/utils/earthly/build.yaml
+++ b/packages/utils/earthly/build.yaml
@@ -6,7 +6,7 @@ requires:
  category: "development"
  version: ">=0"
 prelude:
- wget https://github.com/$GITHUB_OWNER/$GITHUB_REPO/releases/download/v{{.Values.version}}/{{.Values.name}}-linux-{{.Values.arch}} -O earthly
+- PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && wget https://github.com/$GITHUB_OWNER/$GITHUB_REPO/releases/download/v$PACKAGE_VERSION/{{.Values.name}}-linux-{{.Values.arch}} -O earthly
 env:
 - GITHUB_OWNER={{ ( index .Values.labels "github.owner" ) }}
 - GITHUB_REPO={{ ( index .Values.labels "github.repo" ) }}
--- a/packages/utils/earthly/definition.yaml
+++ b/packages/utils/earthly/definition.yaml
@@ -1,7 +1,7 @@
 name: earthly
 category: utils
 arch: "amd64"
-version: "0.7.2"
+version: "0.7.2-1"
 labels:
  github.repo: "earthly"
  github.owner: "earthly"
--- a/packages/utils/edgevpn/build.yaml
+++ b/packages/utils/edgevpn/build.yaml
@@ -11,7 +11,7 @@ env:
 - CGO_ENABLED=0
 steps:
 - |
-  PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \
+  PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \
  cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/  && git checkout v"${PACKAGE_VERSION}" -b build && go build -ldflags="-w -s -X github.com/mudler/edgevpn/internal.Version=v$PACKAGE_VERSION" && mv {{.Values.name}} /usr/bin/
 - chmod +x /usr/bin/{{.Values.name}}
 includes:
--- a/packages/utils/edgevpn/definition.yaml
+++ b/packages/utils/edgevpn/definition.yaml
@@ -1,6 +1,6 @@
 name: edgevpn
 category: utils
-version: "0.22.0"
+version: "0.22.0-1"
 labels:
  github.repo: "edgevpn"
  github.owner: "mudler"
--- a/packages/utils/goreleaser/build.yaml
+++ b/packages/utils/goreleaser/build.yaml
@@ -10,7 +10,7 @@ env:
 - GITHUB_ORG={{ ( index .Values.labels "github.owner" ) }}
 - CGO_ENABLED=0
 steps:
- cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/  && git checkout v"${PACKAGE_VERSION}" -b build && go build -o {{.Values.name}}  && mv {{ .Values.name }} /usr/bin/{{ .Values.name }}
+- PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/  && git checkout v"${PACKAGE_VERSION}" -b build && go build -o {{.Values.name}}  && mv {{ .Values.name }} /usr/bin/{{ .Values.name }}
 - chmod +x /usr/bin/{{ .Values.name }}
 includes:
 - /usr/bin/{{.Values.name}}
--- a/packages/utils/goreleaser/definition.yaml
+++ b/packages/utils/goreleaser/definition.yaml
@@ -1,6 +1,6 @@
 name: goreleaser
 category: utils
-version: "1.16.2"
+version: "1.16.2-1"
 description: "Deliver Go binaries as fast and easily as possible"
 labels:
  github.repo: "goreleaser"
--- a/packages/utils/helm/definition.yaml
+++ b/packages/utils/helm/definition.yaml
@@ -1,6 +1,6 @@
 name: "helm"
 category: "utils"
-version: "3.11.2"
+version: "3.11.2-1"
 description: "The Kubernetes Package Manager"
 license: "Apache-2.0"
 labels:
--- a/packages/utils/k9s/definition.yaml
+++ b/packages/utils/k9s/definition.yaml
@@ -1,6 +1,6 @@
 name: "k9s"
 category: "utils"
-version: "0.27.3"
+version: "0.27.3-1"
 platform: Linux
 labels:
  github.repo: "k9s"
--- a/packages/utils/kube-vip/build.yaml
+++ b/packages/utils/kube-vip/build.yaml
@@ -11,7 +11,7 @@ env:
 - CGO_ENABLED=0
 steps:
 - |
-  PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \
+  PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \
  cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/  && git checkout v"${PACKAGE_VERSION}" -b build && make build && mv {{.Values.name}} /usr/bin/
 - chmod +x /usr/bin/{{.Values.name}}
 includes:
--- a/packages/utils/kube-vip/definition.yaml
+++ b/packages/utils/kube-vip/definition.yaml
@@ -1,6 +1,6 @@
 name: kube-vip
 category: utils
-version: "0.5.11"
+version: "0.5.11-1"
 labels:
  github.repo: "kube-vip"
  github.owner: "kube-vip"
--- a/packages/utils/kubesplit/build.yaml
+++ b/packages/utils/kubesplit/build.yaml
@@ -11,7 +11,7 @@ env:
 - CGO_ENABLED=0
 steps:
 - |
-   PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \
+   PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \
   cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/  && git checkout v"${PACKAGE_VERSION}" -b build && go build -o {{.Values.name}}  && mv {{ .Values.name }} /usr/bin/{{ .Values.name }}
 - chmod +x /usr/bin/{{ .Values.name }}
 includes:
--- a/packages/utils/kubesplit/definition.yaml
+++ b/packages/utils/kubesplit/definition.yaml
@@ -1,6 +1,6 @@
 name: kubesplit
 category: utils
-version: "0.2.1"
+version: "0.2.1-1"
 description: "A opinionated simple tool to split big YAML Kubernetes files into chunks to help building helm charts"
 labels:
  github.repo: "kubesplit"
--- a/packages/utils/nerdctl/definition.yaml
+++ b/packages/utils/nerdctl/definition.yaml
@@ -1,6 +1,6 @@
 name: "nerdctl"
 category: "utils"
-version: "1.2.1"
+version: "1.2.1-1"
 platform: linux
 labels:
  github.repo: "nerdctl"
--- a/packages/utils/operator-sdk/build.yaml
+++ b/packages/utils/operator-sdk/build.yaml
@@ -13,7 +13,7 @@ env:
 - GITHUB_ORG={{ ( index .Values.labels "github.owner" ) }}
 - CGO_ENABLED=0
 steps:
- cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/  && git checkout v"${PACKAGE_VERSION}" -b build && make build && mv build/* /usr/bin/
+- PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/ && git checkout v"${PACKAGE_VERSION}" -b build && make build && mv build/* /usr/bin/
 includes:
 - usr/bin/.*|usr/bin
  {{ end }}
--- a/packages/utils/operator-sdk/definition.yaml
+++ b/packages/utils/operator-sdk/definition.yaml
@@ -1,6 +1,6 @@
 name: operator-sdk
 category: utils
-version: "1.28.0"
+version: "1.28.0-1"
 description: " SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding. "
 labels:
  github.repo: "operator-sdk"
--- a/packages/utils/poco/build.yaml
+++ b/packages/utils/poco/build.yaml
@@ -11,7 +11,7 @@ env:
 - CGO_ENABLED=0
 steps:
 - |
-  PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \
+  PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \
  cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/  && git checkout v"${PACKAGE_VERSION}" -b build && go build && mv {{.Values.name}} /usr/bin/
 - chmod +x /usr/bin/{{.Values.name}}
 includes:
--- a/packages/utils/poco/definition.yaml
+++ b/packages/utils/poco/definition.yaml
@@ -1,6 +1,6 @@
 name: poco
 category: utils
-version: "0.3.1"
+version: "0.3.1-1"
 labels:
  github.repo: "poco"
  github.owner: "mudler"