From 0dd3b7668a186366a2f1d59efed4ffc446d20b98 Mon Sep 17 00:00:00 2001 From: Sergii Leshchenko Date: Mon, 29 Mar 2021 14:43:34 +0300 Subject: [PATCH 1/2] Enable github action to build v1alphax image --- .github/workflows/dockerimage-next.yml | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage-next.yml b/.github/workflows/dockerimage-next.yml index a92c9a917..402c7aa1b 100644 --- a/.github/workflows/dockerimage-next.yml +++ b/.github/workflows/dockerimage-next.yml @@ -10,7 +10,7 @@ name: Next Dockerimage on: push: - branches: [ master ] + branches: [ v1alphax ] jobs: @@ -27,5 +27,5 @@ jobs: registry: quay.io repository: devfile/devworkspace-controller dockerfile: ./build/Dockerfile - tags: next + tags: v1alphax tag_with_sha: true diff --git a/Makefile b/Makefile index 0cfff5071..9fbf79297 100644 --- a/Makefile +++ b/Makefile @@ -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 From ddf85fe08ba3a042c01f4f17bc02811df912a247 Mon Sep 17 00:00:00 2001 From: Sergii Leshchenko Date: Mon, 29 Mar 2021 14:47:29 +0300 Subject: [PATCH 2/2] Introduce latest version for web terminal plugin --- .../web-terminal-dev/latest/meta.yaml | 37 +++++++++++++++++++ .../web-terminal/latest/meta.yaml | 36 ++++++++++++++++++ samples/web-terminal-custom-tooling.yaml | 2 +- samples/web-terminal-dev.yaml | 2 +- samples/web-terminal.yaml | 2 +- 5 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 internal-registry/redhat-developer/web-terminal-dev/latest/meta.yaml create mode 100644 internal-registry/redhat-developer/web-terminal/latest/meta.yaml diff --git a/internal-registry/redhat-developer/web-terminal-dev/latest/meta.yaml b/internal-registry/redhat-developer/web-terminal-dev/latest/meta.yaml new file mode 100644 index 000000000..75682c3b9 --- /dev/null +++ b/internal-registry/redhat-developer/web-terminal-dev/latest/meta.yaml @@ -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 diff --git a/internal-registry/redhat-developer/web-terminal/latest/meta.yaml b/internal-registry/redhat-developer/web-terminal/latest/meta.yaml new file mode 100644 index 000000000..7bc0f9018 --- /dev/null +++ b/internal-registry/redhat-developer/web-terminal/latest/meta.yaml @@ -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 diff --git a/samples/web-terminal-custom-tooling.yaml b/samples/web-terminal-custom-tooling.yaml index d7d6e1da2..95948132d 100644 --- a/samples/web-terminal-custom-tooling.yaml +++ b/samples/web-terminal-custom-tooling.yaml @@ -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 diff --git a/samples/web-terminal-dev.yaml b/samples/web-terminal-dev.yaml index 9841c48bf..7dcef23be 100644 --- a/samples/web-terminal-dev.yaml +++ b/samples/web-terminal-dev.yaml @@ -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 diff --git a/samples/web-terminal.yaml b/samples/web-terminal.yaml index 627cb0c65..a31dc882e 100644 --- a/samples/web-terminal.yaml +++ b/samples/web-terminal.yaml @@ -16,4 +16,4 @@ spec: components: - plugin: name: web-terminal - id: redhat-developer/web-terminal/4.5.0 + id: redhat-developer/web-terminal/latest