ObjectMeta should use additionalProperties

Rather than using `x-kubernetes-preserve-unknown-fields` which allows both keys and values of any type, we should use `additionalProperties` which only allows a specified type (in this case "string") for keys and values. Better validation!
googleforgames · Jan 14, 2021 · 07aa310 · 07aa310
1 parent 7a4d1bc
commit 07aa310
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/install/helm/agones/templates/crds/_gameserverspecschema.yaml b/install/helm/agones/templates/crds/_gameserverspecschema.yaml
@@ -24,10 +24,12 @@ properties:
     properties:
       labels:
         type: object
-        x-kubernetes-preserve-unknown-fields: true
+        additionalProperties:
+          type: string
       annotations:
         type: object
-        x-kubernetes-preserve-unknown-fields: true
+        additionalProperties:
+          type: string
   {{- end}}
   spec:
     type: object

diff --git a/install/yaml/install.yaml b/install/yaml/install.yaml
@@ -231,10 +231,12 @@ spec:
                      properties:
                        labels:
                          type: object
-                         x-kubernetes-preserve-unknown-fields: true
+                         additionalProperties:
+                           type: string
                        annotations:
                          type: object
-                         x-kubernetes-preserve-unknown-fields: true
+                         additionalProperties:
+                           type: string
                    spec:
                      type: object
                      required:
@@ -970,10 +972,12 @@ spec:
                       properties:
                         labels:
                           type: object
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                         annotations:
                           type: object
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                     spec:
                       type: object
                       required: