Skip to content

Commit 55915ed

Browse files
sleshchenkosleshchenko
committed
Use devworkspace in labels
1 parent 0322bc3 commit 55915ed

File tree

17 files changed

+21
-21
lines changed

17 files changed

+21
-21
lines changed

‎internal-registry/eclipse/cloud-shell/nightly/devworkspacetemplate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
command: ["/go/bin/che-machine-exec",
1212
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
1313
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
14-
"--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
14+
"--pod-selector", "controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)",
1515
"--use-bearer-token",
1616
"--static", "/cloud-shell"]
1717
endpoints:

‎internal-registry/redhat-developer/web-terminal-dev/4.5.0/devworkspacetemplate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
command: ["/go/bin/che-machine-exec",
1111
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
1212
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
13-
"--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
13+
"--pod-selector", "controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)",
1414
"--use-bearer-token"]
1515
endpoints:
1616
- name: web-terminal

‎internal-registry/redhat-developer/web-terminal-dev/nightly/devworkspacetemplate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
command: ["/go/bin/che-machine-exec",
1111
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
1212
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
13-
"--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
13+
"--pod-selector", "controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)",
1414
"--use-bearer-token"]
1515
endpoints:
1616
- name: web-terminal

‎internal-registry/redhat-developer/web-terminal/4.5.0/devworkspacetemplate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
command: ["/go/bin/che-machine-exec",
1111
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
1212
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
13-
"--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
13+
"--pod-selector", "controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)",
1414
"--use-bearer-token",
1515
"--use-tls"]
1616
endpoints:

‎internal-registry/redhat-developer/web-terminal/nightly/devworkspacetemplate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
command: ["/go/bin/che-machine-exec",
1111
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
1212
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
13-
"--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
13+
"--pod-selector", "controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)",
1414
"--use-bearer-token",
1515
"--use-tls"]
1616
endpoints:

‎pkg/constants/constants.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const (
3636
PVCStorageSize = "1Gi"
3737

3838
// WorkspaceIDLabel is label key to store workspace identifier
39-
WorkspaceIDLabel = "controller.devfile.io/workspace_id"
39+
WorkspaceIDLabel = "controller.devfile.io/devworkspace_id"
4040

4141
// WorkspaceIDLoggerKey is the key used to log workspace ID in the reconcile
4242
WorkspaceIDLoggerKey = "workspace_id"
@@ -45,7 +45,7 @@ const (
4545
WorkspaceEndpointNameAnnotation = "controller.devfile.io/endpoint_name"
4646

4747
// WorkspaceNameLabel is label key to store workspace name
48-
WorkspaceNameLabel = "controller.devfile.io/workspace_name"
48+
WorkspaceNameLabel = "controller.devfile.io/devworkspace_name"
4949

5050
// PullSecretLabel marks the intention that secret should be used as pull secret for devworkspaces withing namespace
5151
// Only secrets with 'true' value will be mount as pull secret

‎pkg/library/flatten/testdata/k8s-ref/already-flattened.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ input:
1919
command: ["/go/bin/che-machine-exec",
2020
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
2121
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
22-
"--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
22+
"--pod-selector", "controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)",
2323
"--use-bearer-token",
2424
"--use-tls"]
2525
endpoints:
@@ -53,7 +53,7 @@ output:
5353
command: ["/go/bin/che-machine-exec",
5454
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
5555
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
56-
"--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
56+
"--pod-selector", "controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)",
5757
"--use-bearer-token",
5858
"--use-tls"]
5959
endpoints:

‎pkg/library/flatten/testdata/k8s-ref/nodejs-workspace.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ input:
227227
- '--url'
228228
- '0.0.0.0:4444'
229229
- '--pod-selector'
230-
- controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)
230+
- controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)
231231
endpoints:
232232
- name: "che-mach-exec"
233233
exposure: public
@@ -407,7 +407,7 @@ output:
407407
- '--url'
408408
- '0.0.0.0:4444'
409409
- '--pod-selector'
410-
- controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)
410+
- controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)
411411
endpoints:
412412
- name: "che-mach-exec"
413413
exposure: public

‎pkg/library/flatten/testdata/k8s-ref/web-terminal-with-plugin.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ input:
3232
command: ["/go/bin/che-machine-exec",
3333
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
3434
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
35-
"--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
35+
"--pod-selector", "controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)",
3636
"--use-bearer-token",
3737
"--use-tls"]
3838
endpoints:
@@ -64,7 +64,7 @@ output:
6464
command: ["/go/bin/che-machine-exec",
6565
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
6666
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
67-
"--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
67+
"--pod-selector", "controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)",
6868
"--use-bearer-token",
6969
"--use-tls"]
7070
endpoints:

‎samples/flattened_theia-next.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- '--url'
2525
- '0.0.0.0:4444'
2626
- '--pod-selector'
27-
- controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)
27+
- controller.devfile.io/devworkspace_id=$(DEVWORKSPACE_ID)
2828
endpoints:
2929
- name: "che-mach-exec"
3030
exposure: public

0 commit comments

Comments
 (0)