K8SPS-466: global labels and annotations

api/v1alpha1/perconaservermysql_types.go

@@ -57,6 +57,7 @@ const (
 // +kubebuilder:validation:XValidation:rule="!(self.mysql.clusterType == 'group-replication' && has(self.mysql.size) && self.mysql.size >= 9) || self.unsafeFlags.mysqlSize",message="Invalid configuration: For 'group replication', scaling MySQL replicas above 9 requires 'unsafeFlags.mysqlSize: true'"
 // +kubebuilder:validation:XValidation:rule="!(self.mysql.clusterType == 'group-replication' && has(self.mysql.size) && self.mysql.size % 2 == 0) || self.unsafeFlags.mysqlSize",message="Invalid configuration: For 'group replication', using an even number of MySQL replicas requires 'unsafeFlags.mysqlSize: true'"
 type PerconaServerMySQLSpec struct {
+	Metadata               *Metadata                            `json:"metadata,omitempty"`
 	CRVersion              string                               `json:"crVersion,omitempty"`
 	Pause                  bool                                 `json:"pause,omitempty"`
 	VolumeExpansionEnabled bool                                 `json:"enableVolumeExpansion,omitempty"`
@@ -197,6 +198,22 @@ type PodSpec struct {
 	ContainerSpec `json:",inline"`
 }
 
+type Metadata struct {
+	// Map of string keys and values that can be used to organize and categorize
+	// (scope and select) objects. May match selectors of replication controllers
+	// and services.
+	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels
+	// +optional
+	Labels map[string]string `json:"labels,omitempty" protobuf:"bytes,11,rep,name=labels"`
+
+	// Annotations is an unstructured key value map stored with a resource that may be
+	// set by external tools to store and retrieve arbitrary metadata. They are not
+	// queryable and should be preserved when modifying objects.
+	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
+	// +optional
+	Annotations map[string]string `json:"annotations,omitempty" protobuf:"bytes,12,rep,name=annotations"`
+}
+
 // GetTerminationGracePeriodSeconds returns the configured termination grace period for the Pod.
 // If not explicitly set, it returns the default grace period.
 func (s PodSpec) GetTerminationGracePeriodSeconds() *int64 {
@@ -594,6 +611,22 @@ func (cr *PerconaServerMySQL) SetVersion() {
 	cr.Spec.CRVersion = version.Version()
 }
 
+func (cr *PerconaServerMySQL) GlobalLabels() map[string]string {
+	if cr.Spec.Metadata == nil {
+		return nil
+	}
+
+	return cr.Spec.Metadata.Labels
+}
+
+func (cr *PerconaServerMySQL) GlobalAnnotations() map[string]string {
+	if cr.Spec.Metadata == nil {
+		return nil
+	}
+
+	return cr.Spec.Metadata.Annotations
+}
+
 func (cr *PerconaServerMySQL) Version() *v.Version {
 	return v.Must(v.NewVersion(cr.Spec.CRVersion))
 }

config/crd/bases/ps.percona.com_perconaservermysqls.yaml

@@ -2338,6 +2338,17 @@ spec:
                 type: array
               initImage:
                 type: string
+              metadata:
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    type: object
+                type: object
               mysql:
                 properties:
                   affinity:

deploy/bundle.yaml

@@ -4261,6 +4261,17 @@ spec:
                 type: array
               initImage:
                 type: string
+              metadata:
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    type: object
+                type: object
               mysql:
                 properties:
                   affinity:

deploy/cr.yaml

@@ -7,6 +7,12 @@ metadata:
     # - percona.com/delete-ssl
     # - percona.com/delete-mysql-pvc
 spec:
+#  metadata:
+#    annotations:
+#      service.beta.kubernetes.io/aws-load-balancer-backend-protocol: tcp
+#      service.beta.kubernetes.io/aws-load-balancer-type: nlb
+#    labels:
+#      rack: rack-22
 #  unsafeFlags:
 #    mysqlSize: false
 #    orchestrator: false

deploy/crd.yaml

@@ -4261,6 +4261,17 @@ spec:
                 type: array
               initImage:
                 type: string
+              metadata:
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    type: object
+                type: object
               mysql:
                 properties:
                   affinity:

deploy/cw-bundle.yaml

@@ -4261,6 +4261,17 @@ spec:
                 type: array
               initImage:
                 type: string
+              metadata:
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    type: object
+                type: object
               mysql:
                 properties:
                   affinity:

pkg/binlogserver/binlog_server.go

@@ -39,7 +39,7 @@ func ConfigSecretName(cr *apiv1alpha1.PerconaServerMySQL) string {
 }
 
 func MatchLabels(cr *apiv1alpha1.PerconaServerMySQL) map[string]string {
-	return util.SSMapMerge(
+	return util.SSMapMerge(cr.GlobalLabels(),
 		cr.MySQLSpec().Labels,
 		cr.Labels(AppName, naming.ComponentPITR),
 	)
@@ -61,9 +61,10 @@ func StatefulSet(cr *apiv1alpha1.PerconaServerMySQL, initImage, configHash strin
 			Kind:       "StatefulSet",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      Name(cr),
-			Namespace: cr.Namespace,
-			Labels:    labels,
+			Name:        Name(cr),
+			Namespace:   cr.Namespace,
+			Labels:      labels,
+			Annotations: cr.GlobalAnnotations(),
 		},
 		Spec: appsv1.StatefulSetSpec{
 			Replicas: &spec.Size,
@@ -73,7 +74,7 @@ func StatefulSet(cr *apiv1alpha1.PerconaServerMySQL, initImage, configHash strin
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels:      labels,
-					Annotations: annotations,
+					Annotations: util.SSMapMerge(cr.GlobalAnnotations(), annotations),
 				},
 				Spec: corev1.PodSpec{
 					InitContainers: []corev1.Container{

pkg/controller/ps/tls.go

@@ -154,8 +154,10 @@ func (r *PerconaServerMySQLReconciler) ensureSSLByCertManager(ctx context.Contex
 
 		caCert := &cm.Certificate{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      certName,
-				Namespace: cr.Namespace,
+				Name:        certName,
+				Namespace:   cr.Namespace,
+				Labels:      cr.GlobalLabels(),
+				Annotations: cr.GlobalAnnotations(),
 			},
 			Spec: cm.CertificateSpec{
 				SecretName: secretName,
@@ -190,8 +192,10 @@ func (r *PerconaServerMySQLReconciler) ensureSSLByCertManager(ctx context.Contex
 
 	kubeCert := &cm.Certificate{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      certName,
-			Namespace: cr.Namespace,
+			Name:        certName,
+			Namespace:   cr.Namespace,
+			Labels:      cr.GlobalLabels(),
+			Annotations: cr.GlobalAnnotations(),
 		},
 		Spec: cm.CertificateSpec{
 			SecretName: cr.Spec.SSLSecretName,
@@ -216,8 +220,10 @@ func (r *PerconaServerMySQLReconciler) ensureIssuer(ctx context.Context, cr *api
 ) error {
 	isr := &cm.Issuer{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      issuerName,
-			Namespace: cr.Namespace,
+			Name:        issuerName,
+			Namespace:   cr.Namespace,
+			Labels:      cr.GlobalLabels(),
+			Annotations: cr.GlobalAnnotations(),
 		},
 		Spec: cm.IssuerSpec{
 			IssuerConfig: IssuerConf,

pkg/haproxy/haproxy.go

@@ -47,7 +47,7 @@ func ServiceName(cr *apiv1alpha1.PerconaServerMySQL) string {
 }
 
 func MatchLabels(cr *apiv1alpha1.PerconaServerMySQL) map[string]string {
-	return util.SSMapMerge(cr.MySQLSpec().Labels,
+	return util.SSMapMerge(cr.GlobalLabels(), cr.Spec.Proxy.HAProxy.Labels,
 		cr.Labels(AppName, naming.ComponentProxy))
 }
 
@@ -112,7 +112,7 @@ func Service(cr *apiv1alpha1.PerconaServerMySQL, secret *corev1.Secret) *corev1.
 			Name:        ServiceName(cr),
 			Namespace:   cr.Namespace,
 			Labels:      labels,
-			Annotations: expose.Annotations,
+			Annotations: util.SSMapMerge(cr.GlobalAnnotations(), expose.Annotations),
 		},
 		Spec: corev1.ServiceSpec{
 			Type:                     serviceType,
@@ -142,9 +142,10 @@ func StatefulSet(cr *apiv1alpha1.PerconaServerMySQL, initImage, configHash, tlsH
 			Kind:       "StatefulSet",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      Name(cr),
-			Namespace: cr.Namespace,
-			Labels:    labels,
+			Name:        Name(cr),
+			Namespace:   cr.Namespace,
+			Labels:      labels,
+			Annotations: cr.GlobalAnnotations(),
 		},
 		Spec: appsv1.StatefulSetSpec{
 			Replicas:    &cr.Spec.Proxy.HAProxy.Size,
@@ -156,7 +157,7 @@ func StatefulSet(cr *apiv1alpha1.PerconaServerMySQL, initImage, configHash, tlsH
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels:      labels,
-					Annotations: annotations,
+					Annotations: util.SSMapMerge(cr.GlobalAnnotations(), annotations),
 				},
 				Spec: corev1.PodSpec{
 					NodeSelector:     cr.Spec.Proxy.HAProxy.NodeSelector,

pkg/k8s/pvc.go

@@ -7,10 +7,12 @@ import (
 	apiv1alpha1 "github.com/percona/percona-server-mysql-operator/api/v1alpha1"
 )
 
-func PVC(name string, spec *apiv1alpha1.VolumeSpec) corev1.PersistentVolumeClaim {
+func PVC(cr *apiv1alpha1.PerconaServerMySQL, name string, spec *apiv1alpha1.VolumeSpec) corev1.PersistentVolumeClaim {
 	return corev1.PersistentVolumeClaim{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: name,
+			Name:        name,
+			Labels:      cr.GlobalLabels(),
+			Annotations: cr.GlobalAnnotations(),
 		},
 		Spec: corev1.PersistentVolumeClaimSpec{
 			StorageClassName: spec.PersistentVolumeClaim.StorageClassName,

pkg/k8s/pvc_test.go

@@ -3,11 +3,11 @@ package k8s
 import (
 	"testing"
 
-	apiv1alpha1 "github.com/percona/percona-server-mysql-operator/api/v1alpha1"
-
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+
+	apiv1alpha1 "github.com/percona/percona-server-mysql-operator/api/v1alpha1"
 )
 
 func TestPVC(t *testing.T) {
@@ -29,7 +29,7 @@ func TestPVC(t *testing.T) {
 
 	pvcName := "pvc-name"
 
-	pvc := PVC(pvcName, spec)
+	pvc := PVC(new(apiv1alpha1.PerconaServerMySQL), pvcName, spec)
 
 	assert.Equal(t, pvcName, pvc.Name)
 	assert.NotNil(t, pvc.Spec.StorageClassName)