allow add labels/annotations to generated resources

internal/k8sdeps/configmapandsecret/configmapfactory.go

@@ -55,7 +55,7 @@ func (f *ConfigMapFactory) makeFreshConfigMap(
 
 // MakeConfigMap returns a new ConfigMap, or nil and an error.
 func (f *ConfigMapFactory) MakeConfigMap(
-	args *types.ConfigMapArgs) (*corev1.ConfigMap, error) {
+	args *types.ConfigMapArgs, options *types.GeneratorOptions) (*corev1.ConfigMap, error) {
 	var all []kvPair
 	var err error
 	cm := f.makeFreshConfigMap(args)
@@ -88,6 +88,10 @@ func (f *ConfigMapFactory) MakeConfigMap(
 			return nil, err
 		}
 	}
+	if options != nil {
+		cm.SetLabels(options.Labels)
+		cm.SetAnnotations(options.Annotations)
+	}
 	return cm, nil
 }
 

internal/k8sdeps/configmapandsecret/configmapfactory_test.go

@@ -61,7 +61,7 @@ BAR=baz
 }
 
 func makeLiteralConfigMap(name string) *corev1.ConfigMap {
-	return &corev1.ConfigMap{
+	cm := &corev1.ConfigMap{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "v1",
 			Kind:       "ConfigMap",
@@ -76,12 +76,15 @@ func makeLiteralConfigMap(name string) *corev1.ConfigMap {
 			"d": "true",
 		},
 	}
+	cm.SetLabels(map[string]string{"foo": "bar"})
+	return cm
 }
 
 func TestConstructConfigMap(t *testing.T) {
 	type testCase struct {
 		description string
 		input       types.ConfigMapArgs
+		options     *types.GeneratorOptions
 		expected    *corev1.ConfigMap
 	}
 
@@ -94,6 +97,7 @@ func TestConstructConfigMap(t *testing.T) {
 					EnvSource: "configmap/app.env",
 				},
 			},
+			options:  nil,
 			expected: makeEnvConfigMap("envConfigMap"),
 		},
 		{
@@ -104,6 +108,7 @@ func TestConstructConfigMap(t *testing.T) {
 					FileSources: []string{"configmap/app-init.ini"},
 				},
 			},
+			options:  nil,
 			expected: makeFileConfigMap("fileConfigMap"),
 		},
 		{
@@ -114,6 +119,11 @@ func TestConstructConfigMap(t *testing.T) {
 					LiteralSources: []string{"a=x", "b=y", "c=\"Hello World\"", "d='true'"},
 				},
 			},
+			options: &types.GeneratorOptions{
+				Labels: map[string]string{
+					"foo": "bar",
+				},
+			},
 			expected: makeLiteralConfigMap("literalConfigMap"),
 		},
 	}
@@ -123,7 +133,7 @@ func TestConstructConfigMap(t *testing.T) {
 	fSys.WriteFile("configmap/app-init.ini", []byte("FOO=bar\nBAR=baz\n"))
 	f := NewConfigMapFactory(fSys, loader.NewFileLoader(fSys))
 	for _, tc := range testCases {
-		cm, err := f.MakeConfigMap(&tc.input)
+		cm, err := f.MakeConfigMap(&tc.input, tc.options)
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}

internal/k8sdeps/configmapandsecret/secretfactory.go

@@ -60,7 +60,7 @@ func (f *SecretFactory) makeFreshSecret(args *types.SecretArgs) *corev1.Secret {
 }
 
 // MakeSecret returns a new secret.
-func (f *SecretFactory) MakeSecret(args *types.SecretArgs) (*corev1.Secret, error) {
+func (f *SecretFactory) MakeSecret(args *types.SecretArgs, options *types.GeneratorOptions) (*corev1.Secret, error) {
 	var all []kvPair
 	var err error
 	s := f.makeFreshSecret(args)
@@ -91,7 +91,10 @@ func (f *SecretFactory) MakeSecret(args *types.SecretArgs) (*corev1.Secret, erro
 			return nil, err
 		}
 	}
-
+	if options != nil {
+		s.SetLabels(options.Labels)
+		s.SetAnnotations(options.Annotations)
+	}
 	return s, nil
 }