Skip to content

Commit c5ce8c0

Browse files
authored
Sync downstream with upstream branch (#3)
* Fix devworkspace api group to fix idling Signed-off-by: Josh Pinkney <[email protected]> * Move from 1.0 version format to 1.0.0 Signed-off-by: Josh Pinkney <[email protected]> * Add in go modules for automatic security validation Signed-off-by: Josh Pinkney <[email protected]>
1 parent 7fccc08 commit c5ce8c0

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ LABEL summary="$SUMMARY" \
4444
io.openshift.tags="$PRODNAME,$COMPNAME" \
4545
com.redhat.component="$PRODNAME-$COMPNAME-container" \
4646
name="$PRODNAME/$COMPNAME" \
47-
version="1.0" \
47+
version="1.0.0" \
4848
license="EPLv2" \
4949
maintainer="Serhii Leshchenko <[email protected]>" \
5050
io.openshift.expose-services="" \

activity/manager.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ import (
2929
)
3030

3131
var (
32-
WorkspaceAPIResource = &metav1.APIResource{
33-
Name: "workspaces",
34-
Group: "workspace.che.eclipse.org",
32+
DevWorkspaceAPIResource = &metav1.APIResource{
33+
Name: "devworkspaces",
34+
Group: "workspace.devfile.io",
3535
Version: "v1alpha1",
3636
Namespaced: true,
3737
}
3838

39-
WorkspaceGroupVersion = &schema.GroupVersion{
40-
Group: "workspace.che.eclipse.org",
39+
DevWorkspaceGroupVersion = &schema.GroupVersion{
40+
Group: "workspace.devfile.io",
4141
Version: "v1alpha1",
4242
}
4343
)
@@ -154,7 +154,7 @@ func (m managerImpl) stopWorkspace() error {
154154
return err
155155
}
156156

157-
_, err = c.Resource(WorkspaceAPIResource, m.namespace).Patch(m.workspaceName, types.MergePatchType, jsonPath)
157+
_, err = c.Resource(DevWorkspaceAPIResource, m.namespace).Patch(m.workspaceName, types.MergePatchType, jsonPath)
158158
if err != nil {
159159
return err
160160
}
@@ -168,7 +168,7 @@ func newWorkspaceClientInCluster() (dynamic.Interface, error) {
168168
return nil, err
169169
}
170170
config.APIPath = "/apis"
171-
config.GroupVersion = WorkspaceGroupVersion
171+
config.GroupVersion = DevWorkspaceGroupVersion
172172

173173
c, err := dynamic.NewClient(config)
174174
if err != nil {

container.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
---
2+
go:
3+
modules:
4+
- module: github.com/eclipse/che-machine-exec
5+
26
# See more about format https://osbs.readthedocs.io/en/latest/users.html#image-configuration
37
platforms:
48
only:

0 commit comments

Comments
 (0)