HOTFIX: Possible bug in CRDs (openAPIV3Schema) in Kubernetes Upstream

k8spin · Mar 7, 2020 · b6ea417 · b6ea417
1 parent bc98868
commit b6ea417
Showing 1 changed file with 2 additions and 61 deletions.
diff --git a/deploy/crds.yaml b/deploy/crds.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: organizations.grafana.k8spin.cloud
@@ -9,42 +9,6 @@ spec:
     - name: v1
       served: true
       storage: true
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              type: object
-              properties:
-                datasources:
-                  description: Grafana datasources
-                  type: array
-                  items:
-                    type: object
-                    required: [name, data]
-                    properties:
-                      name:
-                        type: string
-                      data:
-                        type: string
-                dashboards:
-                  description: Grafana dashboards
-                  type: array
-                  items:
-                    type: object
-                    required: [name, data]
-                    properties:
-                      name:
-                        type: string
-                      data:
-                        type: string
-      additionalPrinterColumns:
-      - jsonPath: .spec.datasources[*].name
-        name: Datasources
-        type: string
-      - jsonPath: .spec.dashboards[*].name
-        name: Dashboards
-        type: string  
   names:
     kind: Organization
     plural: organizations
@@ -53,7 +17,7 @@ spec:
       - orgs
       - org
 ---
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: users.grafana.k8spin.cloud
@@ -64,29 +28,6 @@ spec:
     - name: v1
       served: true
       storage: true
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              type: object
-              required: [email]
-              properties:
-                email:
-                  description: User's email to access Grafana
-                  type: string
-                organizations:
-                  description: Organizations where the user belongs
-                  type: array
-                  items:
-                    type: string
-      additionalPrinterColumns:
-      - jsonPath: .spec.email
-        name: Email
-        type: string
-      - jsonPath: .spec.organizations
-        name: Organizations
-        type: string
   names:
     kind: User
     plural: users