Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: unreliable deletion of resources removed from release due to race
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
  • Loading branch information
ilya-lesikov committed Sep 15, 2023
1 parent f3a2b0b commit 327f1fd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
8 changes: 0 additions & 8 deletions cmd/werf/plan/plan.go
Expand Up @@ -496,13 +496,6 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
}

if helm.IsExperimentalEngine() {
// FIXME(ilya-lesikov):
// 1. if last succeeded release was cleaned up because of release limit, werf will see
// current release as first install. We might want to not delete last succeeded or last
// uninstalled release ever.
// 2. rollback should rollback to the last succesfull release, not last release
// 3. don't forget errs.FormatTemplatingError if any errors occurs

networkParallelism := common.GetNetworkParallelism(&commonCmdData)
serviceAnnotations := map[string]string{
"werf.io/version": werf.Version,
Expand All @@ -527,7 +520,6 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
Mapper: clientFactory.Mapper(),
})

// FIXME(ilya-lesikov): there is more chartpath options, are they needed?
chartPathOptions := action.ChartPathOptions{}
chartPathOptions.SetRegistryClient(actionConfig.RegistryClient)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -353,6 +353,6 @@ 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-20230915174403-a7fe7e9539ee
helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20230915193754-e8321eac1aed
k8s.io/helm => github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f
)
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -1750,8 +1750,8 @@ 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-20230915174403-a7fe7e9539ee h1:/k2ZUt65hx8BohvdgbaUwlx8uC71i6kIjafvGGqfB58=
github.com/werf/3p-helm/v3 v3.0.0-20230915174403-a7fe7e9539ee/go.mod h1:cRXUvkNQeC5QGRC2Q6uuUwUoI36fnE05VuG0x5s9+Lc=
github.com/werf/3p-helm/v3 v3.0.0-20230915193754-e8321eac1aed h1:Xu+h7tPCK64uhWYkX7L4zhattu1uji8r56/UN2kfgOo=
github.com/werf/3p-helm/v3 v3.0.0-20230915193754-e8321eac1aed/go.mod h1:cRXUvkNQeC5QGRC2Q6uuUwUoI36fnE05VuG0x5s9+Lc=
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=
Expand Down

0 comments on commit 327f1fd

Please sign in to comment.