Merge pull request #1007 from zhangzujian/update-crd

update provider network CRD
kubeovn · Sep 6, 2021 · 8b898e2 · 8b898e2
2 parents 00cd3a8 + 2942296
commit 8b898e2
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 0 deletions.
diff --git a/dist/images/install-pre-1.16.sh b/dist/images/install-pre-1.16.sh
@@ -598,18 +598,32 @@ spec:
   validation:
     openAPIV3Schema:
       properties:
+        metadata:
+          type: object
+          properties:
+            name:
+              type: string
+              maxLength: 12
+              not:
+                enum:
+                  - int
+                  - external
         spec:
           type: object
           properties:
             defaultInterface:
               type: string
+              maxLength: 15
+              pattern: '^[^/\s]+$'
             customInterfaces:
               type: array
               items:
                 type: object
                 properties:
                   interface:
                     type: string
+                    maxLength: 15
+                    pattern: '^[^/\s]+$'
                   nodes:
                     type: array
                     items:

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -629,18 +629,32 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            metadata:
+              type: object
+              properties:
+                name:
+                  type: string
+                  maxLength: 12
+                  not:
+                    enum:
+                      - int
+                      - external
             spec:
               type: object
               properties:
                 defaultInterface:
                   type: string
+                  maxLength: 15
+                  pattern: '^[^/\s]+$'
                 customInterfaces:
                   type: array
                   items:
                     type: object
                     properties:
                       interface:
                         type: string
+                        maxLength: 15
+                        pattern: '^[^/\s]+$'
                       nodes:
                         type: array
                         items:

diff --git a/yamls/crd-pre-1.16.yaml b/yamls/crd-pre-1.16.yaml
@@ -267,18 +267,32 @@ spec:
   validation:
     openAPIV3Schema:
       properties:
+        metadata:
+          type: object
+          properties:
+            name:
+              type: string
+              maxLength: 12
+              not:
+                enum:
+                  - int
+                  - external
         spec:
           type: object
           properties:
             defaultInterface:
               type: string
+              maxLength: 15
+              pattern: '^[^/\s]+$'
             customInterfaces:
               type: array
               items:
                 type: object
                 properties:
                   interface:
                     type: string
+                    maxLength: 15
+                    pattern: '^[^/\s]+$'
                   nodes:
                     type: array
                     items:

diff --git a/yamls/crd.yaml b/yamls/crd.yaml
@@ -287,18 +287,32 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            metadata:
+              type: object
+              properties:
+                name:
+                  type: string
+                  maxLength: 12
+                  not:
+                    enum:
+                      - int
+                      - external
             spec:
               type: object
               properties:
                 defaultInterface:
                   type: string
+                  maxLength: 15
+                  pattern: '^[^/\s]+$'
                 customInterfaces:
                   type: array
                   items:
                     type: object
                     properties:
                       interface:
                         type: string
+                        maxLength: 15
+                        pattern: '^[^/\s]+$'
                       nodes:
                         type: array
                         items: