fix(v2): panic with --add-annotations

Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
werf · Apr 24, 2024 · b8b9e83 · b8b9e83
1 parent 4e0689b
commit b8b9e83
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/cmd/werf/bundle/apply/apply.go b/cmd/werf/bundle/apply/apply.go
@@ -289,7 +289,7 @@ func runApply(ctx context.Context) error {
 		serviceAnnotations["project.werf.io/env"] = *commonCmdData.Environment
 	}
 
-	var extraAnnotations map[string]string
+	extraAnnotations := map[string]string{}
 	for key, value := range bundle.ExtraAnnotationsAndLabelsPostRenderer.ExtraAnnotations {
 		if strings.HasPrefix(key, "project.werf.io/") ||
 			strings.Contains(key, "ci.werf.io/") ||

diff --git a/cmd/werf/bundle/render/render.go b/cmd/werf/bundle/render/render.go
@@ -249,7 +249,7 @@ func runRender(ctx context.Context) error {
 		serviceAnnotations["project.werf.io/env"] = *commonCmdData.Environment
 	}
 
-	var extraAnnotations map[string]string
+	extraAnnotations := map[string]string{}
 	for key, value := range bundle.ExtraAnnotationsAndLabelsPostRenderer.ExtraAnnotations {
 		if strings.HasPrefix(key, "project.werf.io/") ||
 			strings.Contains(key, "ci.werf.io/") ||

diff --git a/cmd/werf/converge/converge.go b/cmd/werf/converge/converge.go
@@ -415,7 +415,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
 		"project.werf.io/env":  *commonCmdData.Environment,
 	}
 
-	var userExtraAnnotations map[string]string
+	userExtraAnnotations := map[string]string{}
 	if annos, err := common.GetUserExtraAnnotations(&commonCmdData); err != nil {
 		return err
 	} else {

diff --git a/cmd/werf/plan/plan.go b/cmd/werf/plan/plan.go
@@ -398,7 +398,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
 		"project.werf.io/env":  *commonCmdData.Environment,
 	}
 
-	var userExtraAnnotations map[string]string
+	userExtraAnnotations := map[string]string{}
 	if annos, err := common.GetUserExtraAnnotations(&commonCmdData); err != nil {
 		return err
 	} else {

diff --git a/cmd/werf/render/render.go b/cmd/werf/render/render.go
@@ -270,7 +270,7 @@ func runRender(ctx context.Context, imagesToProcess build.ImagesToProcess) error
 		"project.werf.io/env":  *commonCmdData.Environment,
 	}
 
-	var userExtraAnnotations map[string]string
+	userExtraAnnotations := map[string]string{}
 	if annos, err := common.GetUserExtraAnnotations(&commonCmdData); err != nil {
 		return err
 	} else {