Impl [Clusters] key/value field is missing validation (iguazio#1400)

roman-pasternak · Jul 25, 2022 · f498bd5 · f498bd5
1 parent 849d1fe
commit f498bd5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/i18n/en/common.json b/src/i18n/en/common.json
@@ -328,6 +328,7 @@
     "NO_EVENTS": "No events",
     "NO_TASKS": "No {{- currentTab}} tasks",
     "NOT_READY": "Not ready",
+    "NOT_START_WITH_FORBIDDEN_WORDS_K8S": "Must not start with 'kubernetes.io', 'k8s.io'",
     "NODE": "Node",
     "NODES": "Nodes",
     "NONE": "None",

diff --git a/src/i18n/en/functions.json b/src/i18n/en/functions.json
@@ -180,7 +180,6 @@
     "NO_LOGS_HAVE_BEEN_FOUND": "No logs have been found...",
     "NODE_SELECTORS": "Node selector",
     "NORMAL": "Normal",
-    "NOT_START_WITH_FORBIDDEN_WORDS_ANNOTATION": "Must not start with 'kubernetes.io', 'k8s.io'",
     "NOT_START_WITH_FORBIDDEN_WORDS_LABEL": "Must not start with 'kubernetes.io', 'k8s.io' or 'nuclio.io'",
     "NOT_YET_DEPLOYED": "Not yet deployed",
     "OAUTH2": "OAuth2",

diff --git a/src/igz_controls/services/validation.service.js b/src/igz_controls/services/validation.service.js
@@ -374,7 +374,7 @@
                         {
                             name: 'prefixNotStart',
                             label: '[' + $i18next.t('functions:PREFIX', {lng: lng}) + '] ' +
-                                $i18next.t('functions:NOT_START_WITH_FORBIDDEN_WORDS_ANNOTATION', {lng: lng}),
+                                $i18next.t('common:NOT_START_WITH_FORBIDDEN_WORDS_K8S', {lng: lng}),
                             pattern: /^(?!kubernetes\.io\/)(?!k8s\.io\/)/
                         })
                 },
@@ -440,6 +440,15 @@
                 },
                 hiveMetastorePath: [generateRule.endNotWith('/')]
             },
+            clusters: {
+                label: commonRules.prefixedQualifiedName.concat(
+                    {
+                        name: 'prefixNotStart',
+                        label: '[' + $i18next.t('functions:PREFIX', {lng: lng}) + '] ' +
+                            $i18next.t('common:NOT_START_WITH_FORBIDDEN_WORDS_K8S', {lng: lng}),
+                        pattern: /^(?!kubernetes\.io\/)(?!k8s\.io\/)/
+                    })
+            },
             container: {
                 name: [
                     generateRule.validCharacters('a-z 0-9 - _'),