Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix(exp-engine): cosmetics
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
  • Loading branch information
ilya-lesikov committed Sep 21, 2023
1 parent 0287fe5 commit 37888c6
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
16 changes: 8 additions & 8 deletions cmd/werf/converge/converge.go
Expand Up @@ -578,7 +578,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
tracker := resrctracker.NewResourceTracker(clientFactory.Static(), clientFactory.Dynamic(), clientFactory.Discovery(), clientFactory.Mapper())

return command_helpers.LockReleaseWrapper(ctx, releaseName, lockManager, func() error {
log.Default.Info(ctx, "Constructing release history ...")
log.Default.Info(ctx, "Constructing release history")
history, err := rlshistor.NewHistory(releaseName, releaseNamespace.Name(), actionConfig.Releases, rlshistor.HistoryOptions{
Mapper: clientFactory.Mapper(),
DiscoveryClient: clientFactory.Discovery(),
Expand Down Expand Up @@ -615,7 +615,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
deployType = helmcommon.DeployTypeInitial
}

log.Default.Info(ctx, "Constructing chart tree ...")
log.Default.Info(ctx, "Constructing chart tree")
chartTree, err := chrttree.NewChartTree(
ctx,
chartDir,
Expand All @@ -642,7 +642,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
prevRelGeneralResources = prevRelease.GeneralResources()
}

log.Default.Info(ctx, "Processing resources ...")
log.Default.Info(ctx, "Processing resources")
resProcessor := resrcprocssr.NewDeployableResourcesProcessor(
deployType,
releaseName,
Expand Down Expand Up @@ -678,7 +678,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
return fmt.Errorf("error processing deployable resources: %w", err)
}

log.Default.Info(ctx, "Constructing new release ...")
log.Default.Info(ctx, "Constructing new release")
newRel, err := rls.NewRelease(releaseName, releaseNamespace.Name(), newRevision, chartTree.ReleaseValues(), chartTree.LegacyChart(), resProcessor.ReleasableHookResources(), resProcessor.ReleasableGeneralResources(), chartTree.Notes(), rls.ReleaseOptions{
FirstDeployed: firstDeployed,
Mapper: clientFactory.Mapper(),
Expand All @@ -687,7 +687,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
return fmt.Errorf("error constructing new release: %w", err)
}

log.Default.Info(ctx, "Constructing new deploy plan ...")
log.Default.Info(ctx, "Constructing new deploy plan")
deployPlanBuilder := plnbuilder.NewDeployPlanBuilder(
deployType,
resProcessor.DeployableReleaseNamespaceInfo(),
Expand Down Expand Up @@ -729,7 +729,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
return nil
}

log.Default.Info(ctx, "Executing deploy plan ...")
log.Default.Info(ctx, "Executing deploy plan")
planExecutor := plnexectr.NewPlanExecutor(plan, plnexectr.PlanExecutorOptions{
NetworkParallelism: networkParallelism,
})
Expand Down Expand Up @@ -775,7 +775,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
return nil
}

log.Default.Info(ctx, "Building failure deploy plan ...")
log.Default.Info(ctx, "Building failure deploy plan")
failurePlanBuilder := plnbuilder.NewDeployFailurePlanBuilder(
plan,
resProcessor.DeployableHookResourcesInfos(),
Expand All @@ -799,7 +799,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
return nil
}

log.Default.Info(ctx, "Executing failure deploy plan ...")
log.Default.Info(ctx, "Executing failure deploy plan")
failurePlanExecutor := plnexectr.NewPlanExecutor(failurePlan, plnexectr.PlanExecutorOptions{
NetworkParallelism: networkParallelism,
})
Expand Down
8 changes: 4 additions & 4 deletions cmd/werf/plan/plan.go
Expand Up @@ -524,7 +524,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
chartPathOptions.SetRegistryClient(actionConfig.RegistryClient)

return command_helpers.LockReleaseWrapper(ctx, releaseName, lockManager, func() error {
log.Default.Info(ctx, "Constructing release history ...")
log.Default.Info(ctx, "Constructing release history")
history, err := rlshistor.NewHistory(releaseName, releaseNamespace.Name(), actionConfig.Releases, rlshistor.HistoryOptions{
Mapper: clientFactory.Mapper(),
DiscoveryClient: clientFactory.Discovery(),
Expand Down Expand Up @@ -559,7 +559,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
deployType = helmcommon.DeployTypeInitial
}

log.Default.Info(ctx, "Constructing chart tree ...")
log.Default.Info(ctx, "Constructing chart tree")
chartTree, err := chrttree.NewChartTree(
ctx,
chartDir,
Expand Down Expand Up @@ -589,7 +589,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
}

// FIXME(ilya-lesikov): no releasable resources needed
log.Default.Info(ctx, "Processing resources ...")
log.Default.Info(ctx, "Processing resources")
resProcessor := resrcprocssr.NewDeployableResourcesProcessor(
deployType,
releaseName,
Expand Down Expand Up @@ -625,7 +625,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
return fmt.Errorf("error processing deployable resources: %w", err)
}

log.Default.Info(ctx, "Calculating planned changes ...")
log.Default.Info(ctx, "Calculating planned changes")
createdChanges, recreatedChanges, updatedChanges, appliedChanges, deletedChanges := resrcchangcalc.CalculatePlannedChanges(
resProcessor.DeployableReleaseNamespaceInfo(),
resProcessor.DeployableStandaloneCRDsInfos(),
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -357,6 +357,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-20230921132559-47efa1ff8802
helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20230921135242-8174017ac1c0
k8s.io/helm => github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f
)
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -1759,8 +1759,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-20230921132559-47efa1ff8802 h1:eBhC+2RQOWCNiWSUCE4PdyBrtYBVOapPHHvz2z8bFT8=
github.com/werf/3p-helm/v3 v3.0.0-20230921132559-47efa1ff8802/go.mod h1:ZXpK6NrMk6Fvb4Lxl1WzaZOmOG5nfjYEQpMir0rD3HA=
github.com/werf/3p-helm/v3 v3.0.0-20230921135242-8174017ac1c0 h1:CgAIghxJDbzCGGjCCMOkmZLeaOqsUfvU7v80UitWVWs=
github.com/werf/3p-helm/v3 v3.0.0-20230921135242-8174017ac1c0/go.mod h1:ZXpK6NrMk6Fvb4Lxl1WzaZOmOG5nfjYEQpMir0rD3HA=
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 37888c6

Please sign in to comment.