add labels

Signed-off-by: Ashima-Ashima1 <[email protected]>

Author: ashimagarg27

controllers/internal/crutils/ibmobjectcsi.go

@@ -34,7 +34,8 @@ func (c *IBMObjectCSI) GetLabels() labels.Set {
 		"app.kubernetes.io/name":       config.ProductName,
 		"app.kubernetes.io/instance":   c.Name,
 		"app.kubernetes.io/version":    csiversion.Version,
-		"app.kubernetes.io/managed-by": config.Name,
+		"app.kubernetes.io/part-of":    config.Name,
+		"app.kubernetes.io/managed-by": "addon",
 		"product":                      config.ProductName,
 		"release":                      fmt.Sprintf("v%s", csiversion.Version),
 	}
@@ -107,12 +108,10 @@ func (c *IBMObjectCSI) GetCSIControllerImage() string {
 
 // GetCSIControllerResourceRequests ...
 func (c *IBMObjectCSI) GetCSIControllerResourceRequests() *objectdriverv1alpha1.ResourcesSpec {
-	resources := c.Spec.Controller.Resources
-	return &resources
+	return &c.Spec.Controller.Resources
 }
 
 // GetCSINodeResourceRequests ...
 func (c *IBMObjectCSI) GetCSINodeResourceRequests() *objectdriverv1alpha1.ResourcesSpec {
-	resources := c.Spec.Node.Resources
-	return &resources
+	return &c.Spec.Node.Resources
 }

controllers/internal/crutils/static_resource_generator.go

@@ -15,8 +15,12 @@ func (c *IBMObjectCSI) GenerateCSIDriver() *storagev1.CSIDriver {
 	defaultFSGroupPolicy := storagev1.FileFSGroupPolicy
 	return &storagev1.CSIDriver{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:   config.DriverName,
-			Labels: map[string]string{"app.kubernetes.io/name": "ibm-object-csi"},
+			Name: config.DriverName,
+			Labels: map[string]string{
+				"app.kubernetes.io/name":       "ibm-object-csi",
+				"app.kubernetes.io/part-of":    config.Name,
+				"app.kubernetes.io/managed-by": "addon",
+			},
 		},
 		Spec: storagev1.CSIDriverSpec{
 			AttachRequired: boolptr.False(),
@@ -53,6 +57,10 @@ func (c *IBMObjectCSI) GenerateExternalProvisionerClusterRole() *rbacv1.ClusterR
 	return &rbacv1.ClusterRole{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: config.GetNameForResource(config.ExternalProvisionerClusterRole, c.Name),
+			Labels: map[string]string{
+				"app.kubernetes.io/part-of":    config.Name,
+				"app.kubernetes.io/managed-by": "addon",
+			},
 		},
 		Rules: []rbacv1.PolicyRule{
 			{
@@ -99,6 +107,10 @@ func (c *IBMObjectCSI) GenerateExternalProvisionerClusterRoleBinding() *rbacv1.C
 	return &rbacv1.ClusterRoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: config.GetNameForResource(config.ExternalProvisionerClusterRoleBinding, c.Name),
+			Labels: map[string]string{
+				"app.kubernetes.io/part-of":    config.Name,
+				"app.kubernetes.io/managed-by": "addon",
+			},
 		},
 		Subjects: []rbacv1.Subject{
 			{
@@ -120,6 +132,10 @@ func (c *IBMObjectCSI) GenerateSCCForControllerClusterRole() *rbacv1.ClusterRole
 	return &rbacv1.ClusterRole{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: config.GetNameForResource(config.CSIControllerSCCClusterRole, c.Name),
+			Labels: map[string]string{
+				"app.kubernetes.io/part-of":    config.Name,
+				"app.kubernetes.io/managed-by": "addon",
+			},
 		},
 		Rules: []rbacv1.PolicyRule{
 			{
@@ -137,6 +153,10 @@ func (c *IBMObjectCSI) GenerateSCCForControllerClusterRoleBinding() *rbacv1.Clus
 	return &rbacv1.ClusterRoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: config.GetNameForResource(config.CSIControllerSCCClusterRoleBinding, c.Name),
+			Labels: map[string]string{
+				"app.kubernetes.io/part-of":    config.Name,
+				"app.kubernetes.io/managed-by": "addon",
+			},
 		},
 		Subjects: []rbacv1.Subject{
 			{
@@ -158,6 +178,10 @@ func (c *IBMObjectCSI) GenerateSCCForNodeClusterRole() *rbacv1.ClusterRole {
 	return &rbacv1.ClusterRole{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: config.GetNameForResource(config.CSINodeSCCClusterRole, c.Name),
+			Labels: map[string]string{
+				"app.kubernetes.io/part-of":    config.Name,
+				"app.kubernetes.io/managed-by": "addon",
+			},
 		},
 		Rules: []rbacv1.PolicyRule{
 			{
@@ -187,6 +211,10 @@ func (c *IBMObjectCSI) GenerateSCCForNodeClusterRoleBinding() *rbacv1.ClusterRol
 	return &rbacv1.ClusterRoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: config.GetNameForResource(config.CSINodeSCCClusterRoleBinding, c.Name),
+			Labels: map[string]string{
+				"app.kubernetes.io/part-of":    config.Name,
+				"app.kubernetes.io/managed-by": "addon",
+			},
 		},
 		Subjects: []rbacv1.Subject{
 			{
@@ -209,6 +237,10 @@ func (c *IBMObjectCSI) Generates3fsSC() *storagev1.StorageClass {
 	return &storagev1.StorageClass{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: config.GetNameForResource(config.S3fsStorageClass, c.Name),
+			Labels: map[string]string{
+				"app.kubernetes.io/part-of":    config.Name,
+				"app.kubernetes.io/managed-by": "addon",
+			},
 		},
 		Provisioner:   config.DriverName,
 		ReclaimPolicy: &reclaimPolicy,
@@ -237,6 +269,10 @@ func (c *IBMObjectCSI) GenerateRcloneSC() *storagev1.StorageClass {
 	return &storagev1.StorageClass{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: config.GetNameForResource(config.RcloneStorageClass, c.Name),
+			Labels: map[string]string{
+				"app.kubernetes.io/part-of":    config.Name,
+				"app.kubernetes.io/managed-by": "addon",
+			},
 		},
 		Provisioner:   config.DriverName,
 		ReclaimPolicy: &reclaimPolicy,