Skip to content

Commit be662c3

Browse files
ilya-lesikovilya-lesikov
committed
fix: Nelm moved to separate repo
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
1 parent d2cd779 commit be662c3

File tree

4 files changed

+37
-32
lines changed

4 files changed

+37
-32
lines changed

‎cmd/werf/converge/converge.go‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,24 @@ import (
1919
"helm.sh/helm/v3/pkg/cli/values"
2020
"helm.sh/helm/v3/pkg/postrender"
2121
"helm.sh/helm/v3/pkg/registry"
22-
"helm.sh/helm/v3/pkg/werf/chrttree"
23-
helmcommon "helm.sh/helm/v3/pkg/werf/common"
24-
"helm.sh/helm/v3/pkg/werf/kubeclnt"
25-
"helm.sh/helm/v3/pkg/werf/log"
26-
"helm.sh/helm/v3/pkg/werf/opertn"
27-
"helm.sh/helm/v3/pkg/werf/plnbuilder"
28-
"helm.sh/helm/v3/pkg/werf/plnexectr"
29-
"helm.sh/helm/v3/pkg/werf/reprt"
30-
"helm.sh/helm/v3/pkg/werf/resrc"
31-
"helm.sh/helm/v3/pkg/werf/resrcpatcher"
32-
"helm.sh/helm/v3/pkg/werf/resrcprocssr"
33-
"helm.sh/helm/v3/pkg/werf/resrctracker"
34-
"helm.sh/helm/v3/pkg/werf/rls"
35-
"helm.sh/helm/v3/pkg/werf/rlshistor"
36-
"helm.sh/helm/v3/pkg/werf/utls"
3722
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3823

24+
"github.com/werf/nelm/pkg/chrttree"
25+
helmcommon "github.com/werf/nelm/pkg/common"
26+
"github.com/werf/nelm/pkg/kubeclnt"
27+
"github.com/werf/nelm/pkg/log"
28+
"github.com/werf/nelm/pkg/opertn"
29+
"github.com/werf/nelm/pkg/plnbuilder"
30+
"github.com/werf/nelm/pkg/plnexectr"
31+
"github.com/werf/nelm/pkg/reprt"
32+
"github.com/werf/nelm/pkg/resrc"
33+
"github.com/werf/nelm/pkg/resrcpatcher"
34+
"github.com/werf/nelm/pkg/resrcprocssr"
35+
"github.com/werf/nelm/pkg/resrctracker"
36+
"github.com/werf/nelm/pkg/rls"
37+
"github.com/werf/nelm/pkg/rlshistor"
38+
"github.com/werf/nelm/pkg/utls"
39+
3940
"github.com/werf/kubedog/pkg/kube"
4041
"github.com/werf/logboek"
4142
"github.com/werf/werf/cmd/werf/common"

‎cmd/werf/plan/plan.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,19 @@ import (
1616
"helm.sh/helm/v3/pkg/cli/values"
1717
"helm.sh/helm/v3/pkg/postrender"
1818
"helm.sh/helm/v3/pkg/registry"
19-
"helm.sh/helm/v3/pkg/werf/chrttree"
20-
helmcommon "helm.sh/helm/v3/pkg/werf/common"
21-
"helm.sh/helm/v3/pkg/werf/kubeclnt"
22-
"helm.sh/helm/v3/pkg/werf/log"
23-
"helm.sh/helm/v3/pkg/werf/resrc"
24-
"helm.sh/helm/v3/pkg/werf/resrcchangcalc"
25-
"helm.sh/helm/v3/pkg/werf/resrcchanglog"
26-
"helm.sh/helm/v3/pkg/werf/resrcpatcher"
27-
"helm.sh/helm/v3/pkg/werf/resrcprocssr"
28-
"helm.sh/helm/v3/pkg/werf/rlshistor"
2919
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3020

21+
"github.com/werf/nelm/pkg/chrttree"
22+
helmcommon "github.com/werf/nelm/pkg/common"
23+
"github.com/werf/nelm/pkg/kubeclnt"
24+
"github.com/werf/nelm/pkg/log"
25+
"github.com/werf/nelm/pkg/resrc"
26+
"github.com/werf/nelm/pkg/resrcchangcalc"
27+
"github.com/werf/nelm/pkg/resrcchanglog"
28+
"github.com/werf/nelm/pkg/resrcpatcher"
29+
"github.com/werf/nelm/pkg/resrcprocssr"
30+
"github.com/werf/nelm/pkg/rlshistor"
31+
3132
"github.com/werf/kubedog/pkg/kube"
3233
"github.com/werf/logboek"
3334
"github.com/werf/werf/cmd/werf/common"

‎go.mod‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ require (
6363
github.com/werf/kubedog v0.11.0
6464
github.com/werf/lockgate v0.1.1
6565
github.com/werf/logboek v0.6.1
66+
github.com/werf/nelm v0.0.0-00010101000000-000000000000
6667
go.opentelemetry.io/otel v1.14.0
6768
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0
6869
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0
@@ -358,6 +359,8 @@ replace (
358359
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
359360
github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 // upstream not maintained
360361
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
361-
helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20231221124451-07953f0b3b74
362+
github.com/werf/kubedog => github.com/werf/kubedog v0.12.1-0.20231229174621-812121cfb937
363+
github.com/werf/nelm => github.com/werf/nelm v0.0.0-20231229194917-1b1406e21187
364+
helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20231229193803-ecfe0905ab7c
362365
k8s.io/helm => github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f
363366
)

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1761,20 +1761,20 @@ github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln
17611761
github.com/weppos/publicsuffix-go v0.20.1-0.20221209102050-40d9c30084b3 h1:ypyhoprZWFzU0ydOBv3I5SS7/jLFJ+ujPAU+BD/EVFM=
17621762
github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3 h1:pdKLiuiUoOFswc0HV6GX1+JHgP14HqE035xl2DQJi8A=
17631763
github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3/go.mod h1:lTSQBLomjl67m4HQMbg3BHKWes3pOmjNBg8yygXYugk=
1764-
github.com/werf/3p-helm/v3 v3.0.0-20231221124451-07953f0b3b74 h1:sZh5vSpUDMPuGxA4DV+UB0jxkQSCRniJ5rlOnGVWb/0=
1765-
github.com/werf/3p-helm/v3 v3.0.0-20231221124451-07953f0b3b74/go.mod h1:GGYjDZLJTc6DtuNrdUP0GeaU51od/fe52kcKPYNMWgY=
1764+
github.com/werf/3p-helm/v3 v3.0.0-20231229193803-ecfe0905ab7c h1:tXzKo8cimKPpG/QQXdfbegM5o5f+5VHI/Is9707uMps=
1765+
github.com/werf/3p-helm/v3 v3.0.0-20231229193803-ecfe0905ab7c/go.mod h1:KxSvf0uPlwrZP+Xixi2S8QDpI8mtxZS5+8Vvt8WL9dg=
17661766
github.com/werf/copy-recurse v0.2.7 h1:3FTOarbJ9uhFLi75oeUCioK9zxZwuV7o28kuUBPDZPM=
17671767
github.com/werf/copy-recurse v0.2.7/go.mod h1:6Ypb+qN+hRBJgoCgEkX1vpbqcQ+8q69BQ3hi8s8Y6Qc=
17681768
github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f h1:81YscYTF9mmTf0ULOsCmm42YWQp+qWDzWi1HjWniZrg=
17691769
github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f/go.mod h1:OMONwLWU9zEENgaVjWEX+M+xik2QakejzKHG1+6mnUo=
1770-
github.com/werf/kubedog v0.11.0 h1:8mmlWARcO65PPja4Y85qSsg8Xiloh8QYcgbK6yPm5fs=
1771-
github.com/werf/kubedog v0.11.0/go.mod h1:cHmbX7BQmobC/jpndbqRL6mjHyosEzkiAilIv7t4emw=
1770+
github.com/werf/kubedog v0.12.1-0.20231229174621-812121cfb937 h1:2pK0npkz4sIxrBekWf4y6MXvq1dnP42XUhuU+fhNkaY=
1771+
github.com/werf/kubedog v0.12.1-0.20231229174621-812121cfb937/go.mod h1:cHmbX7BQmobC/jpndbqRL6mjHyosEzkiAilIv7t4emw=
17721772
github.com/werf/lockgate v0.1.1 h1:S400JFYjtWfE4i4LY9FA8zx0fMdfui9DPrBiTciCrx4=
17731773
github.com/werf/lockgate v0.1.1/go.mod h1:0yIFSLq9ausy6ejNxF5uUBf/Ib6daMAfXuCaTMZJzIE=
1774-
github.com/werf/logboek v0.6.0 h1:i/iRxUFcxj6g21t67cFnv0pBU7X90yGpHm1TlqkMkKU=
1775-
github.com/werf/logboek v0.6.0/go.mod h1:Gez5J4bxekyr6MxTmIJyId1F61rpO+0/V4vjCIEIZmk=
17761774
github.com/werf/logboek v0.6.1 h1:oEe6FkmlKg0z0n80oZjLplj6sXcBeLleCkjfOOZEL2g=
17771775
github.com/werf/logboek v0.6.1/go.mod h1:Gez5J4bxekyr6MxTmIJyId1F61rpO+0/V4vjCIEIZmk=
1776+
github.com/werf/nelm v0.0.0-20231229194917-1b1406e21187 h1:yA4kGy01AqE7srfWgg0N8HfC7D1wO3RANRkxWfpvm84=
1777+
github.com/werf/nelm v0.0.0-20231229194917-1b1406e21187/go.mod h1:nt8zScJ3PJMH4wpxWmi12Bixq6G9xikd5PPWPAQv0CQ=
17781778
github.com/werf/third-party-oras v0.9.1-0.20210927171747-6d045506f4c8 h1:MG0ez6kjfPXPHpDt4Ga76hfnEtT3Fal2fRnBLfJmhp4=
17791779
github.com/werf/third-party-oras v0.9.1-0.20210927171747-6d045506f4c8/go.mod h1:/AidOcr36nqm78ft5XE0l5Dgid3veF99BGQtwLr58pc=
17801780
github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=

0 commit comments

Comments
 (0)