From f3a818ff2a67842f38196ae1ca58048aed8a174d Mon Sep 17 00:00:00 2001 From: Robert Patrick Date: Wed, 15 Mar 2023 19:06:00 -0500 Subject: [PATCH 1/2] fixing bug causing the wrong operator file name to be used with newer versions of Verrazzano --- electron/app/js/vzInstaller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/electron/app/js/vzInstaller.js b/electron/app/js/vzInstaller.js index 10723bae5..56b3e67ef 100644 --- a/electron/app/js/vzInstaller.js +++ b/electron/app/js/vzInstaller.js @@ -7,6 +7,7 @@ const githubUtils = require('./githubUtils'); const kubectlUtils = require('./kubectlUtils'); const i18n = require('./i18next.config'); const { compareVersions } = require('./versionUtils'); +const {getLogger} = require('./wktLogging'); const VZ_BASE_API_URL = 'https://api.github.com/repos/verrazzano/verrazzano'; const VZ_BASE_URL = 'https://github.com/verrazzano/verrazzano'; @@ -43,6 +44,7 @@ async function installVerrazzanoPlatformOperator(kubectlExe, k8sOptions, vzOptio if (vzOptions.tag) { const version = vzOptions.tag.slice(1); + getLogger().debug('XXXXXXXXXXXXX vzOptions.tag = %s and version = %s', vzOptions.tag, version); if (compareVersions(version, '1.4.0') >= 0) { platformOperatorUrl = `${VZ_BASE_URL}/releases/download/${vzOptions.tag}/verrazzano-platform-operator.yaml`; } else { @@ -50,7 +52,6 @@ async function installVerrazzanoPlatformOperator(kubectlExe, k8sOptions, vzOptio // platformOperatorUrl = `${VZ_BASE_URL}/releases/download/${vzOptions.tag}/operator.yaml`; } - platformOperatorUrl = `${VZ_BASE_URL}/releases/download/${vzOptions.tag}/operator.yaml`; } else { platformOperatorUrl = `${VZ_BASE_URL}/releases/latest/verrazzano-platform-operator.yaml`; } From 101401b8a5a1903ec2884190dd3d85aeeeabd319 Mon Sep 17 00:00:00 2001 From: Robert Patrick Date: Wed, 15 Mar 2023 19:09:04 -0500 Subject: [PATCH 2/2] fixing log message --- electron/app/js/vzInstaller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/app/js/vzInstaller.js b/electron/app/js/vzInstaller.js index 56b3e67ef..3b2c922c1 100644 --- a/electron/app/js/vzInstaller.js +++ b/electron/app/js/vzInstaller.js @@ -44,7 +44,7 @@ async function installVerrazzanoPlatformOperator(kubectlExe, k8sOptions, vzOptio if (vzOptions.tag) { const version = vzOptions.tag.slice(1); - getLogger().debug('XXXXXXXXXXXXX vzOptions.tag = %s and version = %s', vzOptions.tag, version); + getLogger().debug('installVerrazzanoPlatformOperator: vzOptions.tag = %s and version = %s', vzOptions.tag, version); if (compareVersions(version, '1.4.0') >= 0) { platformOperatorUrl = `${VZ_BASE_URL}/releases/download/${vzOptions.tag}/verrazzano-platform-operator.yaml`; } else {