Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Update dependencies #2946

Merged
merged 6 commits into from
Nov 12, 2024
Merged

chore: Update dependencies #2946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c1ba76
chore: Update dependencies
tolusha Nov 12, 2024
a672f37
Fix tests by increasing timeout
tolusha Nov 12, 2024
4415c88
Fix tests by increasing timeout
tolusha Nov 12, 2024
8bc5704
Fix tests by increasing timeout
tolusha Nov 12, 2024
fd92fce
Update readme
tolusha Nov 12, 2024
f6cf8ef
Update readme
tolusha Nov 12, 2024
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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,10 @@ FLAGS
[default: 60000] Waiting time for Pod rechecking error (in milliseconds)

--k8spodreadytimeout=<value>
[default: 60000] Waiting time for Pod Ready condition (in milliseconds)
[default: 120000] Waiting time for Pod Ready condition (in milliseconds)

--k8spodwaittimeout=<value>
[default: 60000] Waiting time for Pod scheduled condition (in milliseconds)
[default: 120000] Waiting time for Pod scheduled condition (in milliseconds)

--olm-channel=<value>
Olm channel to install Eclipse Che, f.e. stable.
Expand Down Expand Up @@ -476,8 +476,8 @@ FLAGS
--batch Batch mode. Running a command without end user interaction.
--k8spoddownloadimagetimeout=<value> [default: 1200000] Waiting time for Pod downloading image (in milliseconds)
--k8spoderrorrechecktimeout=<value> [default: 60000] Waiting time for Pod rechecking error (in milliseconds)
--k8spodreadytimeout=<value> [default: 60000] Waiting time for Pod Ready condition (in milliseconds)
--k8spodwaittimeout=<value> [default: 60000] Waiting time for Pod scheduled condition (in milliseconds)
--k8spodreadytimeout=<value> [default: 120000] Waiting time for Pod Ready condition (in milliseconds)
--k8spodwaittimeout=<value> [default: 120000] Waiting time for Pod scheduled condition (in milliseconds)
--skip-kubernetes-health-check Skip Kubernetes health check
--telemetry=<option> Enable or disable telemetry. This flag skips a prompt and enable/disable
telemetry
Expand Down
4 changes: 2 additions & 2 deletions src/flags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export const CHE_OPERATOR_CR_YAML = Flags.string({
default: '',
})

export const DEFAULT_POD_WAIT_TIMEOUT = '60000'
export const DEFAULT_POD_WAIT_TIMEOUT = '120000'
export const K8S_POD_WAIT_TIMEOUT_FLAG = 'k8spodwaittimeout'
export const K8S_POD_WAIT_TIMEOUT = Flags.string({
description: 'Waiting time for Pod scheduled condition (in milliseconds)',
Expand All @@ -97,7 +97,7 @@ export const K8S_POD_DOWNLOAD_IMAGE_TIMEOUT = Flags.string({
})

export const DEFAULT_K8S_POD_READY_TIMEOUT_EMBEDDED_PLUGIN_REGISTRY = '600000'
export const DEFAULT_K8S_POD_READY_TIMEOUT = '60000'
export const DEFAULT_K8S_POD_READY_TIMEOUT = '120000'
export const K8S_POD_READY_TIMEOUT_FLAG = 'k8spodreadytimeout'
export const K8S_POD_READY_TIMEOUT = Flags.string({
description: 'Waiting time for Pod Ready condition (in milliseconds)',
Expand Down
1 change: 1 addition & 0 deletions src/tasks/installers/eclipse-che/eclipse-che-operator-installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export class EclipseCheOperatorInstaller implements Installer {
tasks.add(EclipseCheTasks.getCreateOrUpdateRbacTasks(true))
if (!flags[SKIP_CERT_MANAGER_FLAG]) {
tasks.add(CertManager.getWaitCertManagerTask())
tasks.add(CommonTasks.getWaitTask(5000))
}

tasks.add(EclipseCheTasks.getCreateOrUpdateCertificateTask(true))
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e-upgrade-channel.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ describe('Upgrade channel test', () => {
`--chenamespace=${EclipseChe.NAMESPACE}`,
'--che-operator-cr-patch-yaml=test/e2e/resources/minikube-checluster-patch.yaml',
'--telemetry=off',
'--k8spodwaittimeout=240000',
'--k8spodreadytimeout=240000',
'--k8spodwaittimeout=600000',
'--k8spodreadytimeout=600000',
])

await helper.waitForCheServerImageTag(helper.getNewVersion(), TIMEOUT_MS)
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e-upgrade-version.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe('Test Che upgrade', () => {
it(`Deploy Che using operator installer and self signed certificates`, async () => {
// uses installed chectl (from a stable channel)
// see github workflow
let deployCommand = `chectl server:deploy --batch --platform=${PLATFORM} --chenamespace=${NAMESPACE} --telemetry=off --k8spodwaittimeout=240000 --k8spodreadytimeout=240000`
let deployCommand = `chectl server:deploy --batch --platform=${PLATFORM} --chenamespace=${NAMESPACE} --telemetry=off --k8spodwaittimeout=600000 --k8spodreadytimeout=600000`
if (PLATFORM === 'minikube') {
deployCommand += ' --che-operator-cr-patch-yaml=test/e2e/resources/minikube-checluster-patch.yaml'
}
Expand All @@ -40,7 +40,7 @@ describe('Test Che upgrade', () => {
// 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.runCliCommand(binChectl, ['server:start', `-n ${NAMESPACE}`, '--telemetry=off', '--k8spodwaittimeout=600000', '--k8spodreadytimeout=600000'])
await helper.waitForCheServerImageTag(helper.getNewVersion(), UPDATE_CHE_TIMEOUT_MS)
})

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const binChectl = E2eHelper.getChectlBinaries()
const PLATFORM = process.env.PLATFORM || ''

function getDeployCommand(): string {
let command = `${binChectl} server:deploy --batch --platform=${PLATFORM} --chenamespace=${EclipseChe.NAMESPACE} --telemetry=off --k8spodwaittimeout=240000 --k8spodreadytimeout=240000`
let command = `${binChectl} server:deploy --batch --platform=${PLATFORM} --chenamespace=${EclipseChe.NAMESPACE} --telemetry=off --k8spodwaittimeout=600000 --k8spodreadytimeout=600000`
if (PLATFORM === 'minikube') {
command += ' --che-operator-cr-patch-yaml=test/e2e/resources/minikube-checluster-patch.yaml'
}
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3683,7 +3683,7 @@ detect-newline@^3.0.0:

"devworkspace-operator@https://github.com/devfile/devworkspace-operator#main":
version "0.0.0"
resolved "https://github.com/devfile/devworkspace-operator#ff723835cc3ed38c9f8a5fbf36dcfddf1890ac9c"
resolved "https://github.com/devfile/devworkspace-operator#10faaa74b7774d08f32cffbb9b7b7ba3ab68c438"

dezalgo@^1.0.0:
version "1.0.4"
Expand Down Expand Up @@ -3744,7 +3744,7 @@ ecc-jsbn@~0.1.1:

"eclipse-che-operator@https://github.com/eclipse-che/che-operator#main":
version "0.0.0"
resolved "https://github.com/eclipse-che/che-operator#f71d2e8279fb12933a511178eebdac25abde05af"
resolved "https://github.com/eclipse-che/che-operator#8d6be15eb0563845fac5041a23643fab2dce29d0"

editorconfig@^0.15.0:
version "0.15.3"
Expand Down
Loading