From 62e656bea999e7a05ee7c8d7a3571d55d7f96083 Mon Sep 17 00:00:00 2001 From: "cluster-stack-bot[bot]" <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:18:46 +0000 Subject: [PATCH] :seedling: Update Golang Dependencies group to v3.0.1 | datasource | package | from | to | | ---------- | ---------------- | ------ | ------ | | go | gopkg.in/yaml.v2 | v2.4.0 | v3.0.1 | --- .builder-image-version.txt | 2 +- .github/workflows/pr-lint.yml | 2 +- .github/workflows/schedule-scan-image.yml | 2 +- go.mod | 2 +- internal/controller/clusteraddon_controller.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.builder-image-version.txt b/.builder-image-version.txt index e9bc14996..645377eea 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.14 +1.1.15 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index f27224b22..e476bf4f5 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -21,7 +21,7 @@ jobs: if: github.event_name != 'pull_request' || !github.event.pull_request.draft runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.14 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.15 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/.github/workflows/schedule-scan-image.yml b/.github/workflows/schedule-scan-image.yml index 7f1bda402..93ff7c3e1 100644 --- a/.github/workflows/schedule-scan-image.yml +++ b/.github/workflows/schedule-scan-image.yml @@ -9,7 +9,7 @@ jobs: name: Trivy runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.14 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.15 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/go.mod b/go.mod index c1edfa770..8a46505ae 100644 --- a/go.mod +++ b/go.mod @@ -40,6 +40,7 @@ require ( golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/sync v0.7.0 // indirect google.golang.org/appengine v1.6.8 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/cluster-bootstrap v0.29.3 // indirect ) @@ -95,7 +96,6 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/apiextensions-apiserver v0.29.3 k8s.io/apiserver v0.29.3 // indirect diff --git a/internal/controller/clusteraddon_controller.go b/internal/controller/clusteraddon_controller.go index afafbb712..a734a5fc0 100644 --- a/internal/controller/clusteraddon_controller.go +++ b/internal/controller/clusteraddon_controller.go @@ -31,7 +31,7 @@ import ( "github.com/SovereignCloudStack/cluster-stack-operator/pkg/release" "github.com/SovereignCloudStack/cluster-stack-operator/pkg/workloadcluster" sprig "github.com/go-task/slim-sprig" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types"