diff --git a/.builder-image-version.txt b/.builder-image-version.txt index 852ed67cf..4e036596e 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.18 +1.1.19 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 9720f76c4..3ce2ff3b6 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.18 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.19 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 1cb4563af..d41f1fb11 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.18 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.19 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/go.mod b/go.mod index 35f5b35af..9bd1c07f1 100644 --- a/go.mod +++ b/go.mod @@ -39,6 +39,7 @@ require ( github.com/stretchr/objx v0.5.2 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/sync v0.7.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/cluster-bootstrap v0.29.3 // indirect ) @@ -94,7 +95,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"