From 4f7fd89fc53b04e09a73b0eeda594a393256574d Mon Sep 17 00:00:00 2001 From: Itxaka Date: Mon, 10 Mar 2025 12:43:33 +0100 Subject: [PATCH] Rework the toolchain (#1308) * Rework the toolchain - rename it to toolchain-go as thats what is mainly used for - drop alpine as it was never used - use ubuntu 20.04 as base which has an older glibc - add bumping to versions automatically - Get go from the upstream source directly - Add default deps to it, like gcc and git - make everything use the newer toolchain-go - drop uneeded toolchain-ubuntu --------- Signed-off-by: Itxaka --- packages/firmware/odroid-c2/build.yaml | 12 +++ packages/firmware/odroid-c2/definition.yaml | 3 + packages/firmware/opensuse/LICENSE | 9 -- packages/firmware/opensuse/build.yaml | 44 ---------- packages/firmware/opensuse/collection.yaml | 20 ----- packages/firmware/rpi/build.yaml | 4 +- packages/firmware/rpi/definition.yaml | 3 +- packages/firmware/u-boot-rpi64/build.yaml | 19 +++++ .../firmware/u-boot-rpi64/definition.yaml | 16 ++++ packages/k8s/k0s/build.yaml | 40 --------- packages/k8s/k0s/collection.yaml | 79 ----------------- packages/k8s/k3s/build.yaml | 47 ---------- packages/k8s/k3s/collection.yaml | 79 ----------------- packages/k8s/kubeadm/build.yaml | 14 --- packages/k8s/kubeadm/collection.yaml | 33 ------- packages/k8s/kubeadm/definition.yaml.old | 7 -- packages/k8s/kubeadm/files/etc/crictl.yaml | 1 - .../k8s/kubeadm/files/etc/default/kubelet | 1 - .../files/etc/systemd/system/kubelet.service | 14 --- .../system/kubelet.service.d/10-kubeadm.conf | 11 --- packages/k8s/kubeadm/install-k8s.sh | 17 ---- packages/k8s/rke2/build.yaml | 18 ---- packages/k8s/rke2/collection.yaml | 29 ------- packages/k8s/rke2/values.yaml | 2 - packages/kernels/linux-rpi/build.yaml | 2 +- packages/kernels/linux-rpi/collection.yaml | 2 +- packages/system/immucore/build.yaml | 9 +- packages/system/immucore/collection.yaml | 4 +- packages/system/kairos-agent/build.yaml | 10 +-- packages/system/kairos-agent/collection.yaml | 4 +- packages/system/kcrypt-challenger/build.yaml | 7 +- .../system/kcrypt-challenger/collection.yaml | 4 +- packages/system/kcrypt/build.yaml | 9 +- packages/system/kcrypt/collection.yaml | 4 +- packages/system/provider-kairos/build.yaml | 3 +- .../system/provider-kairos/collection.yaml | 2 +- packages/toolchain-go/build.yaml | 23 ----- packages/toolchain-go/collection.yaml | 85 ------------------- packages/toolchain-ubuntu/build.yaml | 3 - packages/toolchain-ubuntu/definition.yaml | 4 - packages/toolchain/build.yaml | 22 +++++ packages/toolchain/collection.yaml | 32 +++++++ packages/uboot/rpi64/build.yaml | 12 +-- packages/uboot/rpi64/definition.yaml | 3 +- packages/utils/earthly/build.yaml | 19 ----- packages/utils/earthly/definition.yaml | 12 --- packages/utils/edgevpn-systemd/build.yaml | 5 +- .../utils/edgevpn-systemd/definition.yaml | 2 +- packages/utils/edgevpn/build.yaml | 2 +- packages/utils/edgevpn/definition.yaml | 2 +- packages/utils/goreleaser/build.yaml | 16 ---- packages/utils/goreleaser/definition.yaml | 10 --- packages/utils/helm/build.yaml | 3 +- packages/utils/helm/definition.yaml | 2 +- packages/utils/k3d/build.yaml | 4 +- packages/utils/k3d/collection.yaml | 2 +- packages/utils/k9s/build.yaml | 5 +- packages/utils/k9s/definition.yaml | 2 +- packages/utils/kube-vip/build.yaml | 2 +- packages/utils/kube-vip/definition.yaml | 2 +- packages/utils/kubectl/build.yaml | 6 +- packages/utils/kubectl/definition.yaml | 2 +- packages/utils/kubesplit/build.yaml | 2 +- packages/utils/kubesplit/definition.yaml | 2 +- packages/utils/luet/build.yaml | 3 +- packages/utils/luet/definition.yaml | 2 +- packages/utils/nerdctl/build.yaml | 3 +- packages/utils/nerdctl/definition.yaml | 2 +- packages/utils/operator-sdk/build.yaml | 2 +- packages/utils/operator-sdk/definition.yaml | 2 +- packages/utils/poco/build.yaml | 2 +- packages/utils/poco/definition.yaml | 2 +- 72 files changed, 166 insertions(+), 720 deletions(-) create mode 100644 packages/firmware/odroid-c2/build.yaml create mode 100644 packages/firmware/odroid-c2/definition.yaml delete mode 100644 packages/firmware/opensuse/LICENSE delete mode 100644 packages/firmware/opensuse/build.yaml delete mode 100644 packages/firmware/opensuse/collection.yaml create mode 100644 packages/firmware/u-boot-rpi64/build.yaml create mode 100644 packages/firmware/u-boot-rpi64/definition.yaml delete mode 100644 packages/k8s/k0s/build.yaml delete mode 100644 packages/k8s/k0s/collection.yaml delete mode 100644 packages/k8s/k3s/build.yaml delete mode 100644 packages/k8s/k3s/collection.yaml delete mode 100644 packages/k8s/kubeadm/build.yaml delete mode 100644 packages/k8s/kubeadm/collection.yaml delete mode 100644 packages/k8s/kubeadm/definition.yaml.old delete mode 100644 packages/k8s/kubeadm/files/etc/crictl.yaml delete mode 100644 packages/k8s/kubeadm/files/etc/default/kubelet delete mode 100644 packages/k8s/kubeadm/files/etc/systemd/system/kubelet.service delete mode 100644 packages/k8s/kubeadm/files/etc/systemd/system/kubelet.service.d/10-kubeadm.conf delete mode 100755 packages/k8s/kubeadm/install-k8s.sh delete mode 100644 packages/k8s/rke2/build.yaml delete mode 100644 packages/k8s/rke2/collection.yaml delete mode 100644 packages/k8s/rke2/values.yaml delete mode 100644 packages/toolchain-go/build.yaml delete mode 100644 packages/toolchain-go/collection.yaml delete mode 100644 packages/toolchain-ubuntu/build.yaml delete mode 100644 packages/toolchain-ubuntu/definition.yaml create mode 100644 packages/toolchain/build.yaml create mode 100644 packages/toolchain/collection.yaml delete mode 100644 packages/utils/earthly/build.yaml delete mode 100644 packages/utils/earthly/definition.yaml delete mode 100644 packages/utils/goreleaser/build.yaml delete mode 100644 packages/utils/goreleaser/definition.yaml diff --git a/packages/firmware/odroid-c2/build.yaml b/packages/firmware/odroid-c2/build.yaml new file mode 100644 index 0000000..baabac8 --- /dev/null +++ b/packages/firmware/odroid-c2/build.yaml @@ -0,0 +1,12 @@ +requires: + - name: "toolchain" + category: "development" + version: ">=0" + +steps: +- mkdir -p /data/boot +- wget https://download.opensuse.org/repositories/devel:/ARM:/Factory:/Contrib:/OdroidC2/standard/aarch64/odroidc2-firmware-{{.Values.version}}.aarch64.rpm +- rpm2cpio odroidc2-firmware-{{.Values.version}}.aarch64.rpm | cpio -idmv +- mv boot/* /data/boot +package_dir: "/data/boot" + diff --git a/packages/firmware/odroid-c2/definition.yaml b/packages/firmware/odroid-c2/definition.yaml new file mode 100644 index 0000000..00800e7 --- /dev/null +++ b/packages/firmware/odroid-c2/definition.yaml @@ -0,0 +1,3 @@ +name: "odroid-c2" +category: "firmware" +version: "20170419-5.248" \ No newline at end of file diff --git a/packages/firmware/opensuse/LICENSE b/packages/firmware/opensuse/LICENSE deleted file mode 100644 index e5b6b78..0000000 --- a/packages/firmware/opensuse/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ -This package is part of elemental-toolkit. - -Copyright (c) 2020-2021 SUSE, LLC - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. \ No newline at end of file diff --git a/packages/firmware/opensuse/build.yaml b/packages/firmware/opensuse/build.yaml deleted file mode 100644 index 655326b..0000000 --- a/packages/firmware/opensuse/build.yaml +++ /dev/null @@ -1,44 +0,0 @@ -image: registry.opensuse.org/opensuse/leap:15.4 - - -prelude: -- zypper in -y wget cpio - -steps: -{{if eq .Values.name "odroid-c2"}} -- mkdir -p /data/boot -- wget https://download.opensuse.org/repositories/devel:/ARM:/Factory:/Contrib:/OdroidC2/standard/aarch64/odroidc2-firmware-{{.Values.version}}.aarch64.rpm -- rpm2cpio odroidc2-firmware-{{.Values.version}}.aarch64.rpm | cpio -idmv -- mv boot/* /data/boot -package_dir: "/data/boot" -{{end}} - -{{if eq .Values.name "u-boot-rpi64"}} -- mkdir -p /data/{boot,usr} -- PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && wget https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/aarch64/u-boot-rpiarm64-$PACKAGE_VERSION.aarch64.rpm -- PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && rpm2cpio u-boot-rpiarm64-$PACKAGE_VERSION.aarch64.rpm | cpio -idmv -- mv usr/share/doc /data -- mv usr/share/licenses /data -- mv usr/* /data -- mv boot/vc/* /data -- rm -rf /data/boot -- rm -rf /data/usr -- rm -rf /data/share -package_dir: "/data" -{{end}} - -{{if or (eq .Values.name "raspberrypi-firmware") (eq .Values.name -"raspberrypi-firmware-config") (eq .Values.name "raspberrypi-firmware-dt")}} -- mkdir -p /data/boot -- mkdir -p /data/usr -- PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && wget -c https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/noarch/{{.Values.name}}-$PACKAGE_VERSION.noarch.rpm -- PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && rpm2cpio {{.Values.name}}-$PACKAGE_VERSION.noarch.rpm | cpio -idmv -{{if or (eq .Values.name "raspberrypi-firmware")}} -- mv usr/* /data -- rm -rfv /data/lib -{{end}} -- mv boot/vc/* /data -- rm -rfv /data/boot -- rm -rfv /data/usr -package_dir: "/data" -{{end}} diff --git a/packages/firmware/opensuse/collection.yaml b/packages/firmware/opensuse/collection.yaml deleted file mode 100644 index 3b6a26f..0000000 --- a/packages/firmware/opensuse/collection.yaml +++ /dev/null @@ -1,20 +0,0 @@ -packages: - - name: "odroid-c2" - category: "firmware" - version: "20170419-5.247" - - name: "u-boot-rpi64" - category: "firmware" - version: "2025.01-3.1" - labels: - autobump.strategy: "custom" - autobump.string_replace: '{ "prefix": "" }' - autobump.prefix: "prefix" - autobump.hook: | - curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/$(curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml | dasel -r xml 'repomd.data.[0].location.-href') | zstd -d - | dasel -r xml -w json | jq '.metadata.package[] | select(.name=="u-boot-rpiarm64") | select(.arch!="src").version | map(.)[2] + "-" + map(.)[1]' -r | tail -n1 - autobump.version_hook: | - curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/$(curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml | dasel -r xml 'repomd.data.[0].location.-href') | zstd -d - | dasel -r xml -w json | jq '.metadata.package[] | select(.name=="u-boot-rpiarm64") | select(.arch!="src").version | map(.)[2] + "-" + map(.)[1]' -r | tail -n1 - # We do assume that checksum is sha256 - autobump.checksum_hook: | - curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/$(curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml | dasel -r xml 'repomd.data.[0].location.-href') | zstd -d - | dasel -r xml -w json | jq '.metadata.package[] | select(.name=="u-boot-rpiarm64") | select(.arch!="src").checksum."#text"' -r | tail -n1 - package.version: "2025.01-3.1" - package.checksum: "5ececbeaaa43d42662fe01b4a9aedc75e97db3d98501e77a5be451029bca70e18eaf859a4278f1f98aa00ebc16133de98c7a5eb301831d3a0e4cf7ad746a0f35" diff --git a/packages/firmware/rpi/build.yaml b/packages/firmware/rpi/build.yaml index e34b2d1..3735fe0 100644 --- a/packages/firmware/rpi/build.yaml +++ b/packages/firmware/rpi/build.yaml @@ -1,5 +1,5 @@ requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "development" version: ">=0" @@ -13,7 +13,7 @@ env: steps: - mkdir build/${GITHUB_ORG}/ -p - mkdir /output -p - - git clone --depth 1 --branch ${PACKAGE_VERSION%\+*} https://github.com/${GITHUB_ORG}/${GITHUB_REPO}.git build/${GITHUB_ORG} + - git clone --depth 1 --branch ${PACKAGE_VERSION%\-*} https://github.com/${GITHUB_ORG}/${GITHUB_REPO}.git build/${GITHUB_ORG} - cp -R build/${GITHUB_ORG}/boot/* /output # remove uneeded kernel files - rm /output/kernel* diff --git a/packages/firmware/rpi/definition.yaml b/packages/firmware/rpi/definition.yaml index e4aac08..d70a7c4 100644 --- a/packages/firmware/rpi/definition.yaml +++ b/packages/firmware/rpi/definition.yaml @@ -1,6 +1,7 @@ name: "rpi" category: "firmware" -version: "1.20250305" +version: "1.20250305-3" labels: github.repo: "firmware" github.owner: "raspberrypi" + autobump.skip_if_contains: '["rc"]' \ No newline at end of file diff --git a/packages/firmware/u-boot-rpi64/build.yaml b/packages/firmware/u-boot-rpi64/build.yaml new file mode 100644 index 0000000..b9c951b --- /dev/null +++ b/packages/firmware/u-boot-rpi64/build.yaml @@ -0,0 +1,19 @@ +requires: + - name: "toolchain" + category: "development" + version: ">=0" + + +steps: +- mkdir -p /data/{boot,usr} +- PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && wget https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/aarch64/u-boot-rpiarm64-$PACKAGE_VERSION.aarch64.rpm +- PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && rpm2cpio u-boot-rpiarm64-$PACKAGE_VERSION.aarch64.rpm | cpio -idmv +- mv usr/share/doc /data +- mv usr/share/licenses /data +- mv usr/* /data +- mv boot/vc/* /data +- rm -rf /data/boot +- rm -rf /data/usr +- rm -rf /data/share + +package_dir: "/data" diff --git a/packages/firmware/u-boot-rpi64/definition.yaml b/packages/firmware/u-boot-rpi64/definition.yaml new file mode 100644 index 0000000..3fe74e0 --- /dev/null +++ b/packages/firmware/u-boot-rpi64/definition.yaml @@ -0,0 +1,16 @@ +name: "u-boot-rpi64" +category: "firmware" +version: "2025.01-3.1-1" +labels: + autobump.strategy: "custom" + autobump.string_replace: '{ "prefix": "" }' + autobump.prefix: "prefix" + autobump.hook: | + curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/$(curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml | dasel -r xml 'repomd.data.[0].location.-href') | zstd -d - | dasel -r xml -w json | jq '.metadata.package[] | select(.name=="u-boot-rpiarm64") | select(.arch!="src").version | map(.)[2] + "-" + map(.)[1]' -r | tail -n1 + autobump.version_hook: | + curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/$(curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml | dasel -r xml 'repomd.data.[0].location.-href') | zstd -d - | dasel -r xml -w json | jq '.metadata.package[] | select(.name=="u-boot-rpiarm64") | select(.arch!="src").version | map(.)[2] + "-" + map(.)[1]' -r | tail -n1 + # We do assume that checksum is sha256 + autobump.checksum_hook: | + curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/$(curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml | dasel -r xml 'repomd.data.[0].location.-href') | zstd -d - | dasel -r xml -w json | jq '.metadata.package[] | select(.name=="u-boot-rpiarm64") | select(.arch!="src").checksum."#text"' -r | tail -n1 + package.version: "2025.01-3.1" + package.checksum: "5ececbeaaa43d42662fe01b4a9aedc75e97db3d98501e77a5be451029bca70e18eaf859a4278f1f98aa00ebc16133de98c7a5eb301831d3a0e4cf7ad746a0f35" diff --git a/packages/k8s/k0s/build.yaml b/packages/k8s/k0s/build.yaml deleted file mode 100644 index 8dc0285..0000000 --- a/packages/k8s/k0s/build.yaml +++ /dev/null @@ -1,40 +0,0 @@ -{{ if eq .Values.name "k0s-openrc" }} -image: "alpine" -{{ else }} -requires: -- name: "toolchain-ubuntu" - category: "development" - version: ">=0" -{{ end }} -env: - - K0S_VERSION=v{{ regexReplaceAll "\\+\\d+$" .Values.version "" }}+k0s.{{.Values.k0s_version}} -steps: - {{ if eq .Values.name "k0s-openrc" }} - - apk update - - apk add openrc curl upx - {{ else }} - - apt-get update && apt-get install -y systemctl - - mkdir -p /etc/systemd/system/ - # required by https://github.com/kardianos/service/blob/becf2eb62b83ed01f5e782cb8da7bb739ded2bb5/service_systemd_linux.go#L23 - - mkdir -p /run/systemd/system - {{ end }} - - curl -sfL https://get.k0s.sh > installer.sh - - sh installer.sh - - rm -rf installer.sh - - chmod +x /usr/local/bin/k0s - - mv /usr/local/bin/k0s /usr/bin/k0s - - /usr/bin/k0s install controller - - /usr/bin/k0s install worker - -includes: -- ^/usr/bin/k0s -{{ if eq .Values.name "k0s-openrc" }} -- ^/etc/init.d/$ -- ^/etc/init.d/k0s.* -- ^/etc/k0s/$ -- ^/etc/k0s/k0s$ -{{ else }} -- ^/etc/systemd$ -- ^/etc/systemd/system$ -- ^/etc/systemd/system/k0s.*\.service$ -{{ end }} diff --git a/packages/k8s/k0s/collection.yaml b/packages/k8s/k0s/collection.yaml deleted file mode 100644 index 4b2bb5c..0000000 --- a/packages/k8s/k0s/collection.yaml +++ /dev/null @@ -1,79 +0,0 @@ -packages: - - name: k0s-openrc - category: k8s - version: "1.32.2" - k0s_version: "0" - labels: - github.owner: "k0sproject" - github.repo: "k0s" - autobump.sed_script: 's/\+k0s.[0-9]//g' - autobump.skip_if_contains: '["k0s"]' # disable autobump - uri: - - https://github.com/k0sproject/k0s - license: "APL-2" - description: " The Zero Friction Kubernetes " - - name: k0s-openrc - category: k8s - version: "1.31.5" - k0s_version: "0" - labels: - github.owner: "k0sproject" - github.repo: "k0s" - autobump.sed_script: 's/\+k0s.[0-9]//g' - autobump.skip_if_contains: '["k0s"]' # disable autobump - uri: - - https://github.com/k0sproject/k0s - license: "APL-2" - description: " The Zero Friction Kubernetes " - - name: k0s-openrc - category: k8s - version: "1.30.9" - k0s_version: "0" - labels: - github.owner: "k0sproject" - github.repo: "k0s" - autobump.sed_script: 's/\+k0s.[0-9]//g' - autobump.skip_if_contains: '["k0s"]' # disable autobump - uri: - - https://github.com/k0sproject/k0s - license: "APL-2" - description: " The Zero Friction Kubernetes " - - name: k0s-systemd - category: k8s - version: "1.32.2" - k0s_version: "0" - labels: - github.owner: "k0sproject" - github.repo: "k0s" - autobump.sed_script: 's/\+k0s.[0-9]//g' - autobump.skip_if_contains: '["k0s"]' # disable autobump - uri: - - https://github.com/k0sproject/k0s - license: "APL-2" - description: " The Zero Friction Kubernetes " - - name: k0s-systemd - category: k8s - version: "1.31.5" - k0s_version: "0" - labels: - github.owner: "k0sproject" - github.repo: "k0s" - autobump.sed_script: 's/\+k0s.[0-9]//g' - autobump.skip_if_contains: '["k0s"]' # disable autobump - uri: - - https://github.com/k0sproject/k0s - license: "APL-2" - description: " The Zero Friction Kubernetes " - - name: k0s-systemd - category: k8s - version: "1.30.9" - k0s_version: "0" - labels: - github.owner: "k0sproject" - github.repo: "k0s" - autobump.sed_script: 's/\+k0s.[0-9]//g' - autobump.skip_if_contains: '["k0s"]' # disable autobump - uri: - - https://github.com/k0sproject/k0s - license: "APL-2" - description: " The Zero Friction Kubernetes " diff --git a/packages/k8s/k3s/build.yaml b/packages/k8s/k3s/build.yaml deleted file mode 100644 index 97021e6..0000000 --- a/packages/k8s/k3s/build.yaml +++ /dev/null @@ -1,47 +0,0 @@ -requires: -- name: "toolchain-go-ubuntu" - category: "development" - version: ">=0" -env: - - INSTALL_K3S_BIN_DIR="/usr/bin" - - INSTALL_K3S_SELINUX_WARN=true - - INSTALL_K3S_SKIP_START="true" - - INSTALL_K3S_SKIP_ENABLE="true" - - INSTALL_K3S_SKIP_SELINUX_RPM="true" - # Remove any possible "+N" from the end of the version. We only bump that to - # avoid overwritting existing images when we want the package to be rebuilt. - - INSTALL_K3S_VERSION=v{{ regexReplaceAll "\\+\\d+$" .Values.version "" }}+k3s{{.Values.k3s_version}} - {{$arch:=(default "amd64" .Values.arch)}} - {{ if eq $arch "arm" }} - - ARCH=arm64 - {{ else }} - - ARCH={{ $arch }} - {{ end }} -steps: - - curl -sfL https://get.k3s.io > installer.sh - # Let the installer script install service files for openrc or systemd: - # https://github.com/k3s-io/k3s/blob/36645e7311e9bdbbf2adb79ecd8bd68556bc86f6/install.sh#L114-L122 - {{ if eq .Values.name "k3s-openrc" }} - - touch /sbin/openrc-run && chmod +x /sbin/openrc-run - {{ else }} - - touch /bin/systemctl && chmod +x /bin/systemctl - - mkdir -p /etc/systemd/system/ - {{ end }} - - bash installer.sh - - bash installer.sh agent - - rm -rf installer.sh - - chmod +x /usr/bin/k3s - - upx -1 /usr/bin/k3s - -includes: -- ^/usr/bin/k3s -{{ if eq .Values.name "k3s-openrc" }} -- ^/etc/init.d/$ -- ^/etc/init.d/k3s.* -- ^/etc/rancher/$ -- ^/etc/rancher/k3s$ -{{ else }} -- ^/etc/systemd$ -- ^/etc/systemd/system$ -- ^/etc/systemd/system/k3s.*service$ -{{ end }} diff --git a/packages/k8s/k3s/collection.yaml b/packages/k8s/k3s/collection.yaml deleted file mode 100644 index d02af0b..0000000 --- a/packages/k8s/k3s/collection.yaml +++ /dev/null @@ -1,79 +0,0 @@ -packages: - - name: k3s-openrc - category: k8s - version: "1.32.2" - k3s_version: "1" - labels: - github.owner: "k3s-io" - github.repo: "k3s" - autobump.sed_script: 's/\+k3s[0-9]//g' - autobump.skip_if_contains: '["k3s"]' # disable autobump - uri: - - https://github.com/k3s-io/k3s - license: "APL-2" - description: " Lightweight Kubernetes " - - name: k3s-openrc - category: k8s - version: "1.31.4+1" - k3s_version: "1" - labels: - github.owner: "k3s-io" - github.repo: "k3s" - autobump.sed_script: 's/\+k3s1[0-9]//g' - autobump.skip_if_contains: '["k3s"]' # disable autobump - uri: - - https://github.com/k3s-io/k3s - license: "APL-2" - description: " Lightweight Kubernetes " - - name: k3s-openrc - category: k8s - version: "1.30.8+1" - k3s_version: "1" - labels: - github.owner: "k3s-io" - github.repo: "k3s" - autobump.sed_script: 's/\+k3s[0-9]//g' - autobump.skip_if_contains: '["k3s"]' # disable autobump - uri: - - https://github.com/k3s-io/k3s - license: "APL-2" - description: " Lightweight Kubernetes " - - name: k3s-systemd - category: k8s - version: "1.32.2" - k3s_version: "1" - labels: - github.owner: "k3s-io" - github.repo: "k3s" - autobump.sed_script: 's/\+k3s[0-9]//g' - autobump.skip_if_contains: '["k3s"]' # disable autobump - uri: - - https://github.com/k3s-io/k3s - license: "APL-2" - description: " Lightweight Kubernetes " - - name: k3s-systemd - category: k8s - version: "1.31.4+1" - k3s_version: "1" - labels: - github.owner: "k3s-io" - github.repo: "k3s" - autobump.sed_script: 's/\+k3s[0-9]//g' - autobump.skip_if_contains: '["k3s"]' # disable autobump - uri: - - https://github.com/k3s-io/k3s - license: "APL-2" - description: " Lightweight Kubernetes " - - name: k3s-systemd - category: k8s - version: "1.30.8+1" - k3s_version: "1" - labels: - github.owner: "k3s-io" - github.repo: "k3s" - autobump.sed_script: 's/\+k3s[0-9]//g' - autobump.skip_if_contains: '["k3s"]' # disable autobump - uri: - - https://github.com/k3s-io/k3s - license: "APL-2" - description: " Lightweight Kubernetes " diff --git a/packages/k8s/kubeadm/build.yaml b/packages/k8s/kubeadm/build.yaml deleted file mode 100644 index 8d86b61..0000000 --- a/packages/k8s/kubeadm/build.yaml +++ /dev/null @@ -1,14 +0,0 @@ -requires: -- name: "toolchain-ubuntu" - category: "development" - version: ">=0" - -steps: -- mkdir /opt/bin -- curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{.Values.crictl_version}}/crictl-v{{.Values.crictl_version}}-linux-{{.Values.arch}}.tar.gz --output crictl-v{{.Values.crictl_version}}-linux-{{.Values.arch}}.tar.gz -- tar zxvf crictl-v{{.Values.crictl_version}}-linux-{{.Values.arch}}.tar.gz -C /opt/bin && rm -f crictl-v{{.Values.crictl_version}}-linux-{{.Values.arch}}.tar.gz -- cp files/etc/crictl.yaml /etc/crictl.yaml -- ./install-k8s.sh v{{ .Values.version }} {{ .Values.kubernetes_install_bin}} {{.Values.arch}} -env: -- DEBIAN_FRONTEND=noninteractive -- CNI_URL="https://github.com/containernetworking/plugins/releases/download/v{{.Values.cni_version}}/cni-plugins-linux-{{.Values.arch}}-v{{.Values.cni_version}}.tgz" diff --git a/packages/k8s/kubeadm/collection.yaml b/packages/k8s/kubeadm/collection.yaml deleted file mode 100644 index 4a4a5c9..0000000 --- a/packages/k8s/kubeadm/collection.yaml +++ /dev/null @@ -1,33 +0,0 @@ -packages: - - name: kubeadm - arch: amd64 - category: k8s - version: 1.23.8 - kubernetes_http_source: "https://dl.k8s.io/release" - crictl_version: "1.22.0" - cni_version: "1.1.1" - kubernetes_install_bin : "/usr/bin" - - name: kubeadm - arch: amd64 - category: k8s - version: 1.22.11 - kubernetes_http_source: "https://dl.k8s.io/release" - crictl_version: "1.22.0" - cni_version: "1.1.1" - kubernetes_install_bin : "/usr/bin" - - name: kubeadm - arch: amd64 - category: k8s - version: 1.22.9 - kubernetes_http_source: "https://dl.k8s.io/release" - crictl_version: "1.22.0" - cni_version: "1.1.1" - kubernetes_install_bin : "/usr/bin" - - name: kubeadm - arch: amd64 - category: k8s - version: 1.21.12 - kubernetes_http_source: "https://dl.k8s.io/release" - crictl_version: "1.22.0" - cni_version: "1.1.1" - kubernetes_install_bin : "/usr/bin" diff --git a/packages/k8s/kubeadm/definition.yaml.old b/packages/k8s/kubeadm/definition.yaml.old deleted file mode 100644 index c4d9f07..0000000 --- a/packages/k8s/kubeadm/definition.yaml.old +++ /dev/null @@ -1,7 +0,0 @@ -name: kubeadm -category: k8s -version: 1.22.9 -kubernetes_http_source: "https://dl.k8s.io/release" -crictl_version: "1.22.0" -cni_version: "1.1.1" -kubernetes_install_bin : "/usr/bin" diff --git a/packages/k8s/kubeadm/files/etc/crictl.yaml b/packages/k8s/kubeadm/files/etc/crictl.yaml deleted file mode 100644 index f60a186..0000000 --- a/packages/k8s/kubeadm/files/etc/crictl.yaml +++ /dev/null @@ -1 +0,0 @@ -runtime-endpoint: unix:///var/run/containerd/containerd.sock diff --git a/packages/k8s/kubeadm/files/etc/default/kubelet b/packages/k8s/kubeadm/files/etc/default/kubelet deleted file mode 100644 index 43c3f6b..0000000 --- a/packages/k8s/kubeadm/files/etc/default/kubelet +++ /dev/null @@ -1 +0,0 @@ -KUBELET_EXTRA_ARGS="--pod-infra-container-image=k8s.gcr.io/pause:3.6" diff --git a/packages/k8s/kubeadm/files/etc/systemd/system/kubelet.service b/packages/k8s/kubeadm/files/etc/systemd/system/kubelet.service deleted file mode 100644 index 15d3e91..0000000 --- a/packages/k8s/kubeadm/files/etc/systemd/system/kubelet.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=kubelet: The Kubernetes Node Agent -Documentation=https://kubernetes.io/docs/home/ -Wants=network-online.target -After=network-online.target - -[Service] -ExecStart=/usr/bin/kubelet -Restart=always -StartLimitInterval=0 -RestartSec=10 - -[Install] -WantedBy=multi-user.target diff --git a/packages/k8s/kubeadm/files/etc/systemd/system/kubelet.service.d/10-kubeadm.conf b/packages/k8s/kubeadm/files/etc/systemd/system/kubelet.service.d/10-kubeadm.conf deleted file mode 100644 index bd1b077..0000000 --- a/packages/k8s/kubeadm/files/etc/systemd/system/kubelet.service.d/10-kubeadm.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Note: This dropin only works with kubeadm and kubelet v1.11+ -[Service] -Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf" -Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml" -# This is a file that "kubeadm init" and "kubeadm join" generates at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically -EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env -# This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use -# the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file. -EnvironmentFile=-/etc/default/kubelet -ExecStart= -ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS diff --git a/packages/k8s/kubeadm/install-k8s.sh b/packages/k8s/kubeadm/install-k8s.sh deleted file mode 100755 index f67bdff..0000000 --- a/packages/k8s/kubeadm/install-k8s.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -euxo pipefail - -RELEASE=$1 -DOWNLOAD_DIR=$2 -ARCH=$3 -cd "$DOWNLOAD_DIR" -sudo curl -L --remote-name-all https://dl.k8s.io/release/"${RELEASE}"/bin/linux/"${ARCH}"/{kubeadm,kubelet,kubectl} -sudo chmod +x {kubeadm,kubelet,kubectl} -cd - - -sed "s:/usr/bin:${DOWNLOAD_DIR}:g" files/etc/systemd/system/kubelet.service | sudo tee /etc/systemd/system/kubelet.service -sudo mkdir -p /etc/systemd/system/kubelet.service.d -sed "s:/usr/bin:${DOWNLOAD_DIR}:g" files/etc/systemd/system/kubelet.service.d/10-kubeadm.conf | sudo tee /etc/systemd/system/kubelet.service.d/10-kubeadm.conf -mkdir -p /etc/default -cp files/etc/default/kubelet /etc/default -systemctl enable kubelet diff --git a/packages/k8s/rke2/build.yaml b/packages/k8s/rke2/build.yaml deleted file mode 100644 index d658a70..0000000 --- a/packages/k8s/rke2/build.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{ if eq .Values.arch "amd64" }} -requires: -- name: "toolchain-ubuntu" - category: "development" - version: ">=0" - -env: -- INSTALL_RKE2_VERSION=v{{.Values.version}}+{{.Values.rke2_release}} -- INSTALL_RKE2_TAR_PREFIX={{.Values.rke2_install_dir}} -- DEBIAN_FRONTEND=noninteractive - -steps: -- curl -sfL {{.Values.rke2_http_source}} > installer.sh -- INSTALL_RKE2_SKIP_RELOAD=1 sh installer.sh -- rm -rf installer.sh -- systemctl disable rke2-server rke2-agent -- curl -LO https://dl.k8s.io/release/v{{.Values.version}}/bin/linux/{{.Values.arch}}/kubectl && chmod +x kubectl && mv kubectl /usr/bin -{{end}} diff --git a/packages/k8s/rke2/collection.yaml b/packages/k8s/rke2/collection.yaml deleted file mode 100644 index baa1554..0000000 --- a/packages/k8s/rke2/collection.yaml +++ /dev/null @@ -1,29 +0,0 @@ -packages: - - name: rke2 - arch: amd64 - category: k8s - version: 1.23.8 - rke2_http_source: "https://get.rke2.io" - rke2_install_dir : "/opt/rke2" - rke2_release : "rke2r1" - - name: rke2 - arch: amd64 - category: k8s - version: 1.22.11 - rke2_http_source: "https://get.rke2.io" - rke2_install_dir : "/opt/rke2" - rke2_release : "rke2r1" - - name: rke2 - arch: amd64 - category: k8s - version: 1.22.9 - rke2_http_source: "https://get.rke2.io" - rke2_install_dir : "/opt/rke2" - rke2_release : "rke2r2" - - name: rke2 - arch: amd64 - category: k8s - version: 1.21.12 - rke2_http_source: "https://get.rke2.io" - rke2_install_dir : "/opt/rke2" - rke2_release : "rke2r2" diff --git a/packages/k8s/rke2/values.yaml b/packages/k8s/rke2/values.yaml deleted file mode 100644 index 2e7b7ef..0000000 --- a/packages/k8s/rke2/values.yaml +++ /dev/null @@ -1,2 +0,0 @@ -mylist: - - 1.21.12-5 diff --git a/packages/kernels/linux-rpi/build.yaml b/packages/kernels/linux-rpi/build.yaml index 478e15e..027ae2c 100644 --- a/packages/kernels/linux-rpi/build.yaml +++ b/packages/kernels/linux-rpi/build.yaml @@ -4,7 +4,7 @@ image: ubuntu:24.04 prelude: - apt-get update -y && apt-get install -y gcc gcc-aarch64-linux-gnu git make flex bc bison libssl-dev xz-utils kmod - - git clone --branch {{ .Values.version }} --depth 1 https://github.com/raspberrypi/linux.git linux + - git clone --branch ${PACKAGE_VERSION%\-*} --depth 1 https://github.com/raspberrypi/linux.git linux steps: - mkdir -p make /build diff --git a/packages/kernels/linux-rpi/collection.yaml b/packages/kernels/linux-rpi/collection.yaml index 4e7a76f..a32fecf 100644 --- a/packages/kernels/linux-rpi/collection.yaml +++ b/packages/kernels/linux-rpi/collection.yaml @@ -1,7 +1,7 @@ packages: - name: "linux-rpi" category: "kernels" - version: "rpi-6.6.y" + version: "rpi-6.6.y-1" labels: github.repo: "raspberrypi" autobump.revdeps: "true" diff --git a/packages/system/immucore/build.yaml b/packages/system/immucore/build.yaml index 30b0a5d..3260651 100644 --- a/packages/system/immucore/build.yaml +++ b/packages/system/immucore/build.yaml @@ -1,18 +1,15 @@ {{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}} requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "fips" version: ">=1.19.10+1" {{else}} requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "development" version: ">=0" {{end}} prelude: -{{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}} - - apt-get update && apt-get install gcc -{{end}} - mkdir go/src/github.com/${GITHUB_ORG}/ -p - cd go/src/github.com/${GITHUB_ORG}/ && git clone https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git env: @@ -28,7 +25,7 @@ env: {{end}} 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 mod tidy -compat=1.19 && \ diff --git a/packages/system/immucore/collection.yaml b/packages/system/immucore/collection.yaml index 873467f..c9bf531 100644 --- a/packages/system/immucore/collection.yaml +++ b/packages/system/immucore/collection.yaml @@ -1,7 +1,7 @@ packages: - name: "immucore" category: "system" - version: "0.7.1" + version: "0.7.1-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.7.1" + version: "0.7.1-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 db10ace..f70a65d 100644 --- a/packages/system/kairos-agent/build.yaml +++ b/packages/system/kairos-agent/build.yaml @@ -1,20 +1,20 @@ {{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}} requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "fips" version: ">=0" {{else}} requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "development" version: ">=0" {{end}} prelude: - - apt-get update && apt-get install -y npm gcc - mkdir /go/src/github.com/${GITHUB_ORG}/ -p - - 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 + - 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 - cd /go/src/github.com/${GITHUB_ORG}/{{ .Values.name }} && go mod tidy env: + - DEBIAN_FRONTEND=noninteractive - GITHUB_ORG={{ ( index .Values.labels "github.owner" ) }} - HUGO_VERSION=0.113.0 - LDFLAGS="-s -w -X github.com/kairos-io/kairos-agent/v2/internal/common.VERSION=v${PACKAGE_VERSION} {{with .Values.ldflags}}{{.}}{{end}}" @@ -28,7 +28,7 @@ steps: # Deps for webui - cd /go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/internal/webui/public && npm install - | - PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \ + PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \ cd /go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/ && \ go build -ldflags="${LDFLAGS}" -o /usr/bin/{{ .Values.name }} - upx -1 /usr/bin/{{.Values.name}} diff --git a/packages/system/kairos-agent/collection.yaml b/packages/system/kairos-agent/collection.yaml index e21e210..5bf27a8 100644 --- a/packages/system/kairos-agent/collection.yaml +++ b/packages/system/kairos-agent/collection.yaml @@ -1,7 +1,7 @@ packages: - name: "kairos-agent" category: "system" - version: "2.16.4" + version: "2.16.4-1" labels: github.repo: "kairos-agent" autobump.revdeps: "true" @@ -12,7 +12,7 @@ packages: description: "Lifecycle agent for kairos" - name: "kairos-agent" category: "fips" - version: "2.16.4" + version: "2.16.4-1" labels: github.repo: "kairos-agent" autobump.revdeps: "true" diff --git a/packages/system/kcrypt-challenger/build.yaml b/packages/system/kcrypt-challenger/build.yaml index 0f1af10..5080128 100644 --- a/packages/system/kcrypt-challenger/build.yaml +++ b/packages/system/kcrypt-challenger/build.yaml @@ -1,16 +1,15 @@ {{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}} requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "fips" version: ">=0" {{else}} requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "development" version: ">=0" {{end}} prelude: - - apt-get update && apt-get install -y gcc libssl-dev - mkdir go/src/github.com/${GITHUB_ORG}/ -p - cd go/src/github.com/${GITHUB_ORG}/ && git clone https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git env: @@ -29,7 +28,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 -ldflags="${LDFLAGS}" -o {{ .Values.binary_name }} ./cmd/discovery/main.go && mv {{ .Values.binary_name }} /system/discovery {{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}} diff --git a/packages/system/kcrypt-challenger/collection.yaml b/packages/system/kcrypt-challenger/collection.yaml index ab4a470..48916a4 100644 --- a/packages/system/kcrypt-challenger/collection.yaml +++ b/packages/system/kcrypt-challenger/collection.yaml @@ -2,7 +2,7 @@ packages: - name: kcrypt-challenger binary_name: kcrypt-discovery-challenger category: system - version: "0.10.0" + version: "0.10.0-1" labels: github.repo: "kcrypt-challenger" github.owner: "kairos-io" @@ -13,7 +13,7 @@ packages: - name: kcrypt-challenger binary_name: kcrypt-discovery-challenger category: fips - version: "0.10.0" + version: "0.10.0-1" labels: github.repo: "kcrypt-challenger" github.owner: "kairos-io" diff --git a/packages/system/kcrypt/build.yaml b/packages/system/kcrypt/build.yaml index b8a29e4..10fb041 100644 --- a/packages/system/kcrypt/build.yaml +++ b/packages/system/kcrypt/build.yaml @@ -1,18 +1,15 @@ {{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}} requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "fips" version: ">=0" {{else}} requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "development" version: ">=0" {{end}} prelude: -{{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}} - - apt-get update && apt-get install -y gcc -{{end}} - mkdir go/src/github.com/${GITHUB_ORG}/ -p - cd go/src/github.com/${GITHUB_ORG}/ && git clone https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git env: @@ -28,7 +25,7 @@ env: {{end}} 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="${LDFLAGS}" && mv {{.Values.name}} /usr/bin/ {{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}} {{ if .Values.arch }} diff --git a/packages/system/kcrypt/collection.yaml b/packages/system/kcrypt/collection.yaml index f21b4d5..0d2c00c 100644 --- a/packages/system/kcrypt/collection.yaml +++ b/packages/system/kcrypt/collection.yaml @@ -1,7 +1,7 @@ packages: - name: kcrypt category: system - version: "0.13.0" + version: "0.13.0-1" labels: github.repo: "kcrypt" autobump.revdeps: "true" @@ -12,7 +12,7 @@ packages: description: "Cloud native guardian for persistent data in the edge" - name: kcrypt category: fips - version: "0.13.0" + version: "0.13.0-1" labels: github.repo: "kcrypt" autobump.revdeps: "true" diff --git a/packages/system/provider-kairos/build.yaml b/packages/system/provider-kairos/build.yaml index 5e3d38f..4ae964e 100644 --- a/packages/system/provider-kairos/build.yaml +++ b/packages/system/provider-kairos/build.yaml @@ -1,5 +1,5 @@ requires: -- name: "toolchain-go-ubuntu" +- name: "toolchain" category: "development" version: ">=0" env: @@ -7,7 +7,6 @@ env: - PACKAGE_VERSION={{ .Values.version }} - LDFLAGS="-s -w -X 'github.com/kairos-io/provider-kairos/v2/internal/cli.VERSION={{ .Values.version }}'" prelude: -- apt-get update && apt-get install -y git - git clone https://github.com/kairos-io/provider-kairos - | PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \ diff --git a/packages/system/provider-kairos/collection.yaml b/packages/system/provider-kairos/collection.yaml index 0028da9..67e0626 100644 --- a/packages/system/provider-kairos/collection.yaml +++ b/packages/system/provider-kairos/collection.yaml @@ -1,7 +1,7 @@ packages: - name: "provider-kairos" category: "system" - version: "2.9.2" + version: "2.9.2-1" labels: github.repo: "provider-kairos" github.owner: "kairos-io" diff --git a/packages/toolchain-go/build.yaml b/packages/toolchain-go/build.yaml deleted file mode 100644 index e029d72..0000000 --- a/packages/toolchain-go/build.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{ $version := semver .Values.version }} -{{ if .Values.variant }} -image: "golang:{{ $version.Major }}.{{$version.Minor}}.{{$version.Patch }}-{{.Values.variant}}" -{{ else }} -image: "golang:{{ $version.Major }}.{{$version.Minor}}.{{$version.Patch }}" -{{ end }} - -prelude: -{{ if eq .Values.variant "alpine" }} -- apk update -- apk add curl make git bash -{{ end }} -{{ if eq .Values.variant "bookworm" }} -- apt-get update && apt-get install -y curl xz-utils -- curl -LO https://github.com/upx/upx/releases/download/v4.2.2/upx-4.2.2-{{ .Values.arch }}_linux.tar.xz -- tar -xvf upx-4.2.2-{{ .Values.arch }}_linux.tar.xz -- mv upx-4.2.2-{{ .Values.arch }}_linux/upx /usr/bin/ -- rm -rf upx-4.2.2-{{ .Values.arch }}_linux -- chmod +x /usr/bin/upx -{{ end }} -{{ if eq .Values.variant "bullseye" }} -- apt-get update && apt-get install -y curl xz-utils upx -{{ end }} \ No newline at end of file diff --git a/packages/toolchain-go/collection.yaml b/packages/toolchain-go/collection.yaml deleted file mode 100644 index 9e53a44..0000000 --- a/packages/toolchain-go/collection.yaml +++ /dev/null @@ -1,85 +0,0 @@ -packages: - - name: toolchain-go - category: development - variant: "alpine" - version: "1.24.1" - hidden: true - labels: - autobump.revdeps: "false" - autobump.strategy: "custom" - autobump.string_replace: '{ "prefix": "" }' - autobump.prefix: "prefix" - autobump.hook: | - curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' - autobump.version_hook: | - curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' - package.version: "1.24.1" - - name: toolchain-go-ubuntu - variant: "bookworm" - category: development - version: "1.24.1" - hidden: true - labels: - autobump.revdeps: "false" - autobump.strategy: "custom" - autobump.string_replace: '{ "prefix": "" }' - autobump.prefix: "prefix" - autobump.hook: | - curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' - autobump.version_hook: | - curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' - package.version: "1.24.1" - - name: toolchain-go - category: development - variant: "alpine" - version: "1.24.0" - tag: "1.24 0" - hidden: true - labels: - autobump.revdeps: "false" - autobump.strategy: "custom" - autobump.string_replace: '{ "prefix": "" }' - autobump.prefix: "prefix" - autobump.hook: | - curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' - autobump.version_hook: | - curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' - - name: toolchain-go-ubuntu - variant: "bookworm" - category: development - version: "1.24.0" - tag: "1.24.0" - hidden: true - labels: - autobump.revdeps: "false" - autobump.strategy: "custom" - autobump.string_replace: '{ "prefix": "" }' - autobump.prefix: "prefix" - autobump.hook: | - curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' - autobump.version_hook: | - curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' - - name: toolchain-go - category: fips - variant: "alpine" - version: "1.19.10" - tag: "1.19.10" - hidden: true - - name: toolchain-go - category: fips - variant: "alpine" - version: "1.24.0" - tag: "1.24.0" - hidden: true - - name: toolchain-go-ubuntu - category: fips - variant: "bullseye" - version: "1.19.10+1" - tag: "1.19.10" - hidden: true - - name: toolchain-go-ubuntu - category: fips - variant: "bookworm" - version: "1.24.0" - tag: "1.24.0" - hidden: true diff --git a/packages/toolchain-ubuntu/build.yaml b/packages/toolchain-ubuntu/build.yaml deleted file mode 100644 index 5ef2393..0000000 --- a/packages/toolchain-ubuntu/build.yaml +++ /dev/null @@ -1,3 +0,0 @@ -image: "ubuntu:20.04" -prelude: -- apt-get update && apt-get install -y curl systemd sudo diff --git a/packages/toolchain-ubuntu/definition.yaml b/packages/toolchain-ubuntu/definition.yaml deleted file mode 100644 index 8cb77a2..0000000 --- a/packages/toolchain-ubuntu/definition.yaml +++ /dev/null @@ -1,4 +0,0 @@ -name: toolchain-ubuntu -category: development -version: "0.2" -hidden: true diff --git a/packages/toolchain/build.yaml b/packages/toolchain/build.yaml new file mode 100644 index 0000000..aa85f16 --- /dev/null +++ b/packages/toolchain/build.yaml @@ -0,0 +1,22 @@ +# We use the image with the older glibc as possible in case we +# need to use this to build GO binaries for older distros +image: "ubuntu:20.04" +# ldd (Ubuntu GLIBC 2.31-0ubuntu9.16) 2.31 + +env: + - DEBIAN_FRONTEND=noninteractive +steps: +- apt-get update && apt-get install -y curl xz-utils upx gcc git libssl-dev make build-essential libncurses5-dev libssl-dev libelf-dev flex bison libgnutls28-dev wget cpio xz-utils kmod gcc-aarch64-linux-gnu wget rpm2cpio +{{ if .Values.arch }} + {{ if eq .Values.arch "arm64" }} +- curl -L https://go.dev/dl/go{{ .Values.version }}.linux-arm64.tar.gz -o /tmp/go.tar.gz + {{ else }} +- curl -L https://go.dev/dl/go{{ .Values.version }}.linux-amd64.tar.gz -o /tmp/go.tar.gz + {{ end }} +{{ end }} +- tar -C /usr/local -xzf /tmp/go.tar.gz +- rm -f /tmp/go.tar.gz +- echo "export PATH=$PATH:/usr/local/go/bin" >> /etc/profile +- ln -s /usr/local/go/bin/go /usr/bin/go +- curl -fsSL https://deb.nodesource.com/setup_22.x | bash - # Install Node.js 22.x via nodesource to get the stable supported version +- apt-get update && apt-get install -y nodejs \ No newline at end of file diff --git a/packages/toolchain/collection.yaml b/packages/toolchain/collection.yaml new file mode 100644 index 0000000..b5bc299 --- /dev/null +++ b/packages/toolchain/collection.yaml @@ -0,0 +1,32 @@ +packages: + - name: toolchain + category: development + version: "1.24.1" + hidden: true + labels: + autobump.revdeps: "false" + autobump.strategy: "custom" + autobump.string_replace: '{ "prefix": "" }' + autobump.prefix: "prefix" + autobump.hook: | + curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' + autobump.version_hook: | + curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' + package.version: "1.24.1" + - name: toolchain + category: fips + version: "1.24.1" + hidden: true + labels: + autobump.revdeps: "false" + autobump.strategy: "custom" + autobump.string_replace: '{ "prefix": "" }' + autobump.prefix: "prefix" + autobump.hook: | + curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' + autobump.version_hook: | + curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g' + - name: toolchain + category: fips + version: "1.19.10" + hidden: true \ No newline at end of file diff --git a/packages/uboot/rpi64/build.yaml b/packages/uboot/rpi64/build.yaml index a82efc6..0519660 100644 --- a/packages/uboot/rpi64/build.yaml +++ b/packages/uboot/rpi64/build.yaml @@ -1,5 +1,5 @@ requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "development" version: ">=0" @@ -17,15 +17,7 @@ env: prelude: - mkdir build/${GITHUB_ORG}/ -p - mkdir /output -p - - git clone --depth 1 --branch v${PACKAGE_VERSION} https://github.com/${GITHUB_ORG}/${GITHUB_REPO}.git build/${GITHUB_ORG} - - apt-get update -y && apt-get install -y build-essential libncurses5-dev libssl-dev libelf-dev flex bison libgnutls28-dev -{{ if .Values.arch }} - {{ if eq .Values.arch "amd64" }} - - apt-get -y install gcc-aarch64-linux-gnu - {{ else if eq .Values.arch "arm64" }} - - apt-get -y install gcc - {{ end }} -{{ end }} + - git clone --depth 1 --branch v${PACKAGE_VERSION%\-*} https://github.com/${GITHUB_ORG}/${GITHUB_REPO}.git build/${GITHUB_ORG} steps: - cp add-identifiers-for-new-rpi5-series.patch build/${GITHUB_ORG} diff --git a/packages/uboot/rpi64/definition.yaml b/packages/uboot/rpi64/definition.yaml index 03949ce..ea9964a 100644 --- a/packages/uboot/rpi64/definition.yaml +++ b/packages/uboot/rpi64/definition.yaml @@ -1,6 +1,7 @@ name: "rpi64" category: "uboot" -version: "2025.04-rc3" +version: "2025.01-1" labels: github.repo: "u-boot" github.owner: "u-boot" + autobump.skip_if_contains: '["rc"]' diff --git a/packages/utils/earthly/build.yaml b/packages/utils/earthly/build.yaml deleted file mode 100644 index 54f0bd1..0000000 --- a/packages/utils/earthly/build.yaml +++ /dev/null @@ -1,19 +0,0 @@ - -{{ if eq .Values.arch "arm" }} -{{ else }} -requires: -- name: "toolchain-go" - category: "development" - version: ">=0" -prelude: -- 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" ) }} -steps: -- | - mv {{ .Values.name }} /usr/bin/{{ .Values.name }} -- chmod +x /usr/bin/{{ .Values.name }} -includes: -- /usr/bin/{{.Values.name}} -{{ end }} \ No newline at end of file diff --git a/packages/utils/earthly/definition.yaml b/packages/utils/earthly/definition.yaml deleted file mode 100644 index dd4276e..0000000 --- a/packages/utils/earthly/definition.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: earthly -category: utils -arch: "amd64" -version: "0.8.15" -labels: - github.repo: "earthly" - github.owner: "earthly" - autobump.strategy: "release" -uri: - - https://github.com/earthly/earthly -license: "MPL License" -description: "The effortless CI/CD framework that runs anywhere" diff --git a/packages/utils/edgevpn-systemd/build.yaml b/packages/utils/edgevpn-systemd/build.yaml index dcd2d78..7bd85d0 100644 --- a/packages/utils/edgevpn-systemd/build.yaml +++ b/packages/utils/edgevpn-systemd/build.yaml @@ -1,7 +1,4 @@ -requires: -- category: "development" - name: "toolchain-go" - version: ">=0" +image: "alpine" package_dir: /integration steps: diff --git a/packages/utils/edgevpn-systemd/definition.yaml b/packages/utils/edgevpn-systemd/definition.yaml index 00b6332..a95156a 100644 --- a/packages/utils/edgevpn-systemd/definition.yaml +++ b/packages/utils/edgevpn-systemd/definition.yaml @@ -1,6 +1,6 @@ name: edgevpn category: systemd-service -version: "20240830" +version: "20240830-1" requires: - name: edgevpn category: utils diff --git a/packages/utils/edgevpn/build.yaml b/packages/utils/edgevpn/build.yaml index 8324752..fabd3f9 100644 --- a/packages/utils/edgevpn/build.yaml +++ b/packages/utils/edgevpn/build.yaml @@ -1,5 +1,5 @@ requires: -- name: "toolchain-go-ubuntu" +- name: "toolchain" category: "development" version: ">=0" prelude: diff --git a/packages/utils/edgevpn/definition.yaml b/packages/utils/edgevpn/definition.yaml index 6a773a9..a934f20 100644 --- a/packages/utils/edgevpn/definition.yaml +++ b/packages/utils/edgevpn/definition.yaml @@ -1,6 +1,6 @@ name: edgevpn category: utils -version: "0.30.2" +version: "0.30.2-1" labels: github.repo: "edgevpn" github.owner: "mudler" diff --git a/packages/utils/goreleaser/build.yaml b/packages/utils/goreleaser/build.yaml deleted file mode 100644 index 6e4ba5a..0000000 --- a/packages/utils/goreleaser/build.yaml +++ /dev/null @@ -1,16 +0,0 @@ -requires: -- name: "toolchain-go" - category: "development" - version: ">=0" -prelude: -- mkdir go/src/github.com/${GITHUB_ORG}/ -p -- cd go/src/github.com/${GITHUB_ORG}/ && git clone https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git -env: -- GOPATH=/luetbuild/go/ -- GITHUB_ORG={{ ( index .Values.labels "github.owner" ) }} -- CGO_ENABLED=0 -steps: -- 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}} \ No newline at end of file diff --git a/packages/utils/goreleaser/definition.yaml b/packages/utils/goreleaser/definition.yaml deleted file mode 100644 index 19bfc05..0000000 --- a/packages/utils/goreleaser/definition.yaml +++ /dev/null @@ -1,10 +0,0 @@ -name: goreleaser -category: utils -version: "2.7.0" -description: "Deliver Go binaries as fast and easily as possible" -labels: - github.repo: "goreleaser" - github.owner: "goreleaser" -uri: - - https://github.com/goreleaser/goreleaser -license: "The MIT License" diff --git a/packages/utils/helm/build.yaml b/packages/utils/helm/build.yaml index a4de2f6..2116541 100644 --- a/packages/utils/helm/build.yaml +++ b/packages/utils/helm/build.yaml @@ -1,9 +1,8 @@ requires: -- name: "toolchain-go" +- name: "toolchain" category: "development" version: ">=0" env: -- PATH=$PATH:/usr/local/go/bin - CGO_ENABLED=0 prelude: - | diff --git a/packages/utils/helm/definition.yaml b/packages/utils/helm/definition.yaml index e010ab7..4958da8 100644 --- a/packages/utils/helm/definition.yaml +++ b/packages/utils/helm/definition.yaml @@ -1,6 +1,6 @@ name: "helm" category: "utils" -version: "3.17.1" +version: "3.17.1-1" description: "The Kubernetes Package Manager" license: "Apache-2.0" labels: diff --git a/packages/utils/k3d/build.yaml b/packages/utils/k3d/build.yaml index 70d450d..2adde4f 100644 --- a/packages/utils/k3d/build.yaml +++ b/packages/utils/k3d/build.yaml @@ -1,5 +1,5 @@ requires: -- name: "toolchain-go" +- name: "toolchain" category: "development" version: ">=0" prelude: @@ -8,7 +8,7 @@ prelude: {{ if eq $arch "arm" }} {{$arch:="arm64"}} {{end}} -- wget https://github.com/k3d-io/k3d/releases/download/v{{.Values.version}}/k3d-linux-{{$arch}} +- wget https://github.com/k3d-io/k3d/releases/download/v${PACKAGE_VERSION%\-*}/k3d-linux-{{$arch}} steps: - | mv {{.Values.name}}-linux-{{$arch}} /usr/bin/{{.Values.name}} diff --git a/packages/utils/k3d/collection.yaml b/packages/utils/k3d/collection.yaml index 8678ff1..9c943ad 100644 --- a/packages/utils/k3d/collection.yaml +++ b/packages/utils/k3d/collection.yaml @@ -1,7 +1,7 @@ packages: - name: k3d category: utils - version: "5.4.6" + version: "5.4.6-1" labels: github.repo: "k3d-io" github.owner: "k3d" diff --git a/packages/utils/k9s/build.yaml b/packages/utils/k9s/build.yaml index d9bea52..89df055 100644 --- a/packages/utils/k9s/build.yaml +++ b/packages/utils/k9s/build.yaml @@ -1,14 +1,13 @@ requires: -- name: "toolchain-go-ubuntu" +- name: "toolchain" category: "development" version: ">=0" env: -- PATH=$PATH:/usr/local/go/bin - CGO_ENABLED=0 - PACKAGE_VERSION={{ .Values.version }} prelude: - | - PACKAGE_VERSION=v${PACKAGE_VERSION%\+*} && \ + PACKAGE_VERSION=v${PACKAGE_VERSION%\-*} && \ git clone --depth=1 --branch ${PACKAGE_VERSION} https://github.com/derailed/k9s steps: - | diff --git a/packages/utils/k9s/definition.yaml b/packages/utils/k9s/definition.yaml index 7969d37..9e6512c 100644 --- a/packages/utils/k9s/definition.yaml +++ b/packages/utils/k9s/definition.yaml @@ -1,6 +1,6 @@ name: "k9s" category: "utils" -version: "0.40.5" +version: "0.40.5-1" platform: Linux labels: github.repo: "k9s" diff --git a/packages/utils/kube-vip/build.yaml b/packages/utils/kube-vip/build.yaml index 6bdcdbc..c97d2d3 100644 --- a/packages/utils/kube-vip/build.yaml +++ b/packages/utils/kube-vip/build.yaml @@ -1,5 +1,5 @@ requires: -- name: "toolchain-go" +- name: "toolchain" category: "development" version: ">=0" prelude: diff --git a/packages/utils/kube-vip/definition.yaml b/packages/utils/kube-vip/definition.yaml index 799fc04..ee4bfcb 100644 --- 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.8.9" +version: "0.8.9-1" labels: github.repo: "kube-vip" github.owner: "kube-vip" diff --git a/packages/utils/kubectl/build.yaml b/packages/utils/kubectl/build.yaml index 98189ef..0cfc885 100644 --- a/packages/utils/kubectl/build.yaml +++ b/packages/utils/kubectl/build.yaml @@ -1,6 +1,6 @@ requires: - category: "development" - name: "toolchain-go-ubuntu" + name: "toolchain" version: ">=0" package_dir: /kubectl @@ -9,8 +9,8 @@ env: steps: - mkdir -p /kubectl/usr/bin -- PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && curl -LO "https://dl.k8s.io/release/v$PACKAGE_VERSION/bin/linux/{{.Values.arch}}/kubectl" -- PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && curl -LO "https://dl.k8s.io/release/v$PACKAGE_VERSION/bin/linux/{{.Values.arch}}/kubectl.sha256" +- PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && curl -LO "https://dl.k8s.io/release/v$PACKAGE_VERSION/bin/linux/{{.Values.arch}}/kubectl" +- PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && curl -LO "https://dl.k8s.io/release/v$PACKAGE_VERSION/bin/linux/{{.Values.arch}}/kubectl.sha256" - cat kubectl.sha256 - sha256sum ./kubectl - ls -liah diff --git a/packages/utils/kubectl/definition.yaml b/packages/utils/kubectl/definition.yaml index 2bd0005..3d676a7 100644 --- a/packages/utils/kubectl/definition.yaml +++ b/packages/utils/kubectl/definition.yaml @@ -1,6 +1,6 @@ name: kubectl category: container -version: "1.31.0" +version: "1.31.0-1" arch: "amd64" labels: github.repo: "kubectl" diff --git a/packages/utils/kubesplit/build.yaml b/packages/utils/kubesplit/build.yaml index 05d7726..3af57ae 100644 --- a/packages/utils/kubesplit/build.yaml +++ b/packages/utils/kubesplit/build.yaml @@ -1,5 +1,5 @@ requires: -- name: "toolchain-go" +- name: "toolchain" category: "development" version: ">=0" prelude: diff --git a/packages/utils/kubesplit/definition.yaml b/packages/utils/kubesplit/definition.yaml index e1eb185..2c659aa 100644 --- 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" diff --git a/packages/utils/luet/build.yaml b/packages/utils/luet/build.yaml index 7f4fcfc..7ccdd17 100644 --- a/packages/utils/luet/build.yaml +++ b/packages/utils/luet/build.yaml @@ -1,9 +1,8 @@ requires: - - name: "toolchain-go-ubuntu" + - name: "toolchain" category: "development" version: ">=0" prelude: - - apt-get update && apt-get install -y gcc libssl-dev - mkdir -p go/src/github.com/${GITHUB_ORG}/ - cd go/src/github.com/${GITHUB_ORG}/ && git clone https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git env: diff --git a/packages/utils/luet/definition.yaml b/packages/utils/luet/definition.yaml index 2c55c94..e655052 100644 --- a/packages/utils/luet/definition.yaml +++ b/packages/utils/luet/definition.yaml @@ -1,6 +1,6 @@ name: luet category: utils -version: "0.36.0" +version: "0.36.0-1" labels: github.repo: "luet" github.owner: "mudler" diff --git a/packages/utils/nerdctl/build.yaml b/packages/utils/nerdctl/build.yaml index 34858b8..473a6e0 100644 --- a/packages/utils/nerdctl/build.yaml +++ b/packages/utils/nerdctl/build.yaml @@ -1,9 +1,8 @@ requires: -- name: "toolchain-go-ubuntu" +- name: "toolchain" category: "development" version: ">=0" env: -- PATH=$PATH:/usr/local/go/bin - CGO_ENABLED=0 - PACKAGE_VERSION={{ .Values.tag }} prelude: diff --git a/packages/utils/nerdctl/definition.yaml b/packages/utils/nerdctl/definition.yaml index a2a63c8..8858f69 100644 --- a/packages/utils/nerdctl/definition.yaml +++ b/packages/utils/nerdctl/definition.yaml @@ -1,6 +1,6 @@ name: "nerdctl" category: "utils" -version: "2.0.3" +version: "2.0.3-1" tag: "1.7.2" platform: linux labels: diff --git a/packages/utils/operator-sdk/build.yaml b/packages/utils/operator-sdk/build.yaml index 7afd48b..7a4c202 100644 --- a/packages/utils/operator-sdk/build.yaml +++ b/packages/utils/operator-sdk/build.yaml @@ -2,7 +2,7 @@ {{ if .Values.arch }} {{ if eq .Values.arch "amd64" }} requires: -- name: "toolchain-go" +- name: "toolchain" category: "development" version: ">=0" prelude: diff --git a/packages/utils/operator-sdk/definition.yaml b/packages/utils/operator-sdk/definition.yaml index 5c2f5e8..e4b12a6 100644 --- 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.39.1" +version: "1.39.1-1" description: " SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding. " labels: github.repo: "operator-sdk" diff --git a/packages/utils/poco/build.yaml b/packages/utils/poco/build.yaml index 14b7e43..fb7a577 100644 --- a/packages/utils/poco/build.yaml +++ b/packages/utils/poco/build.yaml @@ -1,5 +1,5 @@ requires: -- name: "toolchain-go" +- name: "toolchain" category: "development" version: ">=0" prelude: diff --git a/packages/utils/poco/definition.yaml b/packages/utils/poco/definition.yaml index d12c387..0ec4a98 100644 --- a/packages/utils/poco/definition.yaml +++ b/packages/utils/poco/definition.yaml @@ -1,6 +1,6 @@ name: poco category: utils -version: "0.3.1-1" +version: "0.3.1-2" labels: github.repo: "poco" github.owner: "mudler"