From 68837e41d80c105b3755212ee7949c03135f72d6 Mon Sep 17 00:00:00 2001 From: Alexandre Lamarre Date: Mon, 13 May 2024 14:39:49 -0400 Subject: [PATCH 1/4] update k8s version support, based on rancher support matrix Signed-off-by: Alexandre Lamarre squash me Signed-off-by: Alexandre Lamarre --- .github/workflows/scripts/supported-versions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scripts/supported-versions.sh b/.github/workflows/scripts/supported-versions.sh index 650953a9..6ccfa236 100755 --- a/.github/workflows/scripts/supported-versions.sh +++ b/.github/workflows/scripts/supported-versions.sh @@ -7,15 +7,15 @@ set -x if git merge-base --is-ancestor origin/release/v5.0 HEAD then - echo -n "[\"v1.23.9-k3s1\", \"v1.29.3-k3s1\"]" + printf '["%s", "%s"]' v1.23.9-k3s1 v1.29.4-k3s1 exit 0 elif git merge-base --is-ancestor origin/release/v4.0 HEAD then - echo -n "[\"v1.23.9-k3s1\", \"v1.28.8-k3s1\"]" + printf '["%s", "%s"]' v1.25.9-k3s1 v1.28.8-k3s1 exit 0 elif git merge-base --is-ancestor origin/release/v3.0 HEAD then - echo -n "[\"v1.16.9-k3s1\", \"v1.27.9-k3s1\"]" + printf '["%s", "%s"]' v1.23.9-k3s1 v1.27.9-k3s1 exit 0 fi From ec1884caa291ccf96a113a64e556c2fd2d1c832c Mon Sep 17 00:00:00 2001 From: Alexandre Lamarre Date: Mon, 13 May 2024 15:31:22 -0400 Subject: [PATCH 2/4] remove unecessary comments from goreleaser Signed-off-by: Alexandre Lamarre --- .goreleaser.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 7e13edf4..c4c05fa9 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,8 +1,6 @@ -# This is an example .goreleaser.yml file with some sensible defaults. # Make sure to check the documentation at https://goreleaser.com before: hooks: - # You may remove this if you don't use go modules. - go mod tidy builds: - id: backup-restore-operator @@ -39,8 +37,3 @@ changelog: exclude: - '^docs:' - '^test:' - -# The lines beneath this are called `modelines`. See `:help modeline` -# Feel free to remove those if you don't want/use them. -# yaml-language-server: $schema=https://goreleaser.com/static/schema.json -# vim: set ts=2 sw=2 tw=0 fo=cnqoj \ No newline at end of file From 1479333378d413b416b1a8765b5b91067d93424a Mon Sep 17 00:00:00 2001 From: Alexandre Lamarre Date: Mon, 13 May 2024 15:37:33 -0400 Subject: [PATCH 3/4] (test bug fix) source versions in package-helm script instead of executing Signed-off-by: Alexandre Lamarre --- scripts/package-helm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/package-helm b/scripts/package-helm index 81e75736..c7526663 100755 --- a/scripts/package-helm +++ b/scripts/package-helm @@ -1,6 +1,7 @@ #!/bin/bash set -e + function edit-charts() { sed -i \ -e 's/^version:.*/version: '${1}'/' \ @@ -29,7 +30,8 @@ if ! hash helm 2>/dev/null; then fi cd $(dirname $0)/.. -. ./scripts/version +source ./scripts/version + rm -rf build/charts mkdir -p build dist/artifacts From bf5a5cf380ac2d0130eb57fc9032f9b29b30f9f8 Mon Sep 17 00:00:00 2001 From: Alexandre Lamarre Date: Mon, 13 May 2024 16:53:03 -0400 Subject: [PATCH 4/4] add race flag to hull tests Signed-off-by: Alexandre Lamarre --- scripts/hull | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/hull b/scripts/hull index fbea99f9..52092b95 100755 --- a/scripts/hull +++ b/scripts/hull @@ -18,6 +18,6 @@ cd $(dirname $0)/.. cd tests echo "Running Hull Tests on Chart Version: $CHART_VERSION" -go test -timeout 30s -run ^TestChart$ github.com/rancher/backup-restore-operator/tests/hull +go test -race -timeout 30s -run ^TestChart$ github.com/rancher/backup-restore-operator/tests/hull cd ..