From 58baa629bc719e2cca4fcb39da4487f774db5377 Mon Sep 17 00:00:00 2001 From: Dmytro Dovbii Date: Tue, 14 Apr 2015 12:54:28 +0300 Subject: [PATCH] Use more clean and simple regexp validator in UI of k8s Cluster Old validator was quite strange and difficult. Validators in another apps also were fixed. Change-Id: Id191b5e2f260e29113655d9fa034f3fa31d832e0 --- Kubernetes/KubernetesCluster/package/UI/ui.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Kubernetes/KubernetesCluster/package/UI/ui.yaml b/Kubernetes/KubernetesCluster/package/UI/ui.yaml index 5acb4f4..fa3cd11 100644 --- a/Kubernetes/KubernetesCluster/package/UI/ui.yaml +++ b/Kubernetes/KubernetesCluster/package/UI/ui.yaml @@ -92,7 +92,10 @@ Forms: description: >- For your convenience instance hostname can be specified. Enter a name or leave blank for random name generation. - regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$' + regexpValidator: '^[a-zA-z][-_\w#]*$' + maxLength: 64 + errorMessages: + invalid: Just letters, numbers, underscores, sharps and hyphens are allowed. label: Kubernetes node hostname pattern - name: enableMonitoring type: boolean @@ -130,7 +133,10 @@ Forms: type: string initial: gateway-# required: false - regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$' + maxLength: 64 + regexpValidator: '^[a-zA-z][-_\w#]*$' + errorMessages: + invalid: Just letters, numbers, underscores, sharps and hyphens are allowed. label: Gateway hostname pattern helpText: \'#\' expands to gateway sequence number description: >-