Rename Workspace -> DevWorkspace in go code

sleshchenko · sleshchenko · commit 8d236970e7d0 · 2021-03-15T13:52:43.000+02:00
diff --git a/PROJECT b/PROJECT
@@ -1,7 +1,7 @@
 domain: devfile.io
 layout: go.kubebuilder.io/v2
 multigroup: true
-projectName: devworkspace-operator-migration
+projectName: devworkspace-operator
 repo: github.com/devfile/devworkspace-operator
 resources:
 - group: controller
diff --git a/controllers/controller/workspacerouting/solvers/common.go b/controllers/controller/workspacerouting/solvers/common.go
@@ -58,7 +58,7 @@ func GetDiscoverableServicesForEndpoints(endpoints map[string]controllerv1alpha1
 						Name:      common.EndpointName(endpoint.Name),
 						Namespace: meta.Namespace,
 						Labels: map[string]string{
-							constants.WorkspaceIDLabel: meta.WorkspaceId,
+							constants.DevWorkspaceIDLabel: meta.WorkspaceId,
 						},
 						Annotations: map[string]string{
 							constants.WorkspaceDiscoverableServiceAnnotation: "true",
@@ -127,7 +127,7 @@ func GetServiceForEndpoints(endpoints map[string]controllerv1alpha1.EndpointList
 			Name:      common.ServiceName(meta.WorkspaceId),
 			Namespace: meta.Namespace,
 			Labels: map[string]string{
-				constants.WorkspaceIDLabel: meta.WorkspaceId,
+				constants.DevWorkspaceIDLabel: meta.WorkspaceId,
 			},
 		},
 		Spec: corev1.ServiceSpec{
@@ -187,7 +187,7 @@ func getRouteForEndpoint(endpoint devworkspace.Endpoint, meta WorkspaceMetadata)
 			Name:      common.RouteName(meta.WorkspaceId, endpointName),
 			Namespace: meta.Namespace,
 			Labels: map[string]string{
-				constants.WorkspaceIDLabel: meta.WorkspaceId,
+				constants.DevWorkspaceIDLabel: meta.WorkspaceId,
 			},
 			Annotations: routeAnnotations(endpointName),
 		},
@@ -219,7 +219,7 @@ func getIngressForEndpoint(endpoint devworkspace.Endpoint, meta WorkspaceMetadat
 			Name:      common.RouteName(meta.WorkspaceId, endpointName),
 			Namespace: meta.Namespace,
 			Labels: map[string]string{
-				constants.WorkspaceIDLabel: meta.WorkspaceId,
+				constants.DevWorkspaceIDLabel: meta.WorkspaceId,
 			},
 			Annotations: nginxIngressAnnotations(endpoint.Name),
 		},
diff --git a/controllers/controller/workspacerouting/solvers/openshift_oauth_solver.go b/controllers/controller/workspacerouting/solvers/openshift_oauth_solver.go
@@ -90,17 +90,17 @@ func (s *OpenShiftOAuthSolver) GetSpecObjects(routing *controllerv1alpha1.Worksp
 		ObjectMeta: metav1.ObjectMeta{
 			Name: workspaceMeta.WorkspaceId + "-oauth-client",
 			Labels: map[string]string{
-				constants.WorkspaceIDLabel: workspaceMeta.WorkspaceId,
+				constants.DevWorkspaceIDLabel: workspaceMeta.WorkspaceId,
 			},
 		},
 		GrantMethod:  oauthv1.GrantHandlerPrompt,
 		Secret:       "1234567890",
 		RedirectURIs: publicURls,
 	}
 
-	restrictedAccess, setRestrictedAccess := routing.Annotations[constants.WorkspaceRestrictedAccessAnnotation]
+	restrictedAccess, setRestrictedAccess := routing.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]
 	if setRestrictedAccess {
-		oauthClient.Annotations = maputils.Append(oauthClient.Annotations, constants.WorkspaceRestrictedAccessAnnotation, restrictedAccess)
+		oauthClient.Annotations = maputils.Append(oauthClient.Annotations, constants.DevWorkspaceRestrictedAccessAnnotation, restrictedAccess)
 	}
 
 	oauthClientInSync, err := syncOAuthClient(s, routing, oauthClient)
diff --git a/controllers/controller/workspacerouting/solvers/sync_oauthclients.go b/controllers/controller/workspacerouting/solvers/sync_oauthclients.go
@@ -93,7 +93,7 @@ func syncOAuthClient(client client.Client, routing *controllerv1alpha1.Workspace
 
 func getClusterOAuthClients(cl client.Client, routing *controllerv1alpha1.WorkspaceRouting) ([]oauthv1.OAuthClient, error) {
 	found := &oauthv1.OAuthClientList{}
-	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.WorkspaceIDLabel, routing.Spec.WorkspaceId))
+	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))
 	if err != nil {
 		return nil, err
 	}
@@ -109,7 +109,7 @@ func getClusterOAuthClients(cl client.Client, routing *controllerv1alpha1.Worksp
 }
 
 func deleteOAuthClients(cl client.Client, routing *controllerv1alpha1.WorkspaceRouting) error {
-	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.WorkspaceIDLabel, routing.Spec.WorkspaceId))
+	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))
 	if err != nil {
 		return err
 	}
diff --git a/controllers/controller/workspacerouting/sync_ingresses.go b/controllers/controller/workspacerouting/sync_ingresses.go
@@ -76,7 +76,7 @@ func (r *WorkspaceRoutingReconciler) syncIngresses(routing *controllerv1alpha1.W
 
 func (r *WorkspaceRoutingReconciler) getClusterIngresses(routing *controllerv1alpha1.WorkspaceRouting) ([]v1beta1.Ingress, error) {
 	found := &v1beta1.IngressList{}
-	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.WorkspaceIDLabel, routing.Spec.WorkspaceId))
+	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))
 	if err != nil {
 		return nil, err
 	}
diff --git a/controllers/controller/workspacerouting/sync_routes.go b/controllers/controller/workspacerouting/sync_routes.go
@@ -78,7 +78,7 @@ func (r *WorkspaceRoutingReconciler) syncRoutes(routing *controllerv1alpha1.Work
 
 func (r *WorkspaceRoutingReconciler) getClusterRoutes(routing *controllerv1alpha1.WorkspaceRouting) ([]routeV1.Route, error) {
 	found := &routeV1.RouteList{}
-	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.WorkspaceIDLabel, routing.Spec.WorkspaceId))
+	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))
 	if err != nil {
 		return nil, err
 	}
diff --git a/controllers/controller/workspacerouting/sync_services.go b/controllers/controller/workspacerouting/sync_services.go
@@ -83,7 +83,7 @@ func (r *WorkspaceRoutingReconciler) syncServices(routing *controllerv1alpha1.Wo
 
 func (r *WorkspaceRoutingReconciler) getClusterServices(routing *controllerv1alpha1.WorkspaceRouting) ([]corev1.Service, error) {
 	found := &corev1.ServiceList{}
-	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.WorkspaceIDLabel, routing.Spec.WorkspaceId))
+	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))
 	if err != nil {
 		return nil, err
 	}
diff --git a/controllers/controller/workspacerouting/workspacerouting_controller.go b/controllers/controller/workspacerouting/workspacerouting_controller.go
@@ -118,7 +118,7 @@ func (r *WorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e
 		RoutingSuffix: instance.Spec.RoutingSuffix,
 	}
 
-	restrictedAccess, setRestrictedAccess := instance.Annotations[constants.WorkspaceRestrictedAccessAnnotation]
+	restrictedAccess, setRestrictedAccess := instance.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]
 	routingObjects, err := solver.GetSpecObjects(instance, workspaceMeta)
 	if err != nil {
 		var notReady *solvers.RoutingNotReady
@@ -148,7 +148,7 @@ func (r *WorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e
 			return reconcile.Result{}, err
 		}
 		if setRestrictedAccess {
-			services[idx].Annotations = maputils.Append(services[idx].Annotations, constants.WorkspaceRestrictedAccessAnnotation, restrictedAccess)
+			services[idx].Annotations = maputils.Append(services[idx].Annotations, constants.DevWorkspaceRestrictedAccessAnnotation, restrictedAccess)
 		}
 	}
 	ingresses := routingObjects.Ingresses
@@ -158,7 +158,7 @@ func (r *WorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e
 			return reconcile.Result{}, err
 		}
 		if setRestrictedAccess {
-			ingresses[idx].Annotations = maputils.Append(ingresses[idx].Annotations, constants.WorkspaceRestrictedAccessAnnotation, restrictedAccess)
+			ingresses[idx].Annotations = maputils.Append(ingresses[idx].Annotations, constants.DevWorkspaceRestrictedAccessAnnotation, restrictedAccess)
 		}
 	}
 	routes := routingObjects.Routes
@@ -168,7 +168,7 @@ func (r *WorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e
 			return reconcile.Result{}, err
 		}
 		if setRestrictedAccess {
-			routes[idx].Annotations = maputils.Append(routes[idx].Annotations, constants.WorkspaceRestrictedAccessAnnotation, restrictedAccess)
+			routes[idx].Annotations = maputils.Append(routes[idx].Annotations, constants.DevWorkspaceRestrictedAccessAnnotation, restrictedAccess)
 		}
 	}
 
diff --git a/controllers/workspace/devworkspace_controller.go b/controllers/workspace/devworkspace_controller.go
@@ -141,7 +141,7 @@ func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ct
 		return r.updateWorkspaceStatus(clusterWorkspace, reqLogger, &reconcileStatus, reconcileResult, err)
 	}()
 
-	if workspace.Annotations[constants.WorkspaceRestrictedAccessAnnotation] == "true" {
+	if workspace.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation] == "true" {
 		msg, err := r.validateCreatorLabel(clusterWorkspace)
 		if err != nil {
 			reconcileStatus.Phase = devworkspace.WorkspaceStatusFailed
@@ -150,8 +150,8 @@ func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ct
 		}
 	}
 
-	if _, ok := clusterWorkspace.Annotations[constants.WorkspaceStopReasonAnnotation]; ok {
-		delete(clusterWorkspace.Annotations, constants.WorkspaceStopReasonAnnotation)
+	if _, ok := clusterWorkspace.Annotations[constants.DevWorkspaceStopReasonAnnotation]; ok {
+		delete(clusterWorkspace.Annotations, constants.DevWorkspaceStopReasonAnnotation)
 		err = r.Update(context.TODO(), clusterWorkspace)
 		return reconcile.Result{Requeue: true}, err
 	}
diff --git a/controllers/workspace/finalize.go b/controllers/workspace/finalize.go
@@ -149,10 +149,10 @@ func (r *DevWorkspaceReconciler) getSpecCleanupJob(workspace *devworkspace.DevWo
 	workspaceId := workspace.Status.WorkspaceId
 	pvcName := config.ControllerCfg.GetWorkspacePVCName()
 	jobLabels := map[string]string{
-		constants.WorkspaceIDLabel: workspaceId,
+		constants.DevWorkspaceIDLabel: workspaceId,
 	}
-	if restrictedAccess, needsRestrictedAccess := workspace.Annotations[constants.WorkspaceRestrictedAccessAnnotation]; needsRestrictedAccess {
-		jobLabels[constants.WorkspaceRestrictedAccessAnnotation] = restrictedAccess
+	if restrictedAccess, needsRestrictedAccess := workspace.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]; needsRestrictedAccess {
+		jobLabels[constants.DevWorkspaceRestrictedAccessAnnotation] = restrictedAccess
 	}
 	job := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
diff --git a/controllers/workspace/provision/deployment.go b/controllers/workspace/provision/deployment.go
@@ -171,7 +171,7 @@ func getSpecDeployment(
 		return nil, err
 	}
 
-	creator := workspace.Labels[constants.WorkspaceCreatorLabel]
+	creator := workspace.Labels[constants.DevWorkspaceCreatorLabel]
 	commonEnv := env.CommonEnvironmentVariables(workspace.Name, workspace.Status.WorkspaceId, workspace.Namespace, creator)
 	for idx := range podAdditions.Containers {
 		podAdditions.Containers[idx].Env = append(podAdditions.Containers[idx].Env, commonEnv...)
@@ -187,15 +187,15 @@ func getSpecDeployment(
 			Name:      common.DeploymentName(workspace.Status.WorkspaceId),
 			Namespace: workspace.Namespace,
 			Labels: map[string]string{
-				constants.WorkspaceIDLabel: workspace.Status.WorkspaceId,
+				constants.DevWorkspaceIDLabel: workspace.Status.WorkspaceId,
 			},
 		},
 		Spec: appsv1.DeploymentSpec{
 			Replicas: &replicas,
 			Selector: &metav1.LabelSelector{
 				MatchLabels: map[string]string{
-					constants.WorkspaceIDLabel:   workspace.Status.WorkspaceId,
-					constants.WorkspaceNameLabel: workspace.Name,
+					constants.DevWorkspaceIDLabel:   workspace.Status.WorkspaceId,
+					constants.DevWorkspaceNameLabel: workspace.Name,
 				},
 			},
 			Strategy: appsv1.DeploymentStrategy{
@@ -206,8 +206,8 @@ func getSpecDeployment(
 					Name:      workspace.Status.WorkspaceId,
 					Namespace: workspace.Namespace,
 					Labels: map[string]string{
-						constants.WorkspaceIDLabel:   workspace.Status.WorkspaceId,
-						constants.WorkspaceNameLabel: workspace.Name,
+						constants.DevWorkspaceIDLabel:   workspace.Status.WorkspaceId,
+						constants.DevWorkspaceNameLabel: workspace.Name,
 					},
 				},
 				Spec: corev1.PodSpec{
@@ -241,18 +241,18 @@ func getSpecDeployment(
 		}
 	}
 
-	workspaceCreator, present := workspace.Labels[constants.WorkspaceCreatorLabel]
+	workspaceCreator, present := workspace.Labels[constants.DevWorkspaceCreatorLabel]
 	if present {
-		deployment.Labels[constants.WorkspaceCreatorLabel] = workspaceCreator
-		deployment.Spec.Template.Labels[constants.WorkspaceCreatorLabel] = workspaceCreator
+		deployment.Labels[constants.DevWorkspaceCreatorLabel] = workspaceCreator
+		deployment.Spec.Template.Labels[constants.DevWorkspaceCreatorLabel] = workspaceCreator
 	} else {
 		return nil, errors.New("workspace must have creator specified to be run. Recreate it to fix an issue")
 	}
 
-	restrictedAccess, present := workspace.Annotations[constants.WorkspaceRestrictedAccessAnnotation]
+	restrictedAccess, present := workspace.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]
 	if present {
-		deployment.Annotations = maputils.Append(deployment.Annotations, constants.WorkspaceRestrictedAccessAnnotation, restrictedAccess)
-		deployment.Spec.Template.Annotations = maputils.Append(deployment.Spec.Template.Annotations, constants.WorkspaceRestrictedAccessAnnotation, restrictedAccess)
+		deployment.Annotations = maputils.Append(deployment.Annotations, constants.DevWorkspaceRestrictedAccessAnnotation, restrictedAccess)
+		deployment.Spec.Template.Annotations = maputils.Append(deployment.Spec.Template.Annotations, constants.DevWorkspaceRestrictedAccessAnnotation, restrictedAccess)
 	}
 
 	err = controllerutil.SetControllerReference(workspace, deployment, scheme)
diff --git a/controllers/workspace/provision/routing.go b/controllers/workspace/provision/routing.go
@@ -148,8 +148,8 @@ func getSpecRouting(
 	}
 
 	var annotations map[string]string
-	if val, ok := workspace.Annotations[constants.WorkspaceRestrictedAccessAnnotation]; ok {
-		annotations = maputils.Append(annotations, constants.WorkspaceRestrictedAccessAnnotation, val)
+	if val, ok := workspace.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]; ok {
+		annotations = maputils.Append(annotations, constants.DevWorkspaceRestrictedAccessAnnotation, val)
 	}
 
 	// copy the annotations for the specific routingClass from the workspace object to the routing
@@ -170,7 +170,7 @@ func getSpecRouting(
 			Name:      fmt.Sprintf("routing-%s", workspace.Status.WorkspaceId),
 			Namespace: workspace.Namespace,
 			Labels: map[string]string{
-				constants.WorkspaceIDLabel: workspace.Status.WorkspaceId,
+				constants.DevWorkspaceIDLabel: workspace.Status.WorkspaceId,
 			},
 			Annotations: annotations,
 		},
@@ -180,7 +180,7 @@ func getSpecRouting(
 			RoutingSuffix: config.ControllerCfg.GetRoutingSuffix(),
 			Endpoints:     endpoints,
 			PodSelector: map[string]string{
-				constants.WorkspaceIDLabel: workspace.Status.WorkspaceId,
+				constants.DevWorkspaceIDLabel: workspace.Status.WorkspaceId,
 			},
 		},
 	}
diff --git a/controllers/workspace/status.go b/controllers/workspace/status.go
@@ -160,7 +160,7 @@ var PhaseStatusesOrder = []PhaseStatus{
 	},
 	{
 		devworkspace.WorkspaceRoutingReady,
-		"Waiting for workspace routing objects",
+		"Waiting for devworkspace routing objects",
 	},
 	{
 		devworkspace.WorkspaceServiceAccountReady,
diff --git a/controllers/workspace/validation.go b/controllers/workspace/validation.go
@@ -27,7 +27,7 @@ import (
 //
 // If error is not nil, a user-readable message is returned that can be propagated to the user to explain the issue.
 func (r *DevWorkspaceReconciler) validateCreatorLabel(workspace *devworkspace.DevWorkspace) (msg string, err error) {
-	if _, present := workspace.Labels[constants.WorkspaceCreatorLabel]; !present {
+	if _, present := workspace.Labels[constants.DevWorkspaceCreatorLabel]; !present {
 		return "DevWorkspace was created without creator ID label. It must be recreated to resolve the issue",
 			fmt.Errorf("devworkspace does not have creator label applied")
 	}
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -35,30 +35,30 @@ const (
 	SidecarDefaultMemoryLimit = "128M"
 	PVCStorageSize            = "1Gi"
 
-	// WorkspaceIDLabel is label key to store workspace identifier
-	WorkspaceIDLabel = "controller.devfile.io/devworkspace_id"
+	// DevWorkspaceIDLabel is label key to store workspace identifier
+	DevWorkspaceIDLabel = "controller.devfile.io/devworkspace_id"
+
+	// DevWorkspaceNameLabel is label key to store workspace name
+	DevWorkspaceNameLabel = "controller.devfile.io/devworkspace_name"
 
 	// WorkspaceIDLoggerKey is the key used to log workspace ID in the reconcile
 	WorkspaceIDLoggerKey = "workspace_id"
 
 	// WorkspaceEndpointNameAnnotation is the annotation key for storing an endpoint's name from the devfile representation
 	WorkspaceEndpointNameAnnotation = "controller.devfile.io/endpoint_name"
 
-	// WorkspaceNameLabel is label key to store workspace name
-	WorkspaceNameLabel = "controller.devfile.io/devworkspace_name"
-
 	// PullSecretLabel marks the intention that secret should be used as pull secret for devworkspaces withing namespace
 	// Only secrets with 'true' value will be mount as pull secret
 	// Should be assigned to secrets with type docker config types (kubernetes.io/dockercfg and kubernetes.io/dockerconfigjson)
 	DevWorkspacePullSecretLabel = "controller.devfile.io/devworkspace_pullsecret"
 
-	// WorkspaceCreatorLabel is the label key for storing the UID of the user who created the workspace
-	WorkspaceCreatorLabel = "controller.devfile.io/creator"
+	// DevWorkspaceCreatorLabel is the label key for storing the UID of the user who created the workspace
+	DevWorkspaceCreatorLabel = "controller.devfile.io/creator"
 
-	// WorkspaceRestrictedAccessAnnotation marks the intention that workspace access is restricted to only the creator; setting this
+	// DevWorkspaceRestrictedAccessAnnotation marks the intention that workspace access is restricted to only the creator; setting this
 	// annotation will cause workspace start to fail if webhooks are disabled.
 	// Operator also propagates it to the workspace-related objects to perform authorization.
-	WorkspaceRestrictedAccessAnnotation = "controller.devfile.io/restricted-access"
+	DevWorkspaceRestrictedAccessAnnotation = "controller.devfile.io/restricted-access"
 
 	// WorkspaceDiscoverableServiceAnnotation marks a service in a workspace as created for a discoverable endpoint,
 	// as opposed to a service created to support the workspace itself.
@@ -67,9 +67,9 @@ const (
 	// ControllerServiceAccountNameEnvVar stores the name of the serviceaccount used in the controller.
 	ControllerServiceAccountNameEnvVar = "CONTROLLER_SERVICE_ACCOUNT_NAME"
 
-	// WorkspaceStopReasonAnnotation marks the reason why the workspace was stopped; when a workspace is restarted
+	// DevWorkspaceStopReasonAnnotation marks the reason why the workspace was stopped; when a workspace is restarted
 	// this annotation will be cleared
-	WorkspaceStopReasonAnnotation = "controller.devfile.io/stopped-by"
+	DevWorkspaceStopReasonAnnotation = "controller.devfile.io/stopped-by"
 
 	// PVCCleanupPodMemoryLimit is the memory limit used for PVC clean up pods
 	PVCCleanupPodMemoryLimit = "100Mi"
diff --git a/webhook/workspace/handler/exec.go b/webhook/workspace/handler/exec.go
@@ -35,17 +35,17 @@ func (h *WebhookHandler) ValidateExecOnConnect(ctx context.Context, req admissio
 		return admission.Errored(http.StatusInternalServerError, err)
 	}
 
-	_, ok := p.Labels[constants.WorkspaceIDLabel]
+	_, ok := p.Labels[constants.DevWorkspaceIDLabel]
 	if !ok {
 		return admission.Allowed("It's not workspace related pod")
 	}
 
-	creator, ok := p.Labels[constants.WorkspaceCreatorLabel]
+	creator, ok := p.Labels[constants.DevWorkspaceCreatorLabel]
 	if !ok {
 		return admission.Denied("The workspace info is missing in the workspace-related pod")
 	}
 
-	if p.Annotations[constants.WorkspaceRestrictedAccessAnnotation] == "true" &&
+	if p.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation] == "true" &&
 		creator != req.UserInfo.UID {
 		return admission.Denied("The only workspace creator has exec access")
 	}
diff --git a/webhook/workspace/handler/immutable.go b/webhook/workspace/handler/immutable.go
diff --git a/webhook/workspace/handler/metadata.go b/webhook/workspace/handler/metadata.go
diff --git a/webhook/workspace/handler/workspace.go b/webhook/workspace/handler/workspace.go
diff --git a/webhook/workspace/mutating_cfg.go b/webhook/workspace/mutating_cfg.go

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func syncOAuthClient(client client.Client, routing *controllerv1alpha1.Workspace`
`93`	`93`
`94`	`94`	`func getClusterOAuthClients(cl client.Client, routing *controllerv1alpha1.WorkspaceRouting) ([]oauthv1.OAuthClient, error) {`
`95`	`95`	`found := &oauthv1.OAuthClientList{}`
`96`		`- labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.WorkspaceIDLabel, routing.Spec.WorkspaceId))`
	`96`	`+ labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))`
`97`	`97`	`if err != nil {`
`98`	`98`	`return nil, err`
`99`	`99`	`}`
`@@ -109,7 +109,7 @@ func getClusterOAuthClients(cl client.Client, routing *controllerv1alpha1.Worksp`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`func deleteOAuthClients(cl client.Client, routing *controllerv1alpha1.WorkspaceRouting) error {`
`112`		`- labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.WorkspaceIDLabel, routing.Spec.WorkspaceId))`
	`112`	`+ labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))`
`113`	`113`	`if err != nil {`
`114`	`114`	`return err`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func (r WorkspaceRoutingReconciler) syncIngresses(routing controllerv1alpha1.W`
`76`	`76`
`77`	`77`	`func (r WorkspaceRoutingReconciler) getClusterIngresses(routing controllerv1alpha1.WorkspaceRouting) ([]v1beta1.Ingress, error) {`
`78`	`78`	`found := &v1beta1.IngressList{}`
`79`		`- labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.WorkspaceIDLabel, routing.Spec.WorkspaceId))`
	`79`	`+ labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))`
`80`	`80`	`if err != nil {`
`81`	`81`	`return nil, err`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (r WorkspaceRoutingReconciler) syncRoutes(routing controllerv1alpha1.Work`
`78`	`78`
`79`	`79`	`func (r WorkspaceRoutingReconciler) getClusterRoutes(routing controllerv1alpha1.WorkspaceRouting) ([]routeV1.Route, error) {`
`80`	`80`	`found := &routeV1.RouteList{}`
`81`		`- labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.WorkspaceIDLabel, routing.Spec.WorkspaceId))`
	`81`	`+ labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))`
`82`	`82`	`if err != nil {`
`83`	`83`	`return nil, err`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func (r WorkspaceRoutingReconciler) syncServices(routing controllerv1alpha1.Wo`
`83`	`83`
`84`	`84`	`func (r WorkspaceRoutingReconciler) getClusterServices(routing controllerv1alpha1.WorkspaceRouting) ([]corev1.Service, error) {`
`85`	`85`	`found := &corev1.ServiceList{}`
`86`		`- labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.WorkspaceIDLabel, routing.Spec.WorkspaceId))`
	`86`	`+ labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))`
`87`	`87`	`if err != nil {`
`88`	`88`	`return nil, err`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func (r *WorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e`
`118`	`118`	`RoutingSuffix: instance.Spec.RoutingSuffix,`
`119`	`119`	`}`
`120`	`120`
`121`		`- restrictedAccess, setRestrictedAccess := instance.Annotations[constants.WorkspaceRestrictedAccessAnnotation]`
	`121`	`+ restrictedAccess, setRestrictedAccess := instance.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]`
`122`	`122`	`routingObjects, err := solver.GetSpecObjects(instance, workspaceMeta)`
`123`	`123`	`if err != nil {`
`124`	`124`	`var notReady *solvers.RoutingNotReady`
`@@ -148,7 +148,7 @@ func (r *WorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e`
`148`	`148`	`return reconcile.Result{}, err`
`149`	`149`	`}`
`150`	`150`	`if setRestrictedAccess {`
`151`		`- services[idx].Annotations = maputils.Append(services[idx].Annotations, constants.WorkspaceRestrictedAccessAnnotation, restrictedAccess)`
	`151`	`+ services[idx].Annotations = maputils.Append(services[idx].Annotations, constants.DevWorkspaceRestrictedAccessAnnotation, restrictedAccess)`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`ingresses := routingObjects.Ingresses`
`@@ -158,7 +158,7 @@ func (r *WorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e`
`158`	`158`	`return reconcile.Result{}, err`
`159`	`159`	`}`
`160`	`160`	`if setRestrictedAccess {`
`161`		`- ingresses[idx].Annotations = maputils.Append(ingresses[idx].Annotations, constants.WorkspaceRestrictedAccessAnnotation, restrictedAccess)`
	`161`	`+ ingresses[idx].Annotations = maputils.Append(ingresses[idx].Annotations, constants.DevWorkspaceRestrictedAccessAnnotation, restrictedAccess)`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`routes := routingObjects.Routes`
`@@ -168,7 +168,7 @@ func (r *WorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e`
`168`	`168`	`return reconcile.Result{}, err`
`169`	`169`	`}`
`170`	`170`	`if setRestrictedAccess {`
`171`		`- routes[idx].Annotations = maputils.Append(routes[idx].Annotations, constants.WorkspaceRestrictedAccessAnnotation, restrictedAccess)`
	`171`	`+ routes[idx].Annotations = maputils.Append(routes[idx].Annotations, constants.DevWorkspaceRestrictedAccessAnnotation, restrictedAccess)`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ct`
`141`	`141`	`return r.updateWorkspaceStatus(clusterWorkspace, reqLogger, &reconcileStatus, reconcileResult, err)`
`142`	`142`	`}()`
`143`	`143`
`144`		`- if workspace.Annotations[constants.WorkspaceRestrictedAccessAnnotation] == "true" {`
	`144`	`+ if workspace.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation] == "true" {`
`145`	`145`	`msg, err := r.validateCreatorLabel(clusterWorkspace)`
`146`	`146`	`if err != nil {`
`147`	`147`	`reconcileStatus.Phase = devworkspace.WorkspaceStatusFailed`
`@@ -150,8 +150,8 @@ func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ct`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`153`		`- if _, ok := clusterWorkspace.Annotations[constants.WorkspaceStopReasonAnnotation]; ok {`
`154`		`- delete(clusterWorkspace.Annotations, constants.WorkspaceStopReasonAnnotation)`
	`153`	`+ if _, ok := clusterWorkspace.Annotations[constants.DevWorkspaceStopReasonAnnotation]; ok {`
	`154`	`+ delete(clusterWorkspace.Annotations, constants.DevWorkspaceStopReasonAnnotation)`
`155`	`155`	`err = r.Update(context.TODO(), clusterWorkspace)`
`156`	`156`	`return reconcile.Result{Requeue: true}, err`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,10 +149,10 @@ func (r DevWorkspaceReconciler) getSpecCleanupJob(workspace devworkspace.DevWo`
`149`	`149`	`workspaceId := workspace.Status.WorkspaceId`
`150`	`150`	`pvcName := config.ControllerCfg.GetWorkspacePVCName()`
`151`	`151`	`jobLabels := map[string]string{`
`152`		`- constants.WorkspaceIDLabel: workspaceId,`
	`152`	`+ constants.DevWorkspaceIDLabel: workspaceId,`
`153`	`153`	`}`
`154`		`- if restrictedAccess, needsRestrictedAccess := workspace.Annotations[constants.WorkspaceRestrictedAccessAnnotation]; needsRestrictedAccess {`
`155`		`- jobLabels[constants.WorkspaceRestrictedAccessAnnotation] = restrictedAccess`
	`154`	`+ if restrictedAccess, needsRestrictedAccess := workspace.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]; needsRestrictedAccess {`
	`155`	`+ jobLabels[constants.DevWorkspaceRestrictedAccessAnnotation] = restrictedAccess`
`156`	`156`	`}`
`157`	`157`	`job := &batchv1.Job{`
`158`	`158`	`ObjectMeta: metav1.ObjectMeta{`