[installer]: apply labels/annotations to minio and mysql

Author: Simon Emms

install/installer/pkg/components/database/incluster/helm.go

@@ -24,30 +24,37 @@ var Helm = common.CompositeHelmFunc(
 			return nil, err
 		}
 
+		customization := helm.CustomizeAnnotation([]string{}, "mysql.primary.podAnnotations", cfg, Component, common.TypeMetaDeployment)
+		customization = helm.CustomizeLabel(customization, "mysql.primary.podLabels", cfg, Component, common.TypeMetaDeployment)
+		customization = helm.CustomizeAnnotation(customization, "mysql.primary.service.annotations", cfg, Component, common.TypeMetaService)
+
 		return &common.HelmConfig{
 			Enabled: true,
 			Values: &values.Options{
-				Values: []string{
-					helm.KeyValue("mysql.auth.existingSecret", SQLPasswordName),
-					helm.KeyValue("mysql.auth.database", Database),
-					helm.KeyValue("mysql.auth.username", Username),
-					helm.KeyValue("mysql.initdbScriptsConfigMap", SQLInitScripts),
-					helm.KeyValue("mysql.serviceAccount.name", Component),
-					helm.ImagePullSecrets("mysql.image.pullSecrets", cfg),
-					helm.KeyValue("mysql.image.registry", ""),
-					helm.KeyValue("mysql.image.repository", cfg.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/mysql")),
-					helm.ImagePullSecrets("mysql.metrics.image.pullSecrets", cfg),
-					helm.KeyValue("mysql.metrics.image.registry", ""),
-					helm.KeyValue("mysql.metrics.image.repository", cfg.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/mysqld-exporter")),
-					helm.ImagePullSecrets("mysql.volumePermissions.image.pullSecrets", cfg),
-					helm.KeyValue("mysql.volumePermissions.image.pullPolicy", "IfNotPresent"),
-					helm.KeyValue("mysql.volumePermissions.image.registry", ""),
-					helm.KeyValue("mysql.volumePermissions.image.repository", cfg.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/bitnami-shell")),
+				Values: append(
+					[]string{
+						helm.KeyValue("mysql.auth.existingSecret", SQLPasswordName),
+						helm.KeyValue("mysql.auth.database", Database),
+						helm.KeyValue("mysql.auth.username", Username),
+						helm.KeyValue("mysql.initdbScriptsConfigMap", SQLInitScripts),
+						helm.KeyValue("mysql.serviceAccount.name", Component),
+						helm.ImagePullSecrets("mysql.image.pullSecrets", cfg),
+						helm.KeyValue("mysql.image.registry", ""),
+						helm.KeyValue("mysql.image.repository", cfg.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/mysql")),
+						helm.ImagePullSecrets("mysql.metrics.image.pullSecrets", cfg),
+						helm.KeyValue("mysql.metrics.image.registry", ""),
+						helm.KeyValue("mysql.metrics.image.repository", cfg.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/mysqld-exporter")),
+						helm.ImagePullSecrets("mysql.volumePermissions.image.pullSecrets", cfg),
+						helm.KeyValue("mysql.volumePermissions.image.pullPolicy", "IfNotPresent"),
+						helm.KeyValue("mysql.volumePermissions.image.registry", ""),
+						helm.KeyValue("mysql.volumePermissions.image.repository", cfg.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/bitnami-shell")),
 
-					// improve start time
-					helm.KeyValue("mysql.primary.startupProbe.enabled", "false"),
-					helm.KeyValue("mysql.primary.livenessProbe.initialDelaySeconds", "30"),
-				},
+						// improve start time
+						helm.KeyValue("mysql.primary.startupProbe.enabled", "false"),
+						helm.KeyValue("mysql.primary.livenessProbe.initialDelaySeconds", "30"),
+					},
+					customization...,
+				),
 				// This is too complex to be sent as a string
 				FileValues: []string{
 					primaryAffinityTemplate,

install/installer/pkg/components/minio/helm.go

@@ -26,6 +26,10 @@ var Helm = common.CompositeHelmFunc(
 			helm.KeyValue("minio.volumePermissions.image.repository", cfg.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/bitnami-shell")),
 		}
 
+		commonHelmValues = helm.CustomizeAnnotation(commonHelmValues, "minio.podAnnotations", cfg, Component, common.TypeMetaDeployment)
+		commonHelmValues = helm.CustomizeLabel(commonHelmValues, "minio.podLabels", cfg, Component, common.TypeMetaDeployment)
+		commonHelmValues = helm.CustomizeAnnotation(commonHelmValues, "minio.service.annotations", cfg, Component, common.TypeMetaService)
+
 		if cfg.Config.ObjectStorage.Resources != nil && cfg.Config.ObjectStorage.Resources.Requests.Memory() != nil {
 			memoryRequests := resource.MustParse(cfg.Config.ObjectStorage.Resources.Requests.Memory().String())
 			commonHelmValues = append(commonHelmValues, helm.KeyValue("minio.resources.requests.memory", memoryRequests.String()))