diff --git a/cmd/werf/bundle/apply/apply.go b/cmd/werf/bundle/apply/apply.go index 29510784c4..0249d6cbad 100644 --- a/cmd/werf/bundle/apply/apply.go +++ b/cmd/werf/bundle/apply/apply.go @@ -8,7 +8,7 @@ import ( uuid "github.com/satori/go.uuid" "github.com/spf13/cobra" - "helm.sh/helm/v3/cmd/helm" + helm_v3 "helm.sh/helm/v3/cmd/helm" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart/loader" "helm.sh/helm/v3/pkg/cli/values" @@ -150,9 +150,10 @@ func runApply() error { StatusProgressPeriod: time.Duration(*commonCmdData.StatusProgressPeriodSeconds) * time.Second, HooksStatusProgressPeriod: time.Duration(*commonCmdData.HooksStatusProgressPeriodSeconds) * time.Second, KubeConfigOptions: kube.KubeConfigOptions{ - Context: *commonCmdData.KubeContext, - ConfigPath: *commonCmdData.KubeConfig, - ConfigDataBase64: *commonCmdData.KubeConfigBase64, + Context: *commonCmdData.KubeContext, + ConfigPath: *commonCmdData.KubeConfig, + ConfigDataBase64: *commonCmdData.KubeConfigBase64, + ConfigPathMergeList: *commonCmdData.KubeConfigPathMergeList, }, ReleasesHistoryMax: *commonCmdData.ReleasesHistoryMax, }); err != nil { diff --git a/cmd/werf/common/helm.go b/cmd/werf/common/helm.go index 6dcfa59e40..ad1290fe28 100644 --- a/cmd/werf/common/helm.go +++ b/cmd/werf/common/helm.go @@ -4,7 +4,7 @@ import ( "context" "time" - "helm.sh/helm/v3/cmd/helm" + helm_v3 "helm.sh/helm/v3/cmd/helm" "helm.sh/helm/v3/pkg/action" "github.com/werf/kubedog/pkg/kube" @@ -40,9 +40,10 @@ func NewActionConfig(ctx context.Context, kubeInitializer helm.KubeInitializer, StatusProgressPeriod: time.Duration(*commonCmdData.StatusProgressPeriodSeconds) * time.Second, HooksStatusProgressPeriod: time.Duration(*commonCmdData.HooksStatusProgressPeriodSeconds) * time.Second, KubeConfigOptions: kube.KubeConfigOptions{ - Context: *commonCmdData.KubeContext, - ConfigPath: *commonCmdData.KubeConfig, - ConfigDataBase64: *commonCmdData.KubeConfigBase64, + Context: *commonCmdData.KubeContext, + ConfigPath: *commonCmdData.KubeConfig, + ConfigDataBase64: *commonCmdData.KubeConfigBase64, + ConfigPathMergeList: *commonCmdData.KubeConfigPathMergeList, }, ReleasesHistoryMax: *commonCmdData.ReleasesHistoryMax, }); err != nil { diff --git a/cmd/werf/dismiss/dismiss.go b/cmd/werf/dismiss/dismiss.go index 572db83d63..51f2336e9b 100644 --- a/cmd/werf/dismiss/dismiss.go +++ b/cmd/werf/dismiss/dismiss.go @@ -6,7 +6,7 @@ import ( "time" "github.com/spf13/cobra" - "helm.sh/helm/v3/cmd/helm" + helm_v3 "helm.sh/helm/v3/cmd/helm" "helm.sh/helm/v3/pkg/action" "github.com/werf/kubedog/pkg/kube" diff --git a/cmd/werf/helm/helm.go b/cmd/werf/helm/helm.go index 839ea6f353..c021e5891c 100644 --- a/cmd/werf/helm/helm.go +++ b/cmd/werf/helm/helm.go @@ -7,7 +7,7 @@ import ( "time" "github.com/spf13/cobra" - "helm.sh/helm/v3/cmd/helm" + helm_v3 "helm.sh/helm/v3/cmd/helm" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" @@ -148,9 +148,10 @@ func NewCmd() *cobra.Command { StatusProgressPeriod: time.Duration(*_commonCmdData.StatusProgressPeriodSeconds) * time.Second, HooksStatusProgressPeriod: time.Duration(*_commonCmdData.HooksStatusProgressPeriodSeconds) * time.Second, KubeConfigOptions: kube.KubeConfigOptions{ - Context: *_commonCmdData.KubeContext, - ConfigPath: *_commonCmdData.KubeConfig, - ConfigDataBase64: *_commonCmdData.KubeConfigBase64, + Context: *_commonCmdData.KubeContext, + ConfigPath: *_commonCmdData.KubeConfig, + ConfigPathMergeList: *_commonCmdData.KubeConfigPathMergeList, + ConfigDataBase64: *_commonCmdData.KubeConfigBase64, }, ReleasesHistoryMax: *_commonCmdData.ReleasesHistoryMax, }) diff --git a/cmd/werf/helm/migrate2to3.go b/cmd/werf/helm/migrate2to3.go index ec51dcac95..9518310835 100644 --- a/cmd/werf/helm/migrate2to3.go +++ b/cmd/werf/helm/migrate2to3.go @@ -6,7 +6,7 @@ import ( "os" "github.com/spf13/cobra" - "helm.sh/helm/v3/cmd/helm" + helm_v3 "helm.sh/helm/v3/cmd/helm" "helm.sh/helm/v3/pkg/action" "github.com/werf/kubedog/pkg/kube" @@ -125,9 +125,10 @@ func runMigrate2To3(ctx context.Context) error { } kubeConfigOptions := kube.KubeConfigOptions{ - Context: *migrate2To3CommonCmdData.KubeContext, - ConfigPath: *migrate2To3CommonCmdData.KubeConfig, - ConfigDataBase64: *migrate2To3CommonCmdData.KubeConfigBase64, + Context: *migrate2To3CommonCmdData.KubeContext, + ConfigPath: *migrate2To3CommonCmdData.KubeConfig, + ConfigDataBase64: *migrate2To3CommonCmdData.KubeConfigBase64, + ConfigPathMergeList: *migrate2To3CommonCmdData.KubeConfigPathMergeList, } helmRegistryClientHandler, err := common.NewHelmRegistryClientHandle(ctx, &migrate2To3CommonCmdData) diff --git a/cmd/werf/render/render.go b/cmd/werf/render/render.go index 95d4bbfbf1..c6e1a4b411 100644 --- a/cmd/werf/render/render.go +++ b/cmd/werf/render/render.go @@ -8,7 +8,7 @@ import ( "path/filepath" "github.com/spf13/cobra" - "helm.sh/helm/v3/cmd/helm" + helm_v3 "helm.sh/helm/v3/cmd/helm" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" diff --git a/go.mod b/go.mod index 7ff1a30243..d061b69ef9 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/theupdateframework/notary v0.6.1 // indirect github.com/tonistiigi/go-rosetta v0.0.0-20200727161949-f79598599c5d // indirect - github.com/werf/kubedog v0.6.3-0.20211020172441-2ae4bcd3d36f + github.com/werf/kubedog v0.6.4-0.20220222141823-4ca722ade0ef github.com/werf/lockgate v0.0.0-20200729113342-ec2c142f71ea github.com/werf/logboek v0.5.4 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect diff --git a/go.sum b/go.sum index 18af82a6d0..3f04161cc5 100644 --- a/go.sum +++ b/go.sum @@ -1991,6 +1991,8 @@ github.com/werf/helm/v3 v3.0.0-20211112190515-e733b755e5af h1:MakPeB2Rpww0G9wYd4 github.com/werf/helm/v3 v3.0.0-20211112190515-e733b755e5af/go.mod h1:3eOeBD3Z+O/ELiuu19zynZSN8jP1ErXLuyP21SZeMq8= github.com/werf/kubedog v0.6.3-0.20211020172441-2ae4bcd3d36f h1:TTJxZTkHvsmDQdjjwCHuJ9an2/PshDv75VUxifexC5Y= github.com/werf/kubedog v0.6.3-0.20211020172441-2ae4bcd3d36f/go.mod h1:QQZtZEKQf9HMKjMkbkrrwX9VDf5XKsn4TVmbWjsHn7M= +github.com/werf/kubedog v0.6.4-0.20220222141823-4ca722ade0ef h1:jidfI8MH4qRvWHlxGw06VKWiKRdBIfGFcjQ3pGwsquc= +github.com/werf/kubedog v0.6.4-0.20220222141823-4ca722ade0ef/go.mod h1:QQZtZEKQf9HMKjMkbkrrwX9VDf5XKsn4TVmbWjsHn7M= github.com/werf/lockgate v0.0.0-20200729113342-ec2c142f71ea h1:R5tJUhL5a3YfHTrHWyuAdJW3h//fmONrpHJjjAZ79e4= github.com/werf/lockgate v0.0.0-20200729113342-ec2c142f71ea/go.mod h1:/CeY6KDiBSCU9PUmjt7zGhqpzp8FAPg/wNVfLZHQGWI= github.com/werf/logboek v0.5.1/go.mod h1:1RKvhO4ulmpD5sUN/9a2XsRjt+Xh8CxJjMbmya85YVA=