Skip to content

Commit 9d08313

Browse files
adding ingress image pull secret only when the user asks to use it (#174)
1 parent 23790a5 commit 9d08313

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

webui/src/js/utils/ingress-controller-installer.js

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,20 +130,23 @@ function(IngressActionsBase, project, wktConsole, k8sHelper, i18n, dialogHelper,
130130

131131
busyDialogMessage = i18n.t('ingress-installer-create-pull-secret-in-progress');
132132
dialogHelper.updateBusyDialog(busyDialogMessage, 7 / totalSteps);
133-
const secretName = this.project.ingress.dockerRegSecretName.value;
134-
if (ingressControllerProvider === 'traefik' || ingressControllerProvider === 'voyager' ) {
135-
// create image pull secret for pulling Traefik or Voyager images.
136-
if (this.project.ingress.createDockerRegSecret.value === true && secretName) {
137-
const secretData = {
138-
server: 'docker.io',
139-
username: this.project.ingress.dockerRegSecretUserId.value,
140-
email: this.project.ingress.dockerRegSecretUserEmail.value,
141-
password: this.project.ingress.dockerRegSecretUserPwd.value
142-
};
143-
const secretStatus = await this.createPullSecret(kubectlExe, kubectlOptions, ingressControllerNamespace,
144-
secretName, secretData, errTitle, errPrefix);
145-
if (!secretStatus) {
146-
return Promise.resolve(false);
133+
let secretName;
134+
if (this.project.ingress.specifyDockerRegSecret.value) {
135+
secretName = this.project.ingress.dockerRegSecretName.value;
136+
if (ingressControllerProvider === 'traefik' || ingressControllerProvider === 'voyager' ) {
137+
// create image pull secret for pulling Traefik or Voyager images.
138+
if (this.project.ingress.createDockerRegSecret.value === true && secretName) {
139+
const secretData = {
140+
server: 'docker.io',
141+
username: this.project.ingress.dockerRegSecretUserId.value,
142+
email: this.project.ingress.dockerRegSecretUserEmail.value,
143+
password: this.project.ingress.dockerRegSecretUserPwd.value
144+
};
145+
const secretStatus = await this.createPullSecret(kubectlExe, kubectlOptions, ingressControllerNamespace,
146+
secretName, secretData, errTitle, errPrefix);
147+
if (!secretStatus) {
148+
return Promise.resolve(false);
149+
}
147150
}
148151
}
149152
}

0 commit comments

Comments
 (0)