Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: Nelm moved to separate repo
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
  • Loading branch information
ilya-lesikov committed Dec 29, 2023
1 parent d2cd779 commit be662c3
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 32 deletions.
31 changes: 16 additions & 15 deletions cmd/werf/converge/converge.go
Expand Up @@ -19,23 +19,24 @@ import (
"helm.sh/helm/v3/pkg/cli/values"
"helm.sh/helm/v3/pkg/postrender"
"helm.sh/helm/v3/pkg/registry"
"helm.sh/helm/v3/pkg/werf/chrttree"
helmcommon "helm.sh/helm/v3/pkg/werf/common"
"helm.sh/helm/v3/pkg/werf/kubeclnt"
"helm.sh/helm/v3/pkg/werf/log"
"helm.sh/helm/v3/pkg/werf/opertn"
"helm.sh/helm/v3/pkg/werf/plnbuilder"
"helm.sh/helm/v3/pkg/werf/plnexectr"
"helm.sh/helm/v3/pkg/werf/reprt"
"helm.sh/helm/v3/pkg/werf/resrc"
"helm.sh/helm/v3/pkg/werf/resrcpatcher"
"helm.sh/helm/v3/pkg/werf/resrcprocssr"
"helm.sh/helm/v3/pkg/werf/resrctracker"
"helm.sh/helm/v3/pkg/werf/rls"
"helm.sh/helm/v3/pkg/werf/rlshistor"
"helm.sh/helm/v3/pkg/werf/utls"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

"github.com/werf/nelm/pkg/chrttree"
helmcommon "github.com/werf/nelm/pkg/common"
"github.com/werf/nelm/pkg/kubeclnt"
"github.com/werf/nelm/pkg/log"
"github.com/werf/nelm/pkg/opertn"
"github.com/werf/nelm/pkg/plnbuilder"
"github.com/werf/nelm/pkg/plnexectr"
"github.com/werf/nelm/pkg/reprt"
"github.com/werf/nelm/pkg/resrc"
"github.com/werf/nelm/pkg/resrcpatcher"
"github.com/werf/nelm/pkg/resrcprocssr"
"github.com/werf/nelm/pkg/resrctracker"
"github.com/werf/nelm/pkg/rls"
"github.com/werf/nelm/pkg/rlshistor"
"github.com/werf/nelm/pkg/utls"

"github.com/werf/kubedog/pkg/kube"
"github.com/werf/logboek"
"github.com/werf/werf/cmd/werf/common"
Expand Down
21 changes: 11 additions & 10 deletions cmd/werf/plan/plan.go
Expand Up @@ -16,18 +16,19 @@ import (
"helm.sh/helm/v3/pkg/cli/values"
"helm.sh/helm/v3/pkg/postrender"
"helm.sh/helm/v3/pkg/registry"
"helm.sh/helm/v3/pkg/werf/chrttree"
helmcommon "helm.sh/helm/v3/pkg/werf/common"
"helm.sh/helm/v3/pkg/werf/kubeclnt"
"helm.sh/helm/v3/pkg/werf/log"
"helm.sh/helm/v3/pkg/werf/resrc"
"helm.sh/helm/v3/pkg/werf/resrcchangcalc"
"helm.sh/helm/v3/pkg/werf/resrcchanglog"
"helm.sh/helm/v3/pkg/werf/resrcpatcher"
"helm.sh/helm/v3/pkg/werf/resrcprocssr"
"helm.sh/helm/v3/pkg/werf/rlshistor"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

"github.com/werf/nelm/pkg/chrttree"
helmcommon "github.com/werf/nelm/pkg/common"
"github.com/werf/nelm/pkg/kubeclnt"
"github.com/werf/nelm/pkg/log"
"github.com/werf/nelm/pkg/resrc"
"github.com/werf/nelm/pkg/resrcchangcalc"
"github.com/werf/nelm/pkg/resrcchanglog"
"github.com/werf/nelm/pkg/resrcpatcher"
"github.com/werf/nelm/pkg/resrcprocssr"
"github.com/werf/nelm/pkg/rlshistor"

"github.com/werf/kubedog/pkg/kube"
"github.com/werf/logboek"
"github.com/werf/werf/cmd/werf/common"
Expand Down
5 changes: 4 additions & 1 deletion go.mod
Expand Up @@ -63,6 +63,7 @@ require (
github.com/werf/kubedog v0.11.0
github.com/werf/lockgate v0.1.1
github.com/werf/logboek v0.6.1
github.com/werf/nelm v0.0.0-00010101000000-000000000000
go.opentelemetry.io/otel v1.14.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0
Expand Down Expand Up @@ -358,6 +359,8 @@ replace (
github.com/helm/helm-2to3 => github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3 // switch back to upstream when merged: https://github.com/helm/helm-2to3/pull/224
github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 // upstream not maintained
github.com/maorfr/helm-plugin-utils => github.com/werf/3p-helm-plugin-utils v0.6.1-0.20230313152239-057595ce9d57 // switch back to upstream when merged: https://github.com/maorfr/helm-plugin-utils/pull/17
helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20231221124451-07953f0b3b74
github.com/werf/kubedog => github.com/werf/kubedog v0.12.1-0.20231229174621-812121cfb937
github.com/werf/nelm => github.com/werf/nelm v0.0.0-20231229194917-1b1406e21187
helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20231229193803-ecfe0905ab7c
k8s.io/helm => github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f
)
12 changes: 6 additions & 6 deletions go.sum
Expand Up @@ -1761,20 +1761,20 @@ github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln
github.com/weppos/publicsuffix-go v0.20.1-0.20221209102050-40d9c30084b3 h1:ypyhoprZWFzU0ydOBv3I5SS7/jLFJ+ujPAU+BD/EVFM=
github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3 h1:pdKLiuiUoOFswc0HV6GX1+JHgP14HqE035xl2DQJi8A=
github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3/go.mod h1:lTSQBLomjl67m4HQMbg3BHKWes3pOmjNBg8yygXYugk=
github.com/werf/3p-helm/v3 v3.0.0-20231221124451-07953f0b3b74 h1:sZh5vSpUDMPuGxA4DV+UB0jxkQSCRniJ5rlOnGVWb/0=
github.com/werf/3p-helm/v3 v3.0.0-20231221124451-07953f0b3b74/go.mod h1:GGYjDZLJTc6DtuNrdUP0GeaU51od/fe52kcKPYNMWgY=
github.com/werf/3p-helm/v3 v3.0.0-20231229193803-ecfe0905ab7c h1:tXzKo8cimKPpG/QQXdfbegM5o5f+5VHI/Is9707uMps=
github.com/werf/3p-helm/v3 v3.0.0-20231229193803-ecfe0905ab7c/go.mod h1:KxSvf0uPlwrZP+Xixi2S8QDpI8mtxZS5+8Vvt8WL9dg=
github.com/werf/copy-recurse v0.2.7 h1:3FTOarbJ9uhFLi75oeUCioK9zxZwuV7o28kuUBPDZPM=
github.com/werf/copy-recurse v0.2.7/go.mod h1:6Ypb+qN+hRBJgoCgEkX1vpbqcQ+8q69BQ3hi8s8Y6Qc=
github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f h1:81YscYTF9mmTf0ULOsCmm42YWQp+qWDzWi1HjWniZrg=
github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f/go.mod h1:OMONwLWU9zEENgaVjWEX+M+xik2QakejzKHG1+6mnUo=
github.com/werf/kubedog v0.11.0 h1:8mmlWARcO65PPja4Y85qSsg8Xiloh8QYcgbK6yPm5fs=
github.com/werf/kubedog v0.11.0/go.mod h1:cHmbX7BQmobC/jpndbqRL6mjHyosEzkiAilIv7t4emw=
github.com/werf/kubedog v0.12.1-0.20231229174621-812121cfb937 h1:2pK0npkz4sIxrBekWf4y6MXvq1dnP42XUhuU+fhNkaY=
github.com/werf/kubedog v0.12.1-0.20231229174621-812121cfb937/go.mod h1:cHmbX7BQmobC/jpndbqRL6mjHyosEzkiAilIv7t4emw=
github.com/werf/lockgate v0.1.1 h1:S400JFYjtWfE4i4LY9FA8zx0fMdfui9DPrBiTciCrx4=
github.com/werf/lockgate v0.1.1/go.mod h1:0yIFSLq9ausy6ejNxF5uUBf/Ib6daMAfXuCaTMZJzIE=
github.com/werf/logboek v0.6.0 h1:i/iRxUFcxj6g21t67cFnv0pBU7X90yGpHm1TlqkMkKU=
github.com/werf/logboek v0.6.0/go.mod h1:Gez5J4bxekyr6MxTmIJyId1F61rpO+0/V4vjCIEIZmk=
github.com/werf/logboek v0.6.1 h1:oEe6FkmlKg0z0n80oZjLplj6sXcBeLleCkjfOOZEL2g=
github.com/werf/logboek v0.6.1/go.mod h1:Gez5J4bxekyr6MxTmIJyId1F61rpO+0/V4vjCIEIZmk=
github.com/werf/nelm v0.0.0-20231229194917-1b1406e21187 h1:yA4kGy01AqE7srfWgg0N8HfC7D1wO3RANRkxWfpvm84=
github.com/werf/nelm v0.0.0-20231229194917-1b1406e21187/go.mod h1:nt8zScJ3PJMH4wpxWmi12Bixq6G9xikd5PPWPAQv0CQ=
github.com/werf/third-party-oras v0.9.1-0.20210927171747-6d045506f4c8 h1:MG0ez6kjfPXPHpDt4Ga76hfnEtT3Fal2fRnBLfJmhp4=
github.com/werf/third-party-oras v0.9.1-0.20210927171747-6d045506f4c8/go.mod h1:/AidOcr36nqm78ft5XE0l5Dgid3veF99BGQtwLr58pc=
github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
Expand Down

0 comments on commit be662c3

Please sign in to comment.