[installer]: add custom annotations to common components

Author: Simon Emms

install/installer/pkg/common/display.go

@@ -99,9 +99,10 @@ func GenerateInstallationConfigMap(ctx *RenderContext, objects []RuntimeObject)
 	cfgMap := corev1.ConfigMap{
 		TypeMeta: TypeMetaConfigmap,
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      component,
-			Namespace: ctx.Namespace,
-			Labels:    DefaultLabels(component),
+			Name:        component,
+			Namespace:   ctx.Namespace,
+			Labels:      CustomOverrideLabel(ctx, component, TypeMetaConfigmap),
+			Annotations: CustomOverrideAnnotation(ctx, component, TypeMetaConfigmap),
 		},
 	}
 

install/installer/pkg/common/objects.go

@@ -28,9 +28,10 @@ func DefaultServiceAccount(component string) RenderFunc {
 			&corev1.ServiceAccount{
 				TypeMeta: TypeMetaServiceAccount,
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      component,
-					Namespace: cfg.Namespace,
-					Labels:    DefaultLabels(component),
+					Name:        component,
+					Namespace:   cfg.Namespace,
+					Labels:      CustomOverrideLabel(cfg, component, TypeMetaServiceAccount),
+					Annotations: CustomOverrideAnnotation(cfg, component, TypeMetaServiceAccount),
 				},
 				AutomountServiceAccountToken: pointer.Bool(true),
 				ImagePullSecrets:             pullSecrets,
@@ -81,6 +82,18 @@ func GenerateService(component string, ports []ServicePort, mod ...func(spec *co
 			m(service)
 		}
 
+		// Apply any custom overrides - perform after the custom modifications so they can overridden
+
+		// Annotations
+		service.ObjectMeta.Annotations = CustomOverrideAnnotation(cfg, component, TypeMetaService, func() map[string]string {
+			return service.ObjectMeta.Annotations
+		})
+
+		// Labels
+		service.ObjectMeta.Labels = CustomOverrideLabel(cfg, component, TypeMetaService, func() map[string]string {
+			return service.ObjectMeta.Labels
+		})
+
 		return []runtime.Object{service}, nil
 	}
 }