Skip to content

Commit d1e89b7

Browse files
amisevskamisevsk
committed
Fixup: more instances of workspace -> devworkspace
Signed-off-by: Angel Misevski <[email protected]>
1 parent 877d56f commit d1e89b7

27 files changed

+84
-84
lines changed

‎apis/controller/v1alpha1/component.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type ComponentDescription struct {
2727
}
2828

2929
type ComponentMetadata struct {
30-
// Containers is a map of container names to ContainerDescriptions. Field is serialized into workspace status "additionalFields"
30+
// Containers is a map of container names to ContainerDescriptions. Field is serialized into devworkspace status "additionalFields"
3131
// and consumed by che-rest-apis
3232
Containers map[string]ContainerDescription `json:"containers,omitempty"`
3333
// ContributedRuntimeCommands represent the devfile commands available in the current workspace. They are serialized into the

‎apis/controller/v1alpha1/devworkspacerouting_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
// DevWorkspaceRoutingSpec defines the desired state of DevWorkspaceRouting
2222
// +k8s:openapi-gen=true
2323
type DevWorkspaceRoutingSpec struct {
24-
// WorkspaceId for the workspace being routed
25-
WorkspaceId string `json:"workspaceId"`
24+
// DevWorkspaceId for the workspace being routed
25+
DevWorkspaceId string `json:"devworkspaceId"`
2626
// Class of the routing: this drives which Workspace Routing controller will manage this routing
2727
RoutingClass DevWorkspaceRoutingClass `json:"routingClass,omitempty"`
2828
// Routing suffix for cluster

‎controllers/controller/devworkspacerouting/devworkspacerouting_controller.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ func (r *DevWorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result
7878
// Error reading the object - requeue the request.
7979
return reconcile.Result{}, err
8080
}
81-
reqLogger = reqLogger.WithValues(constants.WorkspaceIDLoggerKey, instance.Spec.WorkspaceId)
81+
reqLogger = reqLogger.WithValues(constants.WorkspaceIDLoggerKey, instance.Spec.DevWorkspaceId)
8282
reqLogger.Info("Reconciling DevWorkspaceRouting")
8383

8484
if instance.Spec.RoutingClass == "" {
85-
reqLogger.Info("workspace routing without an explicit routing class is invalid", "name", instance.Name, "namespace", instance.Namespace)
85+
reqLogger.Info("DevWorkspaceRouting without an explicit routing class is invalid", "name", instance.Name, "namespace", instance.Namespace)
8686
return reconcile.Result{}, r.markRoutingFailed(instance)
8787
}
8888

@@ -91,7 +91,7 @@ func (r *DevWorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result
9191
if errors.Is(err, solvers.RoutingNotSupported) {
9292
return reconcile.Result{}, nil
9393
}
94-
reqLogger.Error(err, "Invalid routing class for workspace")
94+
reqLogger.Error(err, "Invalid routing class for DevWorkspace")
9595
return reconcile.Result{}, r.markRoutingFailed(instance)
9696
}
9797

@@ -112,10 +112,10 @@ func (r *DevWorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result
112112
}
113113

114114
workspaceMeta := solvers.WorkspaceMetadata{
115-
WorkspaceId: instance.Spec.WorkspaceId,
116-
Namespace: instance.Namespace,
117-
PodSelector: instance.Spec.PodSelector,
118-
RoutingSuffix: instance.Spec.RoutingSuffix,
115+
DevWorkspaceId: instance.Spec.DevWorkspaceId,
116+
Namespace: instance.Namespace,
117+
PodSelector: instance.Spec.PodSelector,
118+
RoutingSuffix: instance.Spec.RoutingSuffix,
119119
}
120120

121121
restrictedAccess, setRestrictedAccess := instance.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]
@@ -127,7 +127,7 @@ func (r *DevWorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result
127127
if duration.Milliseconds() == 0 {
128128
duration = 1 * time.Second
129129
}
130-
reqLogger.Info("controller not ready for workspace routing. Retrying", "DelayMs", duration.Milliseconds())
130+
reqLogger.Info("controller not ready for DevWorkspace. Retrying", "DelayMs", duration.Milliseconds())
131131
return reconcile.Result{RequeueAfter: duration}, nil
132132
}
133133

‎controllers/controller/devworkspacerouting/solvers/common.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
)
2828

2929
type WorkspaceMetadata struct {
30-
WorkspaceId string
31-
Namespace string
32-
PodSelector map[string]string
33-
RoutingSuffix string
30+
DevWorkspaceId string
31+
Namespace string
32+
PodSelector map[string]string
33+
RoutingSuffix string
3434
}
3535

3636
// GetDiscoverableServicesForEndpoints converts the endpoint list into a set of services, each corresponding to a single discoverable
@@ -58,7 +58,7 @@ func GetDiscoverableServicesForEndpoints(endpoints map[string]controllerv1alpha1
5858
Name: common.EndpointName(endpoint.Name),
5959
Namespace: meta.Namespace,
6060
Labels: map[string]string{
61-
constants.DevWorkspaceIDLabel: meta.WorkspaceId,
61+
constants.DevWorkspaceIDLabel: meta.DevWorkspaceId,
6262
},
6363
Annotations: map[string]string{
6464
constants.WorkspaceDiscoverableServiceAnnotation: "true",
@@ -124,10 +124,10 @@ func GetServiceForEndpoints(endpoints map[string]controllerv1alpha1.EndpointList
124124

125125
return &corev1.Service{
126126
ObjectMeta: metav1.ObjectMeta{
127-
Name: common.ServiceName(meta.WorkspaceId),
127+
Name: common.ServiceName(meta.DevWorkspaceId),
128128
Namespace: meta.Namespace,
129129
Labels: map[string]string{
130-
constants.DevWorkspaceIDLabel: meta.WorkspaceId,
130+
constants.DevWorkspaceIDLabel: meta.DevWorkspaceId,
131131
},
132132
},
133133
Spec: corev1.ServiceSpec{
@@ -184,23 +184,23 @@ func getRouteForEndpoint(endpoint devworkspace.Endpoint, meta WorkspaceMetadata)
184184
endpointName := common.EndpointName(endpoint.Name)
185185
return routeV1.Route{
186186
ObjectMeta: metav1.ObjectMeta{
187-
Name: common.RouteName(meta.WorkspaceId, endpointName),
187+
Name: common.RouteName(meta.DevWorkspaceId, endpointName),
188188
Namespace: meta.Namespace,
189189
Labels: map[string]string{
190-
constants.DevWorkspaceIDLabel: meta.WorkspaceId,
190+
constants.DevWorkspaceIDLabel: meta.DevWorkspaceId,
191191
},
192192
Annotations: routeAnnotations(endpointName),
193193
},
194194
Spec: routeV1.RouteSpec{
195-
Host: common.WorkspaceHostname(meta.WorkspaceId, meta.RoutingSuffix),
195+
Host: common.WorkspaceHostname(meta.DevWorkspaceId, meta.RoutingSuffix),
196196
Path: common.EndpointPath(endpointName),
197197
TLS: &routeV1.TLSConfig{
198198
InsecureEdgeTerminationPolicy: routeV1.InsecureEdgeTerminationPolicyRedirect,
199199
Termination: routeV1.TLSTerminationEdge,
200200
},
201201
To: routeV1.RouteTargetReference{
202202
Kind: "Service",
203-
Name: common.ServiceName(meta.WorkspaceId),
203+
Name: common.ServiceName(meta.DevWorkspaceId),
204204
},
205205
Port: &routeV1.RoutePort{
206206
TargetPort: targetEndpoint,
@@ -212,14 +212,14 @@ func getRouteForEndpoint(endpoint devworkspace.Endpoint, meta WorkspaceMetadata)
212212
func getIngressForEndpoint(endpoint devworkspace.Endpoint, meta WorkspaceMetadata) v1beta1.Ingress {
213213
targetEndpoint := intstr.FromInt(endpoint.TargetPort)
214214
endpointName := common.EndpointName(endpoint.Name)
215-
hostname := common.EndpointHostname(meta.WorkspaceId, endpointName, endpoint.TargetPort, meta.RoutingSuffix)
215+
hostname := common.EndpointHostname(meta.DevWorkspaceId, endpointName, endpoint.TargetPort, meta.RoutingSuffix)
216216
ingressPathType := v1beta1.PathTypeImplementationSpecific
217217
return v1beta1.Ingress{
218218
ObjectMeta: metav1.ObjectMeta{
219-
Name: common.RouteName(meta.WorkspaceId, endpointName),
219+
Name: common.RouteName(meta.DevWorkspaceId, endpointName),
220220
Namespace: meta.Namespace,
221221
Labels: map[string]string{
222-
constants.DevWorkspaceIDLabel: meta.WorkspaceId,
222+
constants.DevWorkspaceIDLabel: meta.DevWorkspaceId,
223223
},
224224
Annotations: nginxIngressAnnotations(endpoint.Name),
225225
},
@@ -232,7 +232,7 @@ func getIngressForEndpoint(endpoint devworkspace.Endpoint, meta WorkspaceMetadat
232232
Paths: []v1beta1.HTTPIngressPath{
233233
{
234234
Backend: v1beta1.IngressBackend{
235-
ServiceName: common.ServiceName(meta.WorkspaceId),
235+
ServiceName: common.ServiceName(meta.DevWorkspaceId),
236236
ServicePort: targetEndpoint,
237237
},
238238
PathType: &ingressPathType,

‎controllers/controller/devworkspacerouting/solvers/oauth_proxy_container.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
)
2525

2626
func getProxyPodAdditions(proxyEndpoints map[string]proxyEndpoint, meta WorkspaceMetadata) *controllerv1alpha1.PodAdditions {
27-
tlsSecretVolume := buildSecretVolume(common.OAuthProxySecretName(meta.WorkspaceId))
27+
tlsSecretVolume := buildSecretVolume(common.OAuthProxySecretName(meta.DevWorkspaceId))
2828
var proxyContainers []corev1.Container
2929
for _, proxyEndpoint := range proxyEndpoints {
3030
proxyContainers = append(proxyContainers, getProxyContainerForEndpoint(proxyEndpoint, tlsSecretVolume, meta))
@@ -79,7 +79,7 @@ func getProxyContainerForEndpoint(proxyEndpoint proxyEndpoint, tlsProxyVolume co
7979
"--tls-cert=/etc/tls/private/tls.crt",
8080
"--tls-key=/etc/tls/private/tls.key",
8181
"--cookie-secret=0123456789abcdefabcd",
82-
"--client-id=" + meta.WorkspaceId + "-oauth-client",
82+
"--client-id=" + meta.DevWorkspaceId + "-oauth-client",
8383
"--client-secret=1234567890",
8484
"--pass-user-bearer-token=false",
8585
"--pass-access-token=true",

‎controllers/controller/devworkspacerouting/solvers/openshift_oauth_solver.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (s *OpenShiftOAuthSolver) GetSpecObjects(routing *controllerv1alpha1.DevWor
7373
proxyServices := getServicesForEndpoints(proxyPorts, workspaceMeta)
7474
for idx := range proxyServices {
7575
proxyServices[idx].Annotations = map[string]string{
76-
"service.alpha.openshift.io/serving-cert-secret-name": common.OAuthProxySecretName(workspaceMeta.WorkspaceId),
76+
"service.alpha.openshift.io/serving-cert-secret-name": common.OAuthProxySecretName(workspaceMeta.DevWorkspaceId),
7777
}
7878
}
7979
discoverableServices := GetDiscoverableServicesForEndpoints(proxyPorts, workspaceMeta)
@@ -88,9 +88,9 @@ func (s *OpenShiftOAuthSolver) GetSpecObjects(routing *controllerv1alpha1.DevWor
8888

8989
oauthClient := &oauthv1.OAuthClient{
9090
ObjectMeta: metav1.ObjectMeta{
91-
Name: workspaceMeta.WorkspaceId + "-oauth-client",
91+
Name: workspaceMeta.DevWorkspaceId + "-oauth-client",
9292
Labels: map[string]string{
93-
constants.DevWorkspaceIDLabel: workspaceMeta.WorkspaceId,
93+
constants.DevWorkspaceIDLabel: workspaceMeta.DevWorkspaceId,
9494
},
9595
},
9696
GrantMethod: oauthv1.GrantHandlerPrompt,
@@ -141,7 +141,7 @@ func (s *OpenShiftOAuthSolver) getProxyRoutes(
141141
InsecureEdgeTerminationPolicy: routeV1.InsecureEdgeTerminationPolicyRedirect,
142142
}
143143
// Reverting single host feature since OpenShift OAuth uses absolute references
144-
route.Spec.Host = common.EndpointHostname(workspaceMeta.WorkspaceId, endpoint.Name, endpoint.TargetPort, workspaceMeta.RoutingSuffix)
144+
route.Spec.Host = common.EndpointHostname(workspaceMeta.DevWorkspaceId, endpoint.Name, endpoint.TargetPort, workspaceMeta.RoutingSuffix)
145145
route.Spec.Path = "/"
146146

147147
//override the original endpointName

‎controllers/controller/devworkspacerouting/solvers/sync_oauthclients.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func syncOAuthClient(client client.Client, routing *controllerv1alpha1.DevWorksp
9393

9494
func getClusterOAuthClients(cl client.Client, routing *controllerv1alpha1.DevWorkspaceRouting) ([]oauthv1.OAuthClient, error) {
9595
found := &oauthv1.OAuthClientList{}
96-
labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))
96+
labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.DevWorkspaceId))
9797
if err != nil {
9898
return nil, err
9999
}
@@ -109,7 +109,7 @@ func getClusterOAuthClients(cl client.Client, routing *controllerv1alpha1.DevWor
109109
}
110110

111111
func deleteOAuthClients(cl client.Client, routing *controllerv1alpha1.DevWorkspaceRouting) error {
112-
labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))
112+
labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.DevWorkspaceId))
113113
if err != nil {
114114
return err
115115
}

‎controllers/controller/devworkspacerouting/sync_ingresses.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func (r *DevWorkspaceRoutingReconciler) syncIngresses(routing *controllerv1alpha
7676

7777
func (r *DevWorkspaceRoutingReconciler) getClusterIngresses(routing *controllerv1alpha1.DevWorkspaceRouting) ([]v1beta1.Ingress, error) {
7878
found := &v1beta1.IngressList{}
79-
labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))
79+
labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.DevWorkspaceId))
8080
if err != nil {
8181
return nil, err
8282
}

‎controllers/controller/devworkspacerouting/sync_routes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (r *DevWorkspaceRoutingReconciler) syncRoutes(routing *controllerv1alpha1.D
7878

7979
func (r *DevWorkspaceRoutingReconciler) getClusterRoutes(routing *controllerv1alpha1.DevWorkspaceRouting) ([]routeV1.Route, error) {
8080
found := &routeV1.RouteList{}
81-
labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))
81+
labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.DevWorkspaceId))
8282
if err != nil {
8383
return nil, err
8484
}

‎controllers/controller/devworkspacerouting/sync_services.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (r *DevWorkspaceRoutingReconciler) syncServices(routing *controllerv1alpha1
8383

8484
func (r *DevWorkspaceRoutingReconciler) getClusterServices(routing *controllerv1alpha1.DevWorkspaceRouting) ([]corev1.Service, error) {
8585
found := &corev1.ServiceList{}
86-
labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.WorkspaceId))
86+
labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.DevWorkspaceId))
8787
if err != nil {
8888
return nil, err
8989
}

‎controllers/workspace/devworkspace_controller.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ct
103103
return reconcile.Result{}, err
104104
}
105105
reqLogger = reqLogger.WithValues(constants.WorkspaceIDLoggerKey, workspace.Status.WorkspaceId)
106-
reqLogger.Info("Reconciling Workspace")
106+
reqLogger.Info("Reconciling DevWorkspace")
107107

108108
// Check if the DevWorkspaceRouting instance is marked to be deleted, which is
109109
// indicated by the deletion timestamp being set.
@@ -224,7 +224,7 @@ func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ct
224224
reqLogger.Info("DevWorkspace start failed")
225225
reconcileStatus.Phase = devworkspace.WorkspaceStatusFailed
226226
// TODO: Propagate failure reason from devWorkspaceRouting
227-
reconcileStatus.Conditions[devworkspace.WorkspaceFailedStart] = "Failed to install network objects required for devworkspace"
227+
reconcileStatus.Conditions[devworkspace.WorkspaceFailedStart] = "Failed to install network objects required for DevWorkspace"
228228
return reconcile.Result{}, routingStatus.Err
229229
}
230230
reqLogger.Info("Waiting on routing to be ready")
@@ -238,7 +238,7 @@ func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ct
238238
return reconcile.Result{}, err
239239
}
240240
if !statusOk {
241-
reqLogger.Info("Updating workspace status")
241+
reqLogger.Info("Updating devworkspace status")
242242
return reconcile.Result{Requeue: true}, nil
243243
}
244244

@@ -276,7 +276,7 @@ func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ct
276276
serviceAcctStatus := provision.SyncServiceAccount(workspace, saAnnotations, clusterAPI)
277277
if !serviceAcctStatus.Continue {
278278
// FailStartup is not possible for generating the serviceaccount
279-
reqLogger.Info("Waiting for workspace ServiceAccount")
279+
reqLogger.Info("Waiting for DevWorkspace ServiceAccount")
280280
return reconcile.Result{Requeue: serviceAcctStatus.Requeue}, serviceAcctStatus.Err
281281
}
282282
serviceAcctName := serviceAcctStatus.ServiceAccountName
@@ -294,7 +294,7 @@ func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ct
294294
deploymentStatus := provision.SyncDeploymentToCluster(workspace, allPodAdditions, serviceAcctName, clusterAPI)
295295
if !deploymentStatus.Continue {
296296
if deploymentStatus.FailStartup {
297-
reqLogger.Info("Workspace start failed")
297+
reqLogger.Info("DevWorkspace start failed")
298298
reconcileStatus.Phase = devworkspace.WorkspaceStatusFailed
299299
reconcileStatus.Conditions[devworkspace.WorkspaceFailedStart] = fmt.Sprintf("Devworkspace spec is invalid: %s", deploymentStatus.Err)
300300
return reconcile.Result{}, deploymentStatus.Err
@@ -337,7 +337,7 @@ func (r *DevWorkspaceReconciler) stopWorkspace(workspace *devworkspace.DevWorksp
337337
status.Phase = devworkspace.WorkspaceStatusStopping
338338
replicas := workspaceDeployment.Spec.Replicas
339339
if replicas == nil || *replicas > 0 {
340-
logger.Info("Stopping workspace")
340+
logger.Info("Stopping DevWorkspace")
341341
patch := client.MergeFrom(workspaceDeployment.DeepCopy())
342342
var replicasZero int32 = 0
343343
workspaceDeployment.Spec.Replicas = &replicasZero
@@ -349,7 +349,7 @@ func (r *DevWorkspaceReconciler) stopWorkspace(workspace *devworkspace.DevWorksp
349349
}
350350

351351
if workspaceDeployment.Status.Replicas == 0 {
352-
logger.Info("Workspace stopped")
352+
logger.Info("DevWorkspace stopped")
353353
status.Phase = devworkspace.WorkspaceStatusStopped
354354
}
355355
return r.updateWorkspaceStatus(workspace, logger, status, reconcile.Result{}, nil)
@@ -368,7 +368,7 @@ func (r *DevWorkspaceReconciler) syncTimingToCluster(
368368
}
369369
if err := r.Update(ctx, workspace); err != nil {
370370
if k8sErrors.IsConflict(err) {
371-
reqLogger.Info("Got conflict when trying to apply timing annotations to workspace")
371+
reqLogger.Info("Got conflict when trying to apply timing annotations to devworkspace")
372372
} else {
373373
reqLogger.Error(err, "Error trying to apply timing annotations to devworkspace")
374374
}

‎controllers/workspace/provision/deployment.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ func getSpecDeployment(
246246
deployment.Labels[constants.DevWorkspaceCreatorLabel] = workspaceCreator
247247
deployment.Spec.Template.Labels[constants.DevWorkspaceCreatorLabel] = workspaceCreator
248248
} else {
249-
return nil, errors.New("workspace must have creator specified to be run. Recreate it to fix an issue")
249+
return nil, errors.New("DevWorkspace must have creator specified to be run. Recreate it to fix an issue")
250250
}
251251

252252
restrictedAccess, present := workspace.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]
@@ -297,31 +297,31 @@ func mergePodAdditions(toMerge []v1alpha1.PodAdditions) (*v1alpha1.PodAdditions,
297297
}
298298
for _, container := range additions.Containers {
299299
if containerNames[container.Name] {
300-
return nil, fmt.Errorf("duplicate containers in the workspace definition: %s", container.Name)
300+
return nil, fmt.Errorf("duplicate containers in the DevWorkspace definition: %s", container.Name)
301301
}
302302
containerNames[container.Name] = true
303303
podAdditions.Containers = append(podAdditions.Containers, container)
304304
}
305305

306306
for _, container := range additions.InitContainers {
307307
if initContainerNames[container.Name] {
308-
return nil, fmt.Errorf("duplicate init containers in the workspace definition: %s", container.Name)
308+
return nil, fmt.Errorf("duplicate init containers in the DevWorkspace definition: %s", container.Name)
309309
}
310310
initContainerNames[container.Name] = true
311311
podAdditions.InitContainers = append(podAdditions.InitContainers, container)
312312
}
313313

314314
for _, volume := range additions.Volumes {
315315
if volumeNames[volume.Name] {
316-
return nil, fmt.Errorf("duplicate volumes in the workspace definition: %s", volume.Name)
316+
return nil, fmt.Errorf("duplicate volumes in the DevWorkspace definition: %s", volume.Name)
317317
}
318318
volumeNames[volume.Name] = true
319319
podAdditions.Volumes = append(podAdditions.Volumes, volume)
320320
}
321321

322322
for _, volumeMount := range additions.VolumeMounts {
323323
if volumeMountNames[volumeMount.Name] {
324-
return nil, fmt.Errorf("duplicated volumeMounts in workspace definition: %s", volumeMount.Name)
324+
return nil, fmt.Errorf("duplicated volumeMounts in DevWorkspace definition: %s", volumeMount.Name)
325325
}
326326
volumeMountNames[volumeMount.Name] = true
327327
podAdditions.VolumeMounts = append(podAdditions.VolumeMounts, volumeMount)

‎controllers/workspace/provision/rbac.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func generateRBAC(namespace string) []runtime.Object {
7575
},
7676
&rbacv1.RoleBinding{
7777
ObjectMeta: metav1.ObjectMeta{
78-
Name: constants.ServiceAccount + "-workspace",
78+
Name: constants.ServiceAccount + "-devworkspace",
7979
Namespace: namespace,
8080
},
8181
RoleRef: rbacv1.RoleRef{

‎controllers/workspace/provision/routing.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ func getSpecRouting(
175175
Annotations: annotations,
176176
},
177177
Spec: v1alpha1.DevWorkspaceRoutingSpec{
178-
WorkspaceId: workspace.Status.WorkspaceId,
179-
RoutingClass: v1alpha1.DevWorkspaceRoutingClass(routingClass),
180-
RoutingSuffix: config.ControllerCfg.GetRoutingSuffix(),
181-
Endpoints: endpoints,
178+
DevWorkspaceId: workspace.Status.WorkspaceId,
179+
RoutingClass: v1alpha1.DevWorkspaceRoutingClass(routingClass),
180+
RoutingSuffix: config.ControllerCfg.GetRoutingSuffix(),
181+
Endpoints: endpoints,
182182
PodSelector: map[string]string{
183183
constants.DevWorkspaceIDLabel: workspace.Status.WorkspaceId,
184184
},

0 commit comments

Comments
 (0)