From 188a0c8d85e6520dd7fdead1942525f577a62d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20J=C3=A1ky?= Date: Wed, 6 Sep 2023 17:00:10 +0200 Subject: [PATCH 1/2] ci(GHA): updated Vault versions in test matrix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: András Jáky --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 637c62cf..f189bc15 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -211,7 +211,7 @@ jobs: strategy: matrix: k8s_version: ["v1.24.15", "v1.25.11", "v1.26.6", "v1.27.3"] - vault_version: ["1.11.12", "1.12.8", "1.13.4", "1.14.1"] + vault_version: ["1.11.12", "1.12.9", "1.13.5", "1.14.1"] # latest versions with MPL 2.0 license steps: - name: Checkout repository From 605465b4faa429339282fd775d86ab25918694b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20J=C3=A1ky?= Date: Wed, 6 Sep 2023 17:07:12 +0200 Subject: [PATCH 2/2] test: change Vault version name to avoid confusion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: András Jáky --- pkg/apis/vault/v1alpha1/vault_types_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/apis/vault/v1alpha1/vault_types_test.go b/pkg/apis/vault/v1alpha1/vault_types_test.go index ef70f1d2..3cfd26ee 100644 --- a/pkg/apis/vault/v1alpha1/vault_types_test.go +++ b/pkg/apis/vault/v1alpha1/vault_types_test.go @@ -23,10 +23,10 @@ import ( func TestGetVersion(t *testing.T) { t.Run("Good", func(t *testing.T) { tests := []string{ - "hashicorp/vault:1.14.0", - "hashicorp/vault:1.14", - "my.local.proxy/hashicorp/vault:1.14.0", - "my.local.proxy:5000/hashicorp/vault:1.14.0", + "bank-vaults/my-vault:1.2.3", + "bank-vaults/my-vault:1.2", + "my.local.proxy/bank-vaults/my-vault:1.2.3", + "my.local.proxy:5000/bank-vaults/my-vault:1.2.3", } for _, tt := range tests { @@ -45,9 +45,9 @@ func TestGetVersion(t *testing.T) { t.Run("Bad", func(t *testing.T) { tests := []string{ - "hashicorp/vault", - "hashicorp/vault:latest", - "hashicorp/vault:my-custom-build", + "bank-vaults/my-vault", + "bank-vaults/my-vault:latest", + "bank-vaults/my-vault:my-custom-build", } for _, tt := range tests {