From 5439d945cd755c46b305cdf6b990f87864650bac Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Mon, 27 May 2024 16:57:07 +0200 Subject: [PATCH] chore: adapt chectl to 22932 Signed-off-by: Anatolii Bazko --- src/tasks/pod-tasks.ts | 5 ++--- src/utils/che.ts | 9 +-------- yarn.lock | 4 ++-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/tasks/pod-tasks.ts b/src/tasks/pod-tasks.ts index 27d932925..076711aa0 100644 --- a/src/tasks/pod-tasks.ts +++ b/src/tasks/pod-tasks.ts @@ -1,5 +1,5 @@ /** - * Copyright (c) 2019-2021 Red Hat, Inc. + * Copyright (c) 2019-2024 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -16,7 +16,6 @@ import {KubeClient} from '../api/kube-client' import {KubeHelperContext} from '../context' import {EclipseChe} from './installers/eclipse-che/eclipse-che' import {newListr} from '../utils/utls' -import {Che} from '../utils/che' export namespace PodTasks { interface FailState { @@ -83,7 +82,7 @@ export namespace PodTasks { const tasks = newListr([]) tasks.add(getSchedulingTask(selector, namespace)) tasks.add(getDownloadingTask(selector, namespace)) - if (name === EclipseChe.PLUGIN_REGISTRY && await Che.isEmbeddedOpenVSXRegistryConfigured(namespace)) { + if (name === EclipseChe.PLUGIN_REGISTRY) { // if embedded plugin registry is configured, use longer timeout for pod readiness tasks.add(getStartingTask(selector, namespace, ctx[KubeHelperContext.POD_READY_TIMEOUT_EMBEDDED_PLUGIN_REGISTRY])) } else { diff --git a/src/utils/che.ts b/src/utils/che.ts index 6774584b5..4460e59a5 100644 --- a/src/utils/che.ts +++ b/src/utils/che.ts @@ -1,5 +1,5 @@ /** - * Copyright (c) 2019-2022 Red Hat, Inc. + * Copyright (c) 2019-2024 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -134,11 +134,4 @@ export namespace Che { throw new Error(`Route ${EclipseChe.CHE_FLAVOR} not found`) } - - export async function isEmbeddedOpenVSXRegistryConfigured(namespace: string): Promise { - const kubeClient = KubeClient.getInstance() - const cheCluster = await kubeClient.getCheCluster(namespace) - - return !cheCluster?.spec?.components?.pluginRegistry?.openVSXURL - } } diff --git a/yarn.lock b/yarn.lock index 2f44b9252..8bee9c822 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3673,7 +3673,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#067847d900c18a3fe0d47de920a9ce77af29e722" + resolved "https://github.com/devfile/devworkspace-operator#b49427cecf4ba036a7587be4e7319b4dfec42dcf" dezalgo@^1.0.0: version "1.0.4" @@ -3734,7 +3734,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#903ad387e047129ad0053a641a590fd12411f34e" + resolved "https://github.com/eclipse-che/che-operator#9954335646e7043632cdb992f6c155888f0cee2c" editorconfig@^0.15.0: version "0.15.3"