Allow fqdn to have uppercase / fix delegate type / pattern

Signed-off-by: Steve Sloka <[email protected]>
projectcontour · Jun 25, 2018 · c154337 · c154337
1 parent 81f4e1e
commit c154337
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/deployment/common/common.yaml b/deployment/common/common.yaml
@@ -33,7 +33,7 @@ spec:
               properties:
                 fqdn:
                   type: string
-                  pattern: ^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$
+                  pattern: ^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-z]{2,}$
                 aliases:
                   type: array
                   items:
@@ -77,11 +77,10 @@ spec:
                     type: string
                     pattern: ^\/.*$
                   delegate:
-                    type: string
+                    type: object
                     required:
                       - name
                       - namespace
-                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ # DNS-1123
                     properties:
                       name:
                         type: string

diff --git a/deployment/render/daemonset-norbac.yaml b/deployment/render/daemonset-norbac.yaml
@@ -36,7 +36,7 @@ spec:
               properties:
                 fqdn:
                   type: string
-                  pattern: ^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$
+                  pattern: ^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-z]{2,}$
                 aliases:
                   type: array
                   items:
@@ -80,11 +80,10 @@ spec:
                     type: string
                     pattern: ^\/.*$
                   delegate:
-                    type: string
+                    type: object
                     required:
                       - name
                       - namespace
-                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ # DNS-1123
                     properties:
                       name:
                         type: string

diff --git a/deployment/render/daemonset-rbac.yaml b/deployment/render/daemonset-rbac.yaml
@@ -36,7 +36,7 @@ spec:
               properties:
                 fqdn:
                   type: string
-                  pattern: ^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$
+                  pattern: ^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-z]{2,}$
                 aliases:
                   type: array
                   items:
@@ -80,11 +80,10 @@ spec:
                     type: string
                     pattern: ^\/.*$
                   delegate:
-                    type: string
+                    type: object
                     required:
                       - name
                       - namespace
-                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ # DNS-1123
                     properties:
                       name:
                         type: string

diff --git a/deployment/render/deployment-norbac.yaml b/deployment/render/deployment-norbac.yaml
@@ -36,7 +36,7 @@ spec:
               properties:
                 fqdn:
                   type: string
-                  pattern: ^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$
+                  pattern: ^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-z]{2,}$
                 aliases:
                   type: array
                   items:
@@ -80,11 +80,10 @@ spec:
                     type: string
                     pattern: ^\/.*$
                   delegate:
-                    type: string
+                    type: object
                     required:
                       - name
                       - namespace
-                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ # DNS-1123
                     properties:
                       name:
                         type: string

diff --git a/deployment/render/deployment-rbac.yaml b/deployment/render/deployment-rbac.yaml
@@ -36,7 +36,7 @@ spec:
               properties:
                 fqdn:
                   type: string
-                  pattern: ^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$
+                  pattern: ^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-z]{2,}$
                 aliases:
                   type: array
                   items:
@@ -80,11 +80,10 @@ spec:
                     type: string
                     pattern: ^\/.*$
                   delegate:
-                    type: string
+                    type: object
                     required:
                       - name
                       - namespace
-                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ # DNS-1123
                     properties:
                       name:
                         type: string