Skip to content

Commit 8827f58

Browse files
alexey-igrychevalexey-igrychev
committed
fix(deploy): remove add-(label|annotation)-separator to keep reproducibility
Signed-off-by: Aleksei Igrychev <aleksei.igrychev@palark.com>
1 parent 452e996 commit 8827f58

File tree

22 files changed

+34
-140
lines changed

22 files changed

+34
-140
lines changed

‎cmd/werf/bundle/apply/apply.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ func NewCmd(ctx context.Context) *cobra.Command {
8585
common.SetupLogProjectDir(&commonCmdData, cmd)
8686

8787
common.SetupAddAnnotations(&commonCmdData, cmd)
88-
common.SetupAddAnnotationSeparator(&commonCmdData, cmd)
8988
common.SetupAddLabels(&commonCmdData, cmd)
90-
common.SetupAddLabelSeparator(&commonCmdData, cmd)
9189

9290
common.SetupSetDockerConfigJsonValue(&commonCmdData, cmd)
9391
common.SetupSet(&commonCmdData, cmd)

‎cmd/werf/bundle/publish/publish.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@ func NewCmd(ctx context.Context) *cobra.Command {
113113
common.SetupKubeContext(&commonCmdData, cmd)
114114

115115
common.SetupAddAnnotations(&commonCmdData, cmd)
116-
common.SetupAddAnnotationSeparator(&commonCmdData, cmd)
117116
common.SetupAddLabels(&commonCmdData, cmd)
118-
common.SetupAddLabelSeparator(&commonCmdData, cmd)
119117

120118
common.SetupSet(&commonCmdData, cmd)
121119
common.SetupSetString(&commonCmdData, cmd)

‎cmd/werf/bundle/render/render.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ func NewCmd(ctx context.Context) *cobra.Command {
8888
common.SetupLogProjectDir(&commonCmdData, cmd)
8989

9090
common.SetupAddAnnotations(&commonCmdData, cmd)
91-
common.SetupAddAnnotationSeparator(&commonCmdData, cmd)
9291
common.SetupAddLabels(&commonCmdData, cmd)
93-
common.SetupAddLabelSeparator(&commonCmdData, cmd)
9492

9593
common.SetupSetDockerConfigJsonValue(&commonCmdData, cmd)
9694
common.SetupSet(&commonCmdData, cmd)

‎cmd/werf/common/cmd_data.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ type CmdData struct {
2727
Release *string
2828
Namespace *string
2929
AddAnnotations *[]string
30-
AddAnnotationSeparator *string
3130
AddLabels *[]string
32-
AddLabelSeparator *string
3331
KubeContext *string
3432
KubeConfig *string
3533
KubeConfigBase64 *string

‎cmd/werf/common/common.go‎

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -414,38 +414,16 @@ func SetupNamespace(cmdData *CmdData, cmd *cobra.Command, projectConfigParsed bo
414414

415415
func SetupAddAnnotations(cmdData *CmdData, cmd *cobra.Command) {
416416
cmdData.AddAnnotations = new([]string)
417-
cmd.Flags().StringArrayVarP(cmdData.AddAnnotations, "add-annotation", "", []string{}, fmt.Sprintf(`Add annotation to deploying resources (can specify multiple).
418-
Format: annoName=annoValue[<separator>annoName=annoValue ...]. The default separator is %q, but it can be customized using the --add-annotation-separator flag.
419-
Also, can be specified with $WERF_ADD_ANNOTATION_* (e.g. $WERF_ADD_ANNOTATION_1=annoName1=annoValue1, $WERF_ADD_ANNOTATION_2=annoName2=annoValue2)`, DefaultPairSeparator))
420-
}
421-
422-
func SetupAddAnnotationSeparator(cmdData *CmdData, cmd *cobra.Command) {
423-
cmdData.AddAnnotationSeparator = new(string)
424-
425-
defaultValue := DefaultPairSeparator
426-
if os.Getenv("WERF_ADD_ANNOTATION_SEPARATOR") != "" {
427-
defaultValue = os.Getenv("WERF_ADD_ANNOTATION_SEPARATOR")
428-
}
429-
430-
cmd.Flags().StringVarP(cmdData.AddAnnotationSeparator, "add-annotation-separator", "", defaultValue, fmt.Sprintf(`Separator for --add-annotation values (default $WERF_ADD_ANNOTATION_SEPARATOR or %q)`, DefaultPairSeparator))
417+
cmd.Flags().StringArrayVarP(cmdData.AddAnnotations, "add-annotation", "", []string{}, `Add annotation to deploying resources (can specify multiple).
418+
Format: annoName=annoValue.
419+
Also, can be specified with $WERF_ADD_ANNOTATION_* (e.g. $WERF_ADD_ANNOTATION_1=annoName1=annoValue1, $WERF_ADD_ANNOTATION_2=annoName2=annoValue2)`)
431420
}
432421

433422
func SetupAddLabels(cmdData *CmdData, cmd *cobra.Command) {
434423
cmdData.AddLabels = new([]string)
435-
cmd.Flags().StringArrayVarP(cmdData.AddLabels, "add-label", "", []string{}, fmt.Sprintf(`Add label to deploying resources (can specify multiple).
436-
Format: labelName=labelValue[<separator>labelName=labelValue ...]. The default separator is %q, but it can be customized using the --add-label-separator flag.
437-
Also, can be specified with $WERF_ADD_LABEL_* (e.g. $WERF_ADD_LABEL_1=labelName1=labelValue1, $WERF_ADD_LABEL_2=labelName2=labelValue2)`, DefaultPairSeparator))
438-
}
439-
440-
func SetupAddLabelSeparator(cmdData *CmdData, cmd *cobra.Command) {
441-
cmdData.AddLabelSeparator = new(string)
442-
443-
defaultValue := DefaultPairSeparator
444-
if os.Getenv("WERF_ADD_LABEL_SEPARATOR") != "" {
445-
defaultValue = os.Getenv("WERF_ADD_LABEL_SEPARATOR")
446-
}
447-
448-
cmd.Flags().StringVarP(cmdData.AddLabelSeparator, "add-label-separator", "", defaultValue, fmt.Sprintf(`Separator for --add-label values (default $WERF_ADD_LABEL_SEPARATOR or %q)`, DefaultPairSeparator))
424+
cmd.Flags().StringArrayVarP(cmdData.AddLabels, "add-label", "", []string{}, `Add label to deploying resources (can specify multiple).
425+
Format: labelName=labelValue.
426+
Also, can be specified with $WERF_ADD_LABEL_* (e.g. $WERF_ADD_LABEL_1=labelName1=labelValue1, $WERF_ADD_LABEL_2=labelName2=labelValue2)`)
449427
}
450428

451429
func SetupKubeContext(cmdData *CmdData, cmd *cobra.Command) {
@@ -1342,11 +1320,11 @@ func GetSSHKey(cmdData *CmdData) []string {
13421320
}
13431321

13441322
func GetAddLabels(cmdData *CmdData) []string {
1345-
return append(util.PredefinedValuesByEnvNamePrefix("WERF_ADD_LABEL_", "WERF_ADD_LABEL_SEPARATOR"), *cmdData.AddLabels...)
1323+
return append(util.PredefinedValuesByEnvNamePrefix("WERF_ADD_LABEL_"), *cmdData.AddLabels...)
13461324
}
13471325

13481326
func GetAddAnnotations(cmdData *CmdData) []string {
1349-
return append(util.PredefinedValuesByEnvNamePrefix("WERF_ADD_ANNOTATION_", "WERF_ADD_ANNOTATION_SEPARATOR"), *cmdData.AddAnnotations...)
1327+
return append(util.PredefinedValuesByEnvNamePrefix("WERF_ADD_ANNOTATION_"), *cmdData.AddAnnotations...)
13501328
}
13511329

13521330
func GetCacheStagesStorage(cmdData *CmdData) []string {

‎cmd/werf/common/deploy_params.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ const (
1313
)
1414

1515
func GetUserExtraAnnotations(cmdData *CmdData) (map[string]string, error) {
16-
result, err := InputArrayToKeyValueMap(GetAddAnnotations(cmdData), *cmdData.AddAnnotationSeparator, DefaultKeyValueSeparator)
16+
result, err := keyValueArrayToMap(GetAddAnnotations(cmdData), DefaultKeyValueSeparator)
1717
if err != nil {
18-
return nil, fmt.Errorf("unsupported --add-annotation value: %w", err)
18+
return nil, fmt.Errorf("invalid --add-annotation value: %w", err)
1919
}
2020

2121
return result, nil
2222
}
2323

2424
func GetUserExtraLabels(cmdData *CmdData) (map[string]string, error) {
25-
result, err := InputArrayToKeyValueMap(GetAddLabels(cmdData), *cmdData.AddLabelSeparator, DefaultKeyValueSeparator)
25+
result, err := keyValueArrayToMap(GetAddLabels(cmdData), DefaultKeyValueSeparator)
2626
if err != nil {
27-
return nil, fmt.Errorf("unsupported --add-label value: %w", err)
27+
return nil, fmt.Errorf("invalid --add-label value: %w", err)
2828
}
2929

3030
return result, nil

‎cmd/werf/converge/converge.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ werf converge --repo registry.mydomain.com/web --env production`,
139139
common.SetupNamespace(&commonCmdData, cmd, true)
140140

141141
common.SetupAddAnnotations(&commonCmdData, cmd)
142-
common.SetupAddAnnotationSeparator(&commonCmdData, cmd)
143142
common.SetupAddLabels(&commonCmdData, cmd)
144-
common.SetupAddLabelSeparator(&commonCmdData, cmd)
145143

146144
common.SetupSetDockerConfigJsonValue(&commonCmdData, cmd)
147145
common.SetupSet(&commonCmdData, cmd)

‎cmd/werf/helm/werf_chart.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ import (
1212

1313
func SetupRenderRelatedWerfChartParams(cmd *cobra.Command, commonCmdData *common.CmdData) {
1414
common.SetupAddAnnotations(commonCmdData, cmd)
15-
common.SetupAddAnnotationSeparator(commonCmdData, cmd)
1615
common.SetupAddLabels(commonCmdData, cmd)
17-
common.SetupAddLabelSeparator(commonCmdData, cmd)
1816

1917
common.SetupSecretValues(commonCmdData, cmd, true)
2018
common.SetupIgnoreSecretKey(commonCmdData, cmd)

‎cmd/werf/kube_run/kube_run.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,7 @@ func NewCmd(ctx context.Context) *cobra.Command {
155155
common.SetupNamespace(&commonCmdData, cmd, true)
156156

157157
common.SetupAddAnnotations(&commonCmdData, cmd)
158-
common.SetupAddAnnotationSeparator(&commonCmdData, cmd)
159158
common.SetupAddLabels(&commonCmdData, cmd)
160-
common.SetupAddLabelSeparator(&commonCmdData, cmd)
161159

162160
common.SetupGiterminismOptions(&commonCmdData, cmd)
163161

‎cmd/werf/plan/plan.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ werf plan --repo registry.mydomain.com/web --env production`,
139139
common.SetupNamespace(&commonCmdData, cmd, true)
140140

141141
common.SetupAddAnnotations(&commonCmdData, cmd)
142-
common.SetupAddAnnotationSeparator(&commonCmdData, cmd)
143142
common.SetupAddLabels(&commonCmdData, cmd)
144-
common.SetupAddLabelSeparator(&commonCmdData, cmd)
145143

146144
common.SetupSetDockerConfigJsonValue(&commonCmdData, cmd)
147145
common.SetupSet(&commonCmdData, cmd)

0 commit comments

Comments
 (0)