Merge pull request #863 from fao89/servicelabels

Standardize service labels

apis/dataplane/v1beta1/openstackdataplaneservice_types.go

@@ -160,3 +160,20 @@ func (instance OpenStackDataPlaneService) InitConditions() {
 	// initialize conditions used later as Status=Unknown
 	instance.Status.Conditions.Init(&cl)
 }
+
+// DefaultLabel - adding default label to the OpenStackDataPlaneService
+func (r *OpenStackDataPlaneService) DefaultLabels() {
+	labels := map[string]string{
+		"app.kubernetes.io/name":     "openstackdataplaneservice",
+		"app.kubernetes.io/instance": r.Name,
+		"app.kubernetes.io/part-of":  "openstack-operator",
+	}
+
+	if r.Labels == nil {
+		r.Labels = labels
+	} else {
+		for k, v := range labels {
+			r.Labels[k] = v
+		}
+	}
+}

apis/dataplane/v1beta1/openstackdataplaneservice_webhook.go

@@ -45,6 +45,7 @@ func (r *OpenStackDataPlaneService) Default() {
 
 	openstackdataplaneservicelog.Info("default", "name", r.Name)
 	r.Spec.Default(r.Name)
+	r.DefaultLabels()
 }
 
 // Default - set defaults for this OpenStackDataPlaneService

config/services/dataplane_v1beta1_openstackdataplaneservice_bootstrap.yaml

@@ -1,12 +1,6 @@
 apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneService
 metadata:
-  labels:
-    app.kubernetes.io/name: openstackdataplaneservice
-    app.kubernetes.io/instance: openstackdataplaneservice-bootstrap
-    app.kubernetes.io/part-of: openstack-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: openstack-operator
   name: bootstrap
 spec:
   playbook: osp.edpm.bootstrap

config/services/dataplane_v1beta1_openstackdataplaneservice_configure_network.yaml

@@ -1,12 +1,6 @@
 apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneService
 metadata:
-  labels:
-    app.kubernetes.io/name: openstackdataplaneservice
-    app.kubernetes.io/instance: openstackdataplaneservice-configure-network
-    app.kubernetes.io/part-of: openstack-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: openstack-operator
   name: configure-network
 spec:
   playbook: osp.edpm.configure_network

config/services/dataplane_v1beta1_openstackdataplaneservice_configure_ovs_dpdk.yaml

@@ -1,12 +1,6 @@
 apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneService
 metadata:
-  labels:
-    app.kubernetes.io/name: openstackdataplaneservice
-    app.kubernetes.io/instance: openstackdataplaneservice-configure-ovs-dpdk
-    app.kubernetes.io/part-of: openstack-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: openstack-operator
   name: configure-ovs-dpdk
 spec:
   playbook: osp.edpm.configure_ovs_dpdk

config/services/dataplane_v1beta1_openstackdataplaneservice_derive_pci_devicespec.yaml

@@ -1,12 +1,6 @@
 apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneService
 metadata:
-  labels:
-    app.kubernetes.io/name: openstackdataplaneservice
-    app.kubernetes.io/instance: openstackdataplaneservice-derive-pci-devicespec
-    app.kubernetes.io/part-of: openstack-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: openstack-operator
   name: derive-pci-devicespec
 spec:
   playbook: osp.edpm.sriov_derive_device_spec

config/services/dataplane_v1beta1_openstackdataplaneservice_download_cache.yaml

@@ -1,12 +1,6 @@
 apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneService
 metadata:
-  labels:
-    app.kubernetes.io/name: openstackdataplaneservice
-    app.kubernetes.io/instance: openstackdataplaneservice-download-cache
-    app.kubernetes.io/part-of: openstack-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: openstack-operator
   name: download-cache
 spec:
   playbook: osp.edpm.download_cache

config/services/dataplane_v1beta1_openstackdataplaneservice_install_certs.yaml

@@ -1,12 +1,6 @@
 apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneService
 metadata:
-  labels:
-    app.kubernetes.io/name: openstackdataplaneservice
-    app.kubernetes.io/instance: openstackdataplaneservice-install-certs
-    app.kubernetes.io/part-of: openstack-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: openstack-operator
   name: install-certs
 spec:
   playbook: osp.edpm.install_certs

config/services/dataplane_v1beta1_openstackdataplaneservice_validate_network.yaml

@@ -1,12 +1,6 @@
 apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneService
 metadata:
-  labels:
-    app.kubernetes.io/name: openstackdataplaneservice
-    app.kubernetes.io/instance: openstackdataplaneservice-validate-network
-    app.kubernetes.io/part-of: openstack-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: openstack-operator
   name: validate-network
 spec:
   playbook: osp.edpm.validate_network