Merge pull request #491 from thestormforge/revert-name-label-change

Reverting the name label change

Author: jgustie

cli/internal/commands/grant_permissions/generator.go

@@ -239,7 +239,7 @@ func (o *GeneratorOptions) generateClusterRoleBinding(roleRef *rbacv1.RoleRef, s
 	return &rbacv1.ClusterRoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   roleRef.Name + "binding",
-			Labels: map[string]string{"app.kubernetes.io/name": "optimize-controller"},
+			Labels: map[string]string{"app.kubernetes.io/name": "optimize"},
 		},
 		Subjects: []rbacv1.Subject{*subject},
 		RoleRef:  *roleRef,
@@ -272,7 +272,7 @@ func (o *GeneratorOptions) generateRoleBindings(ctx context.Context, roleRef *rb
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      roleRef.Name + "binding",
 					Namespace: scanner.Text(),
-					Labels:    map[string]string{"app.kubernetes.io/name": "optimize-controller"},
+					Labels:    map[string]string{"app.kubernetes.io/name": "optimize"},
 				},
 				Subjects: []rbacv1.Subject{*subject},
 				RoleRef:  *roleRef,
@@ -285,7 +285,7 @@ func (o *GeneratorOptions) generateRoleBindings(ctx context.Context, roleRef *rb
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "optimize-manager-rolebinding",
 					Namespace: scanner.Text(),
-					Labels:    map[string]string{"app.kubernetes.io/name": "optimize-controller"},
+					Labels:    map[string]string{"app.kubernetes.io/name": "optimize"},
 				},
 				Subjects: []rbacv1.Subject{*subject},
 				RoleRef: rbacv1.RoleRef{

cli/internal/commands/initialize/initialize.go

@@ -57,7 +57,7 @@ func (o *Options) Initialize(ctx context.Context) error {
 	}
 
 	// Run `kubectl apply` to install the product
-	// TODO Handle upgrades with "--prune", "--selector", "app.kubernetes.io/name=optimize-controller,app.kubernetes.io/managed-by=%s"
+	// TODO Handle upgrades with "--prune", "--selector", "app.kubernetes.io/name=optimize,app.kubernetes.io/managed-by=%s"
 	kubectlApply, err := o.Config.Kubectl(ctx, "apply", "-f", "-")
 	if err != nil {
 		return err

config/default/kustomization.yaml

@@ -10,7 +10,7 @@ namePrefix: optimize-
 
 # Labels to add to all resources and selectors.
 commonLabels:
-  app.kubernetes.io/name: optimize-controller
+  app.kubernetes.io/name: optimize
 
 resources:
 - ../crd