Skip to content

cleaning up ingress actions validation #36

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

Merged
merged 2 commits into from
Nov 12, 2021
Merged

cleaning up ingress actions validation #36

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8892d4
cleaning up ingress actions validation
robertpatrick Nov 12, 2021
7fa78fc
restoring route field names
robertpatrick Nov 12, 2021
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
5 changes: 3 additions & 2 deletions electron/app/js/userSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ let _userSettingsFileName;
// "dividers": {
// "modelMain": 0.68,
// "modelRight": 0.48
// }
// },
// "navCollapsed": true
// }
// }
//
Expand Down Expand Up @@ -185,7 +186,7 @@ function getDividerLocations() {

function setNavigationCollapsed(collapsed) {
const window = getOrCreateWindowSettings();
window['navCollapsed'] = collapsed;
window['navCollapsed'] = Boolean(collapsed);
}

function getNavigationCollapsed() {
Expand Down
6 changes: 6 additions & 0 deletions electron/app/locales/en/webui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,10 @@
"ingress-design-ingress-route-annotation-add-row": "Add Annotation",
"ingress-design-ingress-route-annotation-delete-row": "Delete Annotation",

"ingress-design-ingress-route-name-field-validation-error": "Route {{routeName}}",
"ingress-design-ingress-route-field-validation-error": "Route {{routeName}}, Field \"{{fieldName}}\"",
"ingress-design-ingress-route-field-tls-config-error": "The route {{routeName}} has the {{fieldName}} field enabled but the {{specifyTlsSecretFieldName}} field is disabled.",

"ingress-design-ingress-tls-secret-title": "TLS Secret for Ingress Routes",
"ingress-design-specify-tls-secret-label": "Use Ingress TLS Secret",
"ingress-design-specify-tls-secret-help": "To secure traffic to the ingress controller with TLS, specify the secret that contains the TLS private key and certificate. The Ingress resource only supports a single TLS port, 443, and assumes TLS termination at the ingress (traffic between the ingress and the service and its pods is in clear text).",
Expand Down Expand Up @@ -934,6 +938,8 @@
"validation-helper-ingress-annotation-hint": "Enter a valid annotation name value pair",
"validation-helper-ingress-annotation-message-detail": "The annotation ({{annotation}}) must be a name value pair separate by colon",

"validation-error-dialog-default-title": "Unknown action failed",

"vz-config-title": "Kubernetes Client Configuration for Verrazzano",
"vz-config-coming-soon": "Coming Soon...",
"vz-application-title": "Verrazzano Application",
Expand Down
9 changes: 6 additions & 3 deletions webui/src/js/models/ingress-definition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ define(['knockout', 'utils/observable-properties', 'utils/validation-helper'],
this.dockerRegSecretUserId = props.createProperty('').asCredential();
this.dockerRegSecretUserPwd = props.createProperty('').asCredential();
this.dockerRegSecretUserEmail = props.createProperty('');
this.dockerRegSecretUserEmail.addValidator(...validationHelper.getEmailAddressValidators());

this.createDockerRegSecret = props.createProperty(false);
this.specifyDockerRegSecret = props.createProperty(false);
this.specifyIngressTLSSecret = props.createProperty(false);
Expand All @@ -46,10 +48,11 @@ define(['knockout', 'utils/observable-properties', 'utils/validation-helper'],

this.opensslExecutableFilePath = props.createProperty(window.api.k8s.getOpenSSLFilePath());

this.validators = { TargetPortValidator: validationHelper.getPortNumberValidators(),
this.validators = {
targetPortValidator: validationHelper.getPortNumberValidators(),
k8sNameValidator: validationHelper.getK8sNameValidators(),
VirtualHostNameValidator: validationHelper.getHostNameValidators(),
IngressPathValidator: validationHelper.getIngressPathValidators()
virtualHostNameValidator: validationHelper.getHostNameValidators(),
ingressPathValidator: validationHelper.getIngressPathValidators()
};

this.voyagerProvider = props.createProperty('OKE');
Expand Down
40 changes: 12 additions & 28 deletions webui/src/js/utils/ingress-controller-installer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ function(project, wktConsole, k8sHelper, i18n, projectIo, dialogHelper, validati
if (ingressControllerProvider === 'traefik' && dockerSecretName) {
args['deployment.imagePullSecrets[0].name'] = dockerSecretName;
}

if (ingressControllerProvider === 'traefik' || ingressControllerProvider === 'nginx') {
args['kubernetes.namespaces'] = '{' + ingressControllerNamespace + ',' + this.project.k8sDomain.kubernetesNamespace.value + '}';
}
Expand Down Expand Up @@ -256,13 +255,8 @@ function(project, wktConsole, k8sHelper, i18n, projectIo, dialogHelper, validati
await window.api.ipc.invoke('show-error-message', errTitle, errMessage);
return Promise.resolve(false);
}

}


}


} catch(err) {
dialogHelper.closeBusyDialog();
throw err;
Expand All @@ -271,7 +265,6 @@ function(project, wktConsole, k8sHelper, i18n, projectIo, dialogHelper, validati
}
};


this.getHelmOptions = () => {
const options = {};
if (this.project.kubectl.kubeConfig.value) {
Expand Down Expand Up @@ -303,40 +296,31 @@ function(project, wktConsole, k8sHelper, i18n, projectIo, dialogHelper, validati
validationHelper.validateRequiredField(this.project.ingress.ingressControllerProvider.value));

if (this.project.ingress.installIngressController.value === true) {

validationObject.addField('ingress-design-ingress-namespace-label',
validationHelper.validateRequiredField(this.project.ingress.ingressControllerNamespace.value));
this.project.ingress.ingressControllerNamespace.validate(true));
validationObject.addField('ingress-design-ingress-name-label',
validationHelper.validateRequiredField(this.project.ingress.ingressControllerName.value));
this.project.ingress.ingressControllerName.validate(true));

const ingressControllerProvider = this.project.ingress.ingressControllerProvider.value;

if (ingressControllerProvider === 'traefik' || ingressControllerProvider === 'voyager' ) {

if (this.project.ingress.specifyDockerRegSecret.value === true) {
validationObject.addField('ingress-design-ingress-docker-reg-secret-name',
validationHelper.validateRequiredField(this.project.ingress.dockerRegSecretName.value));
}

if (this.project.ingress.createDockerRegSecret.value == true) {
validationObject.addField('ingress-design-ingress-docker-reg-secret-useremail',
validationHelper.validateRequiredField(this.project.ingress.dockerRegSecretUserEmail.value));
validationObject.addField('ingress-design-ingress-docker-reg-secret-useremail',
validationHelper.validateEmailAddress(this.project.ingress.dockerRegSecretUserEmail.value));
validationObject.addField('ingress-design-ingress-docker-reg-secret-userid',
validationHelper.validateRequiredField(this.project.ingress.dockerRegSecretUserId.value));
validationObject.addField('ingress-design-ingress-docker-reg-secret-userpwd',
validationHelper.validateRequiredField(this.project.ingress.dockerRegSecretUserPwd.value));
this.project.ingress.dockerRegSecretName.validate(true));

if (this.project.ingress.createDockerRegSecret.value === true) {
validationObject.addField('ingress-design-ingress-docker-reg-secret-useremail',
this.project.ingress.dockerRegSecretUserEmail.validate(true));
validationObject.addField('ingress-design-ingress-docker-reg-secret-userid',
validationHelper.validateRequiredField(this.project.ingress.dockerRegSecretUserId.value));
validationObject.addField('ingress-design-ingress-docker-reg-secret-userpwd',
validationHelper.validateRequiredField(this.project.ingress.dockerRegSecretUserPwd.value));
}
}

}
}

return validationObject;
};

}

return new IngressInstaller();
});

29 changes: 15 additions & 14 deletions webui/src/js/utils/ingress-resource-generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ define(['models/wkt-project', 'js-yaml'],
for (const route of this.project.ingress.ingressRoutes.value) {
switch (this.project.ingress.ingressControllerProvider.value) {
case 'voyager':
ingressRouteData = this.createVoyagerRoutesAsYaml(route, this.project);
ingressRouteData = this.createVoyagerRoutesAsYaml(route);
break;

case 'traefik':
ingressRouteData = this.createTraefikRoutesAsYaml(route, this.project);
ingressRouteData = this.createTraefikRoutesAsYaml(route);
break;

case 'nginx':
ingressRouteData = this.createNginxRoutesAsYaml(route, this.project);
ingressRouteData = this.createNginxRoutesAsYaml(route);
break;
}
lines.push(ingressRouteData, '');
Expand All @@ -39,7 +39,7 @@ define(['models/wkt-project', 'js-yaml'],
return lines;
}

createVoyagerRoutesAsYaml(item, wktProject) {
createVoyagerRoutesAsYaml(item) {
const namespace = item['targetServiceNameSpace'] || 'default';

const result = {
Expand Down Expand Up @@ -67,21 +67,21 @@ define(['models/wkt-project', 'js-yaml'],
]
}
};
this.addTlsSpec(result, item, wktProject);
this.addTlsSpec(result, item);
this.addVirtualHost(result, item);
this.addAnnotations(result, item);
return jsYaml.dump(result);
}

createNginxRoutesAsYaml(item, wktProject) {
return this._createStandardRoutesAsYaml(item, wktProject);
createNginxRoutesAsYaml(item) {
return this._createStandardRoutesAsYaml(item);
}

createTraefikRoutesAsYaml(item, wktProject) {
return this._createStandardRoutesAsYaml(item, wktProject);
createTraefikRoutesAsYaml(item) {
return this._createStandardRoutesAsYaml(item);
}

_createStandardRoutesAsYaml(item, wktProject) {
_createStandardRoutesAsYaml(item) {
const namespace = item['targetServiceNameSpace'] || 'default';

const result = {
Expand Down Expand Up @@ -114,16 +114,17 @@ define(['models/wkt-project', 'js-yaml'],
]
}
};
this.addTlsSpec(result, item, wktProject);
this.addTlsSpec(result, item);
this.addVirtualHost(result, item);
this.addAnnotations(result, item);
return jsYaml.dump(result);
}

addTlsSpec(result, item, wktProject) {
if (item && item['tlsEnabled'] === true) {
addTlsSpec(result, item) {
// If the Ingress TLS secret is not enabled, do not add the ingress TLS secret name even if it exists.
if (this.project.ingress.specifyIngressTLSSecret.value && item && item['tlsEnabled'] === true) {
if (!item['tlsSecretName']) {
item['tlsSecretName'] = wktProject.ingress.ingressTLSSecretName.value;
item['tlsSecretName'] = this.project.ingress.ingressTLSSecretName.value;
}

const obj = { secretName: item['tlsSecretName'] };
Expand Down
Loading