From 0e2cf82e3ef614fcec2f79a60cfc8bc46a9ee0eb Mon Sep 17 00:00:00 2001 From: andres-portainer <91705312+andres-portainer@users.noreply.github.com> Date: Fri, 6 Mar 2026 18:21:12 -0300 Subject: [PATCH] fix(yaml): consolidate dependencies BE-12695 (#2015) --- .golangci.yaml | 2 ++ go.mod | 1 - pkg/libhelm/sdk/values.go | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 26c051f9a..fac76034f 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -54,6 +54,8 @@ linters: desc: github.com/ProtonMail/go-crypto/openpgp is not allowed because of FIPS mode - pkg: github.com/cosi-project/runtime desc: github.com/cosi-project/runtime is not allowed because of FIPS mode + - pkg: gopkg.in/yaml.v2 + desc: use go.yaml.in/yaml/v3 instead - pkg: gopkg.in/yaml.v3 desc: use go.yaml.in/yaml/v3 instead forbidigo: diff --git a/go.mod b/go.mod index b27f9eef2..5afc87414 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,6 @@ require ( golang.org/x/mod v0.29.0 golang.org/x/oauth2 v0.30.0 golang.org/x/sync v0.18.0 - gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.18.5 k8s.io/api v0.33.3 k8s.io/apimachinery v0.33.4 diff --git a/pkg/libhelm/sdk/values.go b/pkg/libhelm/sdk/values.go index 71aca70ac..a79549d85 100644 --- a/pkg/libhelm/sdk/values.go +++ b/pkg/libhelm/sdk/values.go @@ -3,11 +3,12 @@ package sdk import ( "os" - "github.com/pkg/errors" "github.com/portainer/portainer/pkg/libhelm/options" "github.com/portainer/portainer/pkg/libhelm/release" + + "github.com/pkg/errors" "github.com/rs/zerolog/log" - "gopkg.in/yaml.v2" + "go.yaml.in/yaml/v3" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chartutil" )