Add extraLabels support

Author: Dean-Coakley

deploy/crds/k8s.nginx.org_nginxingresscontrollers_crd.yaml

@@ -83,6 +83,11 @@ spec:
               description: Enable TLS Passthrough on port 443. Requires enableCRDs
                 set to true.
               type: boolean
+            extraLabels:
+              additionalProperties:
+                type: string
+              description: Specifies extra labels of the service.
+              type: object
             globalConfiguration:
               description: The GlobalConfiguration resource for global configuration
                 of the Ingress Controller. Format is namespace/name. Requires enableCRDs

pkg/apis/k8s/v1alpha1/nginxingresscontroller_types.go

@@ -40,13 +40,17 @@ type NginxIngressControllerSpec struct {
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
 	EnableSnippets bool `json:"enableSnippets"`
-	// +kubebuilder:validation:Optional
 	// A class of the Ingress controller. The Ingress controller only processes Ingress resources that belong to its
 	// class (in other words, have the annotation “kubernetes.io/ingress.class”).
 	// Additionally, the Ingress controller processes Ingress resources that do not have that annotation,
 	// which can be disabled by setting UseIngressClassOnly to true. Default is `nginx`.
+	// +kubebuilder:validation:Optional
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
 	IngressClass string `json:"ingressClass"`
+	// Specifies extra labels of the service.
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
+	ExtraLabels map[string]string `json:"extraLabels,omitempty"`
 	// Ignore Ingress resources without the “kubernetes.io/ingress.class” annotation.
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true

pkg/apis/k8s/v1alpha1/zz_generated.deepcopy.go

@@ -32,9 +32,11 @@ import (
 
 var log = logf.Log.WithName("controller_nginxingresscontroller")
 
-const clusterRoleName = "nginx-ingress-role"
-const sccName = "nginx-ingress-scc"
-const finalizer = "finalizer.nginxingresscontroller.k8s.nginx.org"
+const (
+	clusterRoleName = "nginx-ingress-role"
+	sccName         = "nginx-ingress-scc"
+	finalizer       = "finalizer.nginxingresscontroller.k8s.nginx.org"
+)
 
 // Add creates a new NginxIngressController Controller and adds it to the Manager. The Manager will set fields on the Controller
 // and Start it when the Manager is Started.

pkg/controller/nginxingresscontroller/nginxingresscontroller_controller.go

@@ -12,6 +12,7 @@ func serviceForNginxIngressController(instance *k8sv1alpha1.NginxIngressControll
 		ObjectMeta: v1.ObjectMeta{
 			Name:      instance.Name,
 			Namespace: instance.Namespace,
+			Labels:    instance.Spec.ExtraLabels,
 		},
 		Spec: corev1.ServiceSpec{
 			Ports: []corev1.ServicePort{

pkg/controller/nginxingresscontroller/service.go

@@ -1,9 +1,9 @@
 package nginxingresscontroller
 
 import (
-	"reflect"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -14,20 +14,24 @@ func TestServiceForNginxIngressController(t *testing.T) {
 	name := "my-service"
 	namespace := "my-nginx-ingress"
 	serviceType := "LoadBalancer"
+	extraLabels := map[string]string{"app": "my-nginx-ingress"}
 
 	instance := &k8sv1alpha1.NginxIngressController{
 		ObjectMeta: v1.ObjectMeta{
 			Name:      name,
 			Namespace: namespace,
+			Labels:    extraLabels,
 		},
 		Spec: k8sv1alpha1.NginxIngressControllerSpec{
 			ServiceType: serviceType,
+			ExtraLabels: extraLabels,
 		},
 	}
 	expected := &corev1.Service{
 		ObjectMeta: v1.ObjectMeta{
 			Name:      name,
 			Namespace: namespace,
+			Labels:    extraLabels,
 		},
 		Spec: corev1.ServiceSpec{
 			Ports: []corev1.ServicePort{
@@ -56,7 +60,7 @@ func TestServiceForNginxIngressController(t *testing.T) {
 	}
 
 	result := serviceForNginxIngressController(instance)
-	if !reflect.DeepEqual(result, expected) {
-		t.Errorf("serviceForNginxIngressController(%v) returned %+v but expected %+v", instance, result, expected)
+	if diff := cmp.Diff(expected, result); diff != "" {
+		t.Errorf("serviceForNginxIngressController() mismatch (-want +got):\n%s", diff)
 	}
 }