gateway deployment template inherits annotation of gateway spec (#129)

* gateway deployment template inherits annotation of gateway spec * gateway and sensor deployment template inherits annotation of gateway/sensor spec
argoproj · Nov 26, 2018 · 3d4b06b · 3d4b06b
1 parent bcbbbf4
commit 3d4b06b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/controllers/gateway/operator.go b/controllers/gateway/operator.go
@@ -176,7 +176,8 @@ func (goc *gwOperationCtx) operate() error {
 				},
 				Template: corev1.PodTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
-						Labels: goc.gw.ObjectMeta.Labels,
+						Labels:      goc.gw.ObjectMeta.Labels,
+						Annotations: goc.gw.Annotations,
 					},
 					Spec: *goc.gw.Spec.DeploySpec,
 				},
@@ -421,11 +422,11 @@ func (goc *gwOperationCtx) getContainersForGatewayPod() *[]corev1.Container {
 				Value: common.GatewayProcessorHTTPServerEventEndpoint,
 			},
 			{
-				Name: common.EnvVarGatewayProcessorHTTPServerConfigActivated,
+				Name:  common.EnvVarGatewayProcessorHTTPServerConfigActivated,
 				Value: common.GatewayProcessorHTTPServerConfigActivatedEndpoint,
 			},
 			{
-				Name: common.EnvVarGatewayProcessorHTTPServerConfigError,
+				Name:  common.EnvVarGatewayProcessorHTTPServerConfigError,
 				Value: common.GatewayProcessorHTTPServerConfigErrorEndpoint,
 			},
 		}
@@ -485,4 +486,4 @@ func (goc *gwOperationCtx) getContainersForGatewayPod() *[]corev1.Container {
 	containers = append(containers, gatewayTransformerContainer)
 
 	return &containers
-}
+}
diff --git a/controllers/sensor/operator.go b/controllers/sensor/operator.go
@@ -142,8 +142,10 @@ func (soc *sOperationCtx) operate() error {
 						},
 						Template: corev1.PodTemplateSpec{
 							ObjectMeta: metav1.ObjectMeta{
-								Name:      common.DefaultSensorDeploymentName(soc.s.Name),
-								Namespace: soc.s.Name,
+								Name:        common.DefaultSensorDeploymentName(soc.s.Name),
+								Namespace:   soc.s.Name,
+								Annotations: soc.s.Annotations,
+
 								Labels: map[string]string{
 									common.LabelSensorName: soc.s.Name,
 								},
@@ -187,6 +189,7 @@ func (soc *sOperationCtx) operate() error {
 						Template: corev1.PodTemplateSpec{
 							ObjectMeta: metav1.ObjectMeta{
 								GenerateName: common.DefaultSensorJobName(soc.s.Name),
+								Annotations:  soc.s.Annotations,
 								Labels: map[string]string{
 									common.LabelSensorName: soc.s.Name,
 								},