Revert "Revert "Revert "Revert "Update to stable CRD v1 release""""

This reverts commit 7a24919.
vmware-tanzu · Jun 18, 2020 · 457a6d0 · 457a6d0
1 parent 2d70a71
commit 457a6d0
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 75 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
+CRD_OPTIONS ?= "crd:crdVersions=v1"
 GINKGO_ARGS = -r -p -randomizeSuites -randomizeAllSpecs
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)

diff --git a/helm/projects-operator/crds/projects.vmware.com_projectaccesses.yaml b/helm/projects-operator/crds/projects.vmware.com_projectaccesses.yaml
@@ -1,6 +1,6 @@
 
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
@@ -15,37 +15,36 @@ spec:
     plural: projectaccesses
     singular: projectaccess
   scope: Cluster
-  validation:
-    openAPIV3Schema:
-      description: ProjectAccess is the Schema for the projectaccesses API
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: ProjectAccessSpec defines the desired state of ProjectAccess
-          type: object
-        status:
-          description: ProjectAccessStatus defines the observed state of ProjectAccess
-          properties:
-            projects:
-              items:
-                type: string
-              type: array
-          type: object
-      type: object
-  version: v1alpha1
   versions:
   - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: ProjectAccess is the Schema for the projectaccesses API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ProjectAccessSpec defines the desired state of ProjectAccess
+            type: object
+          status:
+            description: ProjectAccessStatus defines the observed state of ProjectAccess
+            properties:
+              projects:
+                items:
+                  type: string
+                type: array
+            type: object
+        type: object
     served: true
     storage: true
 status:

diff --git a/helm/projects-operator/crds/projects.vmware.com_projects.yaml b/helm/projects-operator/crds/projects.vmware.com_projects.yaml
@@ -1,6 +1,6 @@
 
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
@@ -15,51 +15,50 @@ spec:
     plural: projects
     singular: project
   scope: Cluster
-  validation:
-    openAPIV3Schema:
-      description: Project is the Schema for the projects API
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: ProjectSpec defines the desired state of Project
-          properties:
-            access:
-              items:
-                properties:
-                  kind:
-                    enum:
-                    - ServiceAccount
-                    - User
-                    - Group
-                    type: string
-                  name:
-                    type: string
-                  namespace:
-                    type: string
-                required:
-                - kind
-                - name
-                type: object
-              type: array
-          type: object
-        status:
-          description: ProjectStatus defines the observed state of Project
-          type: object
-      type: object
-  version: v1alpha1
   versions:
   - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Project is the Schema for the projects API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ProjectSpec defines the desired state of Project
+            properties:
+              access:
+                items:
+                  properties:
+                    kind:
+                      enum:
+                      - ServiceAccount
+                      - User
+                      - Group
+                      type: string
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                  - kind
+                  - name
+                  type: object
+                type: array
+            type: object
+          status:
+            description: ProjectStatus defines the observed state of Project
+            type: object
+        type: object
     served: true
     storage: true
 status: