Skip to content

Commit 2a1d6b0

Browse files
committed
fixing config map generation for Domain on PV
1 parent 7679481 commit 2a1d6b0

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

electron/app/js/imageBuilderUtils.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ function getDockerEnv(httpsProxyUrl, bypassProxyHosts, imageBuilderOptions) {
167167
if (process.env.DOCKER_CERT_PATH) {
168168
env['DOCKER_CERT_PATH'] = process.env.DOCKER_CERT_PATH;
169169
}
170+
if (process.env.DOCKER_DEFAULT_PLATFORM) {
171+
env['DOCKER_DEFAULT_PLATFORM'] = process.env.DOCKER_DEFAULT_PLATFORM;
172+
}
170173

171174
// podman-specific environment variables that should be passed on
172175
if(process.env.CONTAINER_HOST) {

webui/src/js/utils/k8s-domain-deployer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ function (K8sDomainActionsBase, project, wktConsole, i18n, projectIo, dialogHelp
268268
busyDialogMessage = i18n.t('k8s-domain-deployer-create-config-map-in-progress',
269269
{domainName: domainUid, domainNamespace: domainNamespace});
270270
dialogHelper.updateBusyDialog(busyDialogMessage, 12 / totalSteps);
271-
if (this.project.settings.targetDomainLocation.value === 'mii') {
271+
if (this.k8sDomainConfigMapGenerator.shouldCreateConfigMap()) {
272272
const configMapData = this.k8sDomainConfigMapGenerator.generate().join('\n');
273273
wktLogger.debug(configMapData);
274274
const mapResults = await (window.api.ipc.invoke('k8s-apply', kubectlExe, configMapData, kubectlOptions));

0 commit comments

Comments
 (0)