Merge pull request #92 from Norsk-Tipping/annotations_dep_sfs

Norsk-Tipping · Jun 27, 2024 · 4d7ed46 · 4d7ed46
2 parents 62c6cc6 + d2b8320
commit 4d7ed46
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/mg/cmd/create.go b/mg/cmd/create.go
@@ -38,6 +38,8 @@ func init() {
 	createCmd.PersistentFlags().StringVar(&Version, "version", "", "Override version in metaGraf specification.")
 	createCmd.PersistentFlags().BoolVar(&Dryrun, "dryrun", false, "do not create objects, only output")
 	createCmd.PersistentFlags().StringSliceVar(&params.Labels, "labels", []string{}, "Provide extra labels as key=value pairs, seperated by ,")
+	createCmd.PersistentFlags().StringSliceVar(&params.Annotations, "annotations", []string{}, "Provide extra annotations as key=value pairs, seperated by ,")
+
 	createCmd.AddCommand(createConfigMapCmd)
 	createCmd.AddCommand(createDotCmd)
 	createCmd.AddCommand(createSecretCmd)

diff --git a/pkg/modules/deployment.go b/pkg/modules/deployment.go
@@ -57,6 +57,10 @@ func GenDeployment(mg *metagraf.MetaGraf, namespace string) {
 	// Add labels from params
 	l = MergeLabels(l, LabelsFromParams(params.Labels))
 
+	// Resource annotations
+	a := Labels(objname, mg.Metadata.Annotations)
+	a = MergeLabels(a, AnnotationsFromParams(params.Annotations))
+
 	// Selector
 	sm := make(map[string]string)
 	sm["app"] = objname
@@ -162,10 +166,10 @@ func GenDeployment(mg *metagraf.MetaGraf, namespace string) {
 			APIVersion: "apps/v1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      objname,
-			Labels:    l,
-			Annotations: mg.Metadata.Annotations,
-			Namespace: namespace,
+			Name:        objname,
+			Labels:      l,
+			Annotations: a,
+			Namespace:   namespace,
 		},
 		Spec: appsv1.DeploymentSpec{
 			Replicas:             &params.Replicas,
@@ -177,9 +181,9 @@ func GenDeployment(mg *metagraf.MetaGraf, namespace string) {
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      objname,
-					Labels:    l,
-					Namespace: namespace,
+					Name:        objname,
+					Labels:      l,
+					Namespace:   namespace,
 					Annotations: mg.Metadata.Annotations,
 				},
 				Spec: corev1.PodSpec{

diff --git a/pkg/modules/statefulset.go b/pkg/modules/statefulset.go
@@ -57,6 +57,10 @@ func GenStatefulSet(mg *metagraf.MetaGraf, namespace string) {
 	// Add labels from params
 	l = MergeLabels(l, LabelsFromParams(params.Labels))
 
+	// Resource annotations
+	a := Labels(objname, mg.Metadata.Annotations)
+	a = MergeLabels(a, AnnotationsFromParams(params.Annotations))
+
 	// Selector
 	sm := make(map[string]string)
 	sm["app"] = objname
@@ -168,10 +172,10 @@ func GenStatefulSet(mg *metagraf.MetaGraf, namespace string) {
 			APIVersion: "apps/v1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      objname,
-			Labels:    l,
-			Namespace: namespace,
-			Annotations: mg.Metadata.Annotations,
+			Name:        objname,
+			Labels:      l,
+			Namespace:   namespace,
+			Annotations: a,
 		},
 		Spec: appsv1.StatefulSetSpec{
 			Replicas:             &params.Replicas,
@@ -183,9 +187,9 @@ func GenStatefulSet(mg *metagraf.MetaGraf, namespace string) {
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      objname,
-					Labels:    l,
-					Namespace: namespace,
+					Name:        objname,
+					Labels:      l,
+					Namespace:   namespace,
 					Annotations: mg.Metadata.Annotations,
 				},
 				Spec: corev1.PodSpec{