added labels to serviceSpec (#202)

dragonflydb · Jun 18, 2024 · f399e7e · f399e7e
1 parent 64cfcba
commit f399e7e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 4 deletions.
diff --git a/api/v1alpha1/dragonfly_types.go b/api/v1alpha1/dragonfly_types.go
@@ -145,6 +145,11 @@ type ServiceSpec struct {
 	// +optional
 	// +kubebuilder:validation:Optional
 	Annotations map[string]string `json:"annotations,omitempty"`
+
+	// (Optional) Dragonfly Service Labels
+	// +optional
+	// +kubebuilder:validation:Optional
+	Labels map[string]string `json:"labels,omitempty"`
 }
 
 type Snapshot struct {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/dragonflydb.io_dragonflies.yaml b/config/crd/bases/dragonflydb.io_dragonflies.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: dragonflies.dragonflydb.io
 spec:
   group: dragonflydb.io
@@ -1130,6 +1129,11 @@ spec:
                       type: string
                     description: (Optional) Dragonfly Service Annotations
                     type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: (Optional) Dragonfly Service Labels
+                    type: object
                   name:
                     description: (Optional) Dragonfly Service name
                     type: string

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:

diff --git a/e2e/dragonfly_controller_test.go b/e2e/dragonfly_controller_test.go
@@ -502,10 +502,14 @@ var _ = Describe("Dragonfly Lifecycle tests", Ordered, FlakeAttempts(3), func()
 			newAnnotations := map[string]string{
 				"service-annotaions": "true",
 			}
+			newLabels := map[string]string{
+				"service-labels": "true",
+			}
 			df.Spec.ServiceSpec = &resourcesv1.ServiceSpec{
 				Type:        corev1.ServiceTypeLoadBalancer,
 				Name:        "test-svc",
 				Annotations: newAnnotations,
+				Labels:      newLabels,
 			}
 
 			err = k8sClient.Update(ctx, &df)
@@ -526,6 +530,7 @@ var _ = Describe("Dragonfly Lifecycle tests", Ordered, FlakeAttempts(3), func()
 
 			Expect(svc.Spec.Type).To(Equal(corev1.ServiceTypeLoadBalancer))
 			Expect(svc.Annotations).To(Equal(newAnnotations))
+			Expect(svc.Labels).To(Equal(newLabels))
 		})
 
 		It("Cleanup", func() {

diff --git a/internal/resources/resources.go b/internal/resources/resources.go
@@ -384,6 +384,7 @@ func GetDragonflyResources(ctx context.Context, df *resourcesv1.Dragonfly) ([]cl
 	if df.Spec.ServiceSpec != nil {
 		service.Spec.Type = df.Spec.ServiceSpec.Type
 		service.Annotations = df.Spec.ServiceSpec.Annotations
+		service.Labels = df.Spec.ServiceSpec.Labels
 	}
 	if df.Spec.MemcachedPort != 0 {
 		service.Spec.Ports = append(service.Spec.Ports, corev1.ServicePort{