From c17dce053db03083a6d6af2723c636699d3a4be3 Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Thu, 1 Feb 2024 14:20:50 +0000 Subject: [PATCH 1/4] chore(release): release version 7.81.0 Signed-off-by: Flavius Lacatusu --- README.md | 20 ++++++++++---------- VERSION | 1 + package.json | 6 +++--- yarn.lock | 8 ++++---- 4 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 VERSION diff --git a/README.md b/README.md index b4ee68c5b..ca320bccb 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ DESCRIPTION Retrieves Eclipse Che self-signed certificate ``` -_See code: [src/commands/cacert/export.ts](https://github.com/che-incubator/chectl/blob/v0.0.2/src/commands/cacert/export.ts)_ +_See code: [src/commands/cacert/export.ts](https://github.com/che-incubator/chectl/blob/v7.81.0/src/commands/cacert/export.ts)_ ## `chectl commands` @@ -225,7 +225,7 @@ DESCRIPTION Open Eclipse Che dashboard ``` -_See code: [src/commands/dashboard/open.ts](https://github.com/che-incubator/chectl/blob/v0.0.2/src/commands/dashboard/open.ts)_ +_See code: [src/commands/dashboard/open.ts](https://github.com/che-incubator/chectl/blob/v7.81.0/src/commands/dashboard/open.ts)_ ## `chectl help [COMMANDS]` @@ -268,7 +268,7 @@ DESCRIPTION Enable local debug of Eclipse Che server ``` -_See code: [src/commands/server/debug.ts](https://github.com/che-incubator/chectl/blob/v0.0.2/src/commands/server/debug.ts)_ +_See code: [src/commands/server/debug.ts](https://github.com/che-incubator/chectl/blob/v7.81.0/src/commands/server/debug.ts)_ ## `chectl server:delete` @@ -295,7 +295,7 @@ DESCRIPTION delete any Eclipse Che related resource ``` -_See code: [src/commands/server/delete.ts](https://github.com/che-incubator/chectl/blob/v0.0.2/src/commands/server/delete.ts)_ +_See code: [src/commands/server/delete.ts](https://github.com/che-incubator/chectl/blob/v7.81.0/src/commands/server/delete.ts)_ ## `chectl server:deploy` @@ -441,7 +441,7 @@ DESCRIPTION Deploy Eclipse Che server ``` -_See code: [src/commands/server/deploy.ts](https://github.com/che-incubator/chectl/blob/v0.0.2/src/commands/server/deploy.ts)_ +_See code: [src/commands/server/deploy.ts](https://github.com/che-incubator/chectl/blob/v7.81.0/src/commands/server/deploy.ts)_ ## `chectl server:logs` @@ -463,7 +463,7 @@ DESCRIPTION Collect Eclipse Che logs ``` -_See code: [src/commands/server/logs.ts](https://github.com/che-incubator/chectl/blob/v0.0.2/src/commands/server/logs.ts)_ +_See code: [src/commands/server/logs.ts](https://github.com/che-incubator/chectl/blob/v7.81.0/src/commands/server/logs.ts)_ ## `chectl server:start` @@ -493,7 +493,7 @@ DESCRIPTION Start Eclipse Che server ``` -_See code: [src/commands/server/start.ts](https://github.com/che-incubator/chectl/blob/v0.0.2/src/commands/server/start.ts)_ +_See code: [src/commands/server/start.ts](https://github.com/che-incubator/chectl/blob/v7.81.0/src/commands/server/start.ts)_ ## `chectl server:status` @@ -513,7 +513,7 @@ DESCRIPTION Status Eclipse Che server ``` -_See code: [src/commands/server/status.ts](https://github.com/che-incubator/chectl/blob/v0.0.2/src/commands/server/status.ts)_ +_See code: [src/commands/server/status.ts](https://github.com/che-incubator/chectl/blob/v7.81.0/src/commands/server/status.ts)_ ## `chectl server:stop` @@ -534,7 +534,7 @@ DESCRIPTION stop Eclipse Che server ``` -_See code: [src/commands/server/stop.ts](https://github.com/che-incubator/chectl/blob/v0.0.2/src/commands/server/stop.ts)_ +_See code: [src/commands/server/stop.ts](https://github.com/che-incubator/chectl/blob/v7.81.0/src/commands/server/stop.ts)_ ## `chectl server:update` @@ -652,7 +652,7 @@ EXAMPLES $ chectl server:update --olm-channel stable --catalog-source-yaml PATH_TO_CATALOG_SOURCE_YAML ``` -_See code: [src/commands/server/update.ts](https://github.com/che-incubator/chectl/blob/v0.0.2/src/commands/server/update.ts)_ +_See code: [src/commands/server/update.ts](https://github.com/che-incubator/chectl/blob/v7.81.0/src/commands/server/update.ts)_ ## `chectl update [CHANNEL]` diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..80af33506 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +7.81.0 diff --git a/package.json b/package.json index 24fdcd619..9451e9888 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "chectl", "description": "Eclipse Che CLI", - "version": "0.0.2", + "version": "7.81.0", "author": "Mario Loriedo @l0rd", "bin": { "chectl": "./bin/run" @@ -23,8 +23,8 @@ "cli-ux": "^6.0.9", "command-exists": "^1.2.9", "countries-and-timezones": "^3.4.1", - "devworkspace-operator": "https://github.com/devfile/devworkspace-operator#main", - "eclipse-che-operator": "https://github.com/eclipse-che/che-operator#main", + "devworkspace-operator": "https://github.com/devfile/devworkspace-operator#v0.25.0", + "eclipse-che-operator": "https://github.com/eclipse-che/che-operator#7.81.0", "execa": "^5.1.1", "fancy-test": "^2.0.25", "fs-extra": "^11.1.0", diff --git a/yarn.lock b/yarn.lock index c1f792057..00b6459e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3671,9 +3671,9 @@ detect-newline@^3.0.0: resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== -"devworkspace-operator@https://github.com/devfile/devworkspace-operator#main": +"devworkspace-operator@https://github.com/devfile/devworkspace-operator#v0.25.0": version "0.0.0" - resolved "https://github.com/devfile/devworkspace-operator#21aaf77d61f8801fbfad940b607f2e9e420b49dd" + resolved "https://github.com/devfile/devworkspace-operator#3c083e4840f2f26c5c8abd95c745d8f09666b586" dezalgo@^1.0.0: version "1.0.4" @@ -3732,9 +3732,9 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -"eclipse-che-operator@https://github.com/eclipse-che/che-operator#main": +"eclipse-che-operator@https://github.com/eclipse-che/che-operator#7.81.0": version "0.0.0" - resolved "https://github.com/eclipse-che/che-operator#7c7bd4f796eb083a21cf5ba5f750cde1d69e901a" + resolved "https://github.com/eclipse-che/che-operator#2c55556e8c72402276a6ad4013aad39e46db2771" editorconfig@^0.15.0: version "0.15.3" From 21cf32b8751e7fbd8d86291595c4b734ff1aa9e8 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Fri, 2 Feb 2024 10:36:46 +0100 Subject: [PATCH 2/4] fixup Signed-off-by: Anatolii Bazko --- src/tasks/installers/eclipse-che/eclipse-che-tasks.ts | 2 +- test/e2e/e2e-upgrade-version.test.ts | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tasks/installers/eclipse-che/eclipse-che-tasks.ts b/src/tasks/installers/eclipse-che/eclipse-che-tasks.ts index 0e22dcc04..a244e6f3b 100644 --- a/src/tasks/installers/eclipse-che/eclipse-che-tasks.ts +++ b/src/tasks/installers/eclipse-che/eclipse-che-tasks.ts @@ -305,7 +305,7 @@ export namespace EclipseCheTasks { ctx[OperatorImageUpgradeContext.NEW_IMAGE_NAME] = newImage ctx[OperatorImageUpgradeContext.NEW_IMAGE_TAG] = newTag - task.title = `${task.title} ${ctx[OperatorImageUpgradeContext.NEW_IMAGE_TAG]} -> ${ctx[OperatorImageUpgradeContext.DEPLOYED_IMAGE_TAG]}` + task.title = `${task.title} ${ctx[OperatorImageUpgradeContext.DEPLOYED_IMAGE_TAG]} -> ${ctx[OperatorImageUpgradeContext.NEW_IMAGE_TAG]}` }, } } diff --git a/test/e2e/e2e-upgrade-version.test.ts b/test/e2e/e2e-upgrade-version.test.ts index e407eaa02..86b440e62 100644 --- a/test/e2e/e2e-upgrade-version.test.ts +++ b/test/e2e/e2e-upgrade-version.test.ts @@ -38,8 +38,6 @@ describe('Test Che upgrade', () => { it('Update Eclipse Che Version', async () => { const binChectl = E2eHelper.getChectlBinaries() // scale deployments down to free up some resources - await helper.runCliCommand('kubectl', ['scale', 'deployment', 'che', '--replicas=0', `-n ${NAMESPACE}`]) - await helper.runCliCommand(binChectl, ['server:update', '-y', `-n ${NAMESPACE}`, '--telemetry=off']) await helper.waitForCheServerImageTag(helper.getNewVersion(), UPDATE_CHE_TIMEOUT_MS) }) From a06e6feb1fe393830a18ee881f6e5249baa93764 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Fri, 2 Feb 2024 10:43:19 +0100 Subject: [PATCH 3/4] fixup Signed-off-by: Anatolii Bazko --- .github/workflows/release.yml | 4 ++-- test/e2e/e2e-upgrade-version.test.ts | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4dca3f4fa..d106a97bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,8 +66,8 @@ jobs: run: | # since we're using Flavius' token below to generate PRs, should also make tags/branches/commits by same owner # see https://github.com/che-incubator/chectl/settings/secrets/actions for the token used - git config --global user.name "Flavius Lacatusu" - git config --global user.email "flacatus@redhat.com" + git config --global user.name "Anatolii Bazko" + git config --global user.email "abazko@redhat.com" export GITHUB_TOKEN=${{ secrets.CHE_INCUBATOR_BOT_GITHUB_TOKEN }} DWO_VERSION=${{ github.event.inputs.devworkspaceOperatorVersion }} if [[ -z ${DWO_VERSION} ]]; then diff --git a/test/e2e/e2e-upgrade-version.test.ts b/test/e2e/e2e-upgrade-version.test.ts index 86b440e62..ce903399c 100644 --- a/test/e2e/e2e-upgrade-version.test.ts +++ b/test/e2e/e2e-upgrade-version.test.ts @@ -38,7 +38,9 @@ describe('Test Che upgrade', () => { it('Update Eclipse Che Version', async () => { const binChectl = E2eHelper.getChectlBinaries() // scale deployments down to free up some resources + await helper.runCliCommand('kubectl', ['scale', 'deployment', 'che', '--replicas=0', `-n ${NAMESPACE}`]) await helper.runCliCommand(binChectl, ['server:update', '-y', `-n ${NAMESPACE}`, '--telemetry=off']) + await helper.runCliCommand(binChectl, ['server:start', `-n ${NAMESPACE}`, '--telemetry=off']) await helper.waitForCheServerImageTag(helper.getNewVersion(), UPDATE_CHE_TIMEOUT_MS) }) From 25618f109faa605423085d6835ce6726a3a45c42 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Fri, 2 Feb 2024 11:01:04 +0100 Subject: [PATCH 4/4] fixup Signed-off-by: Anatolii Bazko --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d106a97bc..4dca3f4fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,8 +66,8 @@ jobs: run: | # since we're using Flavius' token below to generate PRs, should also make tags/branches/commits by same owner # see https://github.com/che-incubator/chectl/settings/secrets/actions for the token used - git config --global user.name "Anatolii Bazko" - git config --global user.email "abazko@redhat.com" + git config --global user.name "Flavius Lacatusu" + git config --global user.email "flacatus@redhat.com" export GITHUB_TOKEN=${{ secrets.CHE_INCUBATOR_BOT_GITHUB_TOKEN }} DWO_VERSION=${{ github.event.inputs.devworkspaceOperatorVersion }} if [[ -z ${DWO_VERSION} ]]; then