Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Next Dockerimage

on:
push:
branches: [ master ]
branches: [ v1alphax ]

jobs:

Expand All @@ -27,5 +27,5 @@ jobs:
registry: quay.io
repository: devfile/devworkspace-controller
dockerfile: ./build/Dockerfile
tags: next
tags: v1alphax
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this branch represents the web terminal operator should we just publish to https://quay.io/repository/wto/web-terminal-operator instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You reminded me the stuff I planed but forgot - default IMG value in Makefile.
Technically we can, but how good it will be if we'll use WTO image as default value for DWO v1alphax.

I like more the way we have now, when main branch of WTO depends on DWO:alpha https://github.com/redhat-developer/web-terminal-operator/blob/main/manifests/web-terminal.clusterserviceversion.yaml#L38
While quay.io/repository/wto/web-terminal-operator is supposed to host stuff built on brew.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My whole idea with https://issues.redhat.com/projects/WTO/issues/WTO-78 was to make it so that we no longer had to do anything manually after we finish a release (including pushing images built from brew). If we continue with using the images from brew we will always have manual steps after a release. Though, when we create a release I can probably just have a github action on web-terminal-operator that tags the current version of quay.io/devfile/devworkspace-controller:v1alphax and then push that to quay.io/wto/devworkspace-controller so it shouldn't be an issue

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, for me WTO stuff must be built in brew, otherwise it's not WTO.
It's like if we build Che x branch and push it as CRW.

So, I'm proceeding with the current flow, which does not change anything and automates image build, and separately we can think more about how we can avoid manual post release activities

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we do it that way though the quay.io/wto bundle will only ever refer to the images on the redhat registry and never the ones in quay.io/wto. The only way to refer to the quay.io/wto images would to build another bundle in a github action, but if we do that then it's also not built in brew and also not technically wto

tag_with_sha: true
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SHELL := bash

OPERATOR_SDK_VERSION = v0.17.0
NAMESPACE ?= devworkspace-controller
IMG ?= quay.io/devfile/devworkspace-controller:next
IMG ?= quay.io/devfile/devworkspace-controller:v1alphax
TOOL ?= oc
ROUTING_SUFFIX ?= 192.168.99.100.nip.io
PULL_POLICY ?= Always
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
apiVersion: v2
publisher: redhat-developer
name: web-terminal-dev
version: latest
type: Che Editor
displayName: Web Terminal
title: Web Terminal
description: Web provides the ability to start a terminal inside
the OpenShift Console. The development version does not run with TLS enabled and
is intended for development purposes only.
icon: null
repository: https://github.com/eclipse/che-machine-exec/
firstPublicationDate: "2020-06-01"
category: Other
spec:
endpoints:
- name: web-terminal
public: true
targetPort: 4444
attributes:
protocol: http
type: ide
discoverable: false
secure: true
cookiesAuthEnabled: true
containers:
- name: web-terminal
image: "quay.io/eclipse/che-machine-exec:nightly"
command: ["/go/bin/che-machine-exec",
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
"--pod-selector", "controller.devfile.io/workspace_id=$(CHE_WORKSPACE_ID)"]
ports:
- exposedPort: 4444
env:
- name: USE_BEARER_TOKEN
value: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
apiVersion: v2
publisher: redhat-developer
name: web-terminal
version: latest
type: Che Editor
displayName: Web Terminal
title: Web Terminal
description: Web Terminal provides the ability to start a terminal inside the OpenShift Console.
icon: null
repository: https://github.com/eclipse/che-machine-exec/
firstPublicationDate: "2020-05-13"
category: Other
spec:
endpoints:
- name: web-terminal
public: true
targetPort: 4444
attributes:
protocol: http
type: ide
discoverable: false
secure: true
cookiesAuthEnabled: true
containers:
- name: web-terminal
image: "${RELATED_IMAGE_plugin_redhat_developer_web_terminal_4_5_0}"
command: ["/go/bin/che-machine-exec",
"--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
"--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
"--pod-selector", "controller.devfile.io/workspace_id=$(CHE_WORKSPACE_ID)",
"--use-tls"]
ports:
- exposedPort: 4444
env:
- name: USE_BEARER_TOKEN
value: true
2 changes: 1 addition & 1 deletion samples/web-terminal-custom-tooling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
components:
- plugin:
name: web-terminal
id: redhat-developer/web-terminal/4.5.0
id: redhat-developer/web-terminal/latest
- container:
memoryLimit: "256Mi"
name: tooling
Expand Down
2 changes: 1 addition & 1 deletion samples/web-terminal-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ spec:
components:
- plugin:
name: web-terminal
id: redhat-developer/web-terminal-dev/4.5.0
id: redhat-developer/web-terminal-dev/latest
2 changes: 1 addition & 1 deletion samples/web-terminal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ spec:
components:
- plugin:
name: web-terminal
id: redhat-developer/web-terminal/4.5.0
id: redhat-developer/web-terminal/latest