Fixes to CRD v1 compatibility in tests.

Signed-off-by: Ben Luddy <bluddy@redhat.com>
operator-framework · Jul 12, 2021 · b7febc1 · b7febc1
1 parent 455e603
commit b7febc1
Show file tree

Hide file tree

Showing 22 changed files with 200 additions and 102 deletions.
diff --git a/test/e2e/crd_e2e_test.go b/test/e2e/crd_e2e_test.go
@@ -37,6 +37,7 @@ var _ = Describe("CRD Versions", func() {
 				Name: crdName,
 			},
 			Spec: apiextensionsv1.CustomResourceDefinitionSpec{
+				Scope: apiextensionsv1.NamespaceScoped,
 				Group: "cluster.com",
 				Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
 					{
@@ -141,7 +142,7 @@ var _ = Describe("CRD Versions", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		}
 
@@ -183,6 +184,7 @@ var _ = Describe("CRD Versions", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
+				Scope: apiextensions.NamespaceScoped,
 			},
 		}
 
@@ -307,7 +309,7 @@ var _ = Describe("CRD Versions", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensionsv1.NamespaceScoped,
 			},
 		}
 		_, err := c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Create(context.TODO(), oldCRD, metav1.CreateOptions{})
@@ -321,13 +323,18 @@ var _ = Describe("CRD Versions", func() {
 			}
 			GinkgoT().Logf("old crd status stored versions: %#v", oldCRD.Status.StoredVersions)
 
-			// set v1alpha1 to no longer served
+			// set v1alpha1 to no longer stored
 			oldCRD.Spec.Versions[0].Storage = false
 			// update CRD on-cluster with a new version
 			oldCRD.Spec.Versions = append(oldCRD.Spec.Versions, apiextensionsv1.CustomResourceDefinitionVersion{
 				Name:    "v1alpha2",
 				Served:  true,
 				Storage: true,
+				Schema: &apiextensionsv1.CustomResourceValidation{
+					OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
+						Type: "object",
+					},
+				},
 			})
 
 			updatedCRD, err := c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Update(context.TODO(), oldCRD, metav1.UpdateOptions{})
@@ -364,7 +371,7 @@ var _ = Describe("CRD Versions", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		}
 

diff --git a/test/e2e/csv_e2e_test.go b/test/e2e/csv_e2e_test.go
@@ -899,7 +899,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		})
 		Expect(err).ShouldNot(HaveOccurred())
@@ -1238,7 +1238,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		}
 		crd.SetOwnerReferences([]metav1.OwnerReference{{
@@ -2381,8 +2381,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		})
 
@@ -2574,7 +2573,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		})
 		Expect(err).ShouldNot(HaveOccurred())
@@ -2764,7 +2763,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		})
 		Expect(err).ShouldNot(HaveOccurred())
@@ -2954,7 +2953,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		})
 
@@ -3125,7 +3124,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		})
 		Expect(err).ShouldNot(HaveOccurred())
@@ -3403,7 +3402,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		})
 		Expect(err).ShouldNot(HaveOccurred())
@@ -3567,7 +3566,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		})
 		defer cleanupCRD()
@@ -3797,7 +3796,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 					Kind:     crdPlural,
 					ListKind: "list" + crdPlural,
 				},
-				Scope: "Namespaced",
+				Scope: apiextensions.NamespaceScoped,
 			},
 		})
 		Expect(err).ShouldNot(HaveOccurred())
@@ -4346,7 +4345,7 @@ func newMockExtServerDeployment(labelName string, mGVKs []mockGroupVersionKind)
 	for _, mGVK := range mGVKs {
 		containers = append(containers, corev1.Container{
 			Name:    genName(mGVK.Name),
-			Image:   "quay.io/coreos/mock-extension-apiserver:master",
+			Image:   "quay.io/operator-framework/mock-extension-apiserver:master",
 			Command: []string{"/bin/mock-extension-apiserver"},
 			Args: []string{
 				"-v=4",

diff --git a/test/e2e/data/catalog.new.yaml b/test/e2e/data/catalog.new.yaml
@@ -6,26 +6,38 @@ metadata:
   namespace: tectonic-system
 data:
   customResourceDefinitions: |-
-    - apiVersion: apiextensions.k8s.io/v1beta1
+    - apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
       metadata:
         name: testcs.example.com
       spec:
         group: example.com
-        version: v1alpha1
+        versions:
+        - name: v1alpha1
+          served: true
+          storage: true
+          schema:
+            openAPIV3Schema:
+              type: object
         scope: Namespaced
         names:
           plural: testcs
           singular: testc
           kind: TestC
           listKind: TestCList
-    - apiVersion: apiextensions.k8s.io/v1beta1
+    - apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
       metadata:
         name: testbs.example.com
       spec:
         group: example.com
-        version: v1alpha1
+        versions:
+        - name: v1alpha1
+          served: true
+          storage: true
+          schema:
+            openAPIV3Schema:
+              type: object
         scope: Namespaced
         names:
           plural: testbs

diff --git a/test/e2e/data/catalog.old.yaml b/test/e2e/data/catalog.old.yaml
@@ -6,26 +6,38 @@ metadata:
   namespace: tectonic-system
 data:
   customResourceDefinitions: |-
-    - apiVersion: apiextensions.k8s.io/v1beta1
+    - apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
       metadata:
         name: testas.example.com
       spec:
         group: example.com
-        version: v1alpha1
+        versions:
+        - name: v1alpha1
+          served: true
+          storage: true
+          schema:
+            openAPIV3Schema:
+              type: object
         scope: Namespaced
         names:
           plural: testas
           singular: testa
           kind: TestA
           listKind: TestAList
-    - apiVersion: apiextensions.k8s.io/v1beta1
+    - apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
       metadata:
         name: testbs.example.com
       spec:
         group: example.com
-        version: v1alpha1
+        versions:
+        - name: v1alpha1
+          served: true
+          storage: true
+          schema:
+            openAPIV3Schema:
+              type: object
         scope: Namespaced
         names:
           plural: testbs

diff --git a/test/e2e/data/kiali-image-bundle/manifests/kiali.crd.yaml b/test/e2e/data/kiali-image-bundle/manifests/kiali.crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: kialis.kiali.io
@@ -12,10 +12,12 @@ spec:
     plural: kialis
     singular: kiali
   scope: Namespaced
-  subresources:
-    status: {}
-  version: v1alpha1
   versions:
   - name: v1alpha1
     served: true
     storage: true
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        type: object
diff --git a/test/e2e/data/kiali-image-bundle/manifests/kiali.monitoringdashboards.crd.yaml b/test/e2e/data/kiali-image-bundle/manifests/kiali.monitoringdashboards.crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: monitoringdashboards.monitoring.kiali.io
@@ -12,4 +12,10 @@ spec:
     plural: monitoringdashboards
     singular: monitoringdashboard
   scope: Namespaced
-  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
diff --git a/test/e2e/data/kiali-manifests/0.18.1/kiali.crd.yaml b/test/e2e/data/kiali-manifests/0.18.1/kiali.crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: kialis.kiali.io
@@ -12,10 +12,12 @@ spec:
     plural: kialis
     singular: kiali
   scope: Namespaced
-  subresources:
-    status: {}
-  version: v1alpha1
   versions:
   - name: v1alpha1
     served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+    subresources:
+      status: {}
diff --git a/test/e2e/data/kiali-manifests/1.1.0/kiali.crd.yaml b/test/e2e/data/kiali-manifests/1.1.0/kiali.crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: kialis.kiali.io
@@ -12,10 +12,12 @@ spec:
     plural: kialis
     singular: kiali
   scope: Namespaced
-  subresources:
-    status: {}
-  version: v1alpha1
   versions:
   - name: v1alpha1
     served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+    subresources:
+      status: {}
diff --git a/test/e2e/data/kiali-manifests/1.1.0/kiali.monitoringdashboards.crd.yaml b/test/e2e/data/kiali-manifests/1.1.0/kiali.monitoringdashboards.crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: monitoringdashboards.monitoring.kiali.io
@@ -12,4 +12,10 @@ spec:
     plural: monitoringdashboards
     singular: monitoringdashboard
   scope: Namespaced
-  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
diff --git a/test/e2e/data/kiali-manifests/1.3.1/kiali.crd.yaml b/test/e2e/data/kiali-manifests/1.3.1/kiali.crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: kialis.kiali.io
@@ -12,10 +12,12 @@ spec:
     plural: kialis
     singular: kiali
   scope: Namespaced
-  subresources:
-    status: {}
-  version: v1alpha1
   versions:
   - name: v1alpha1
     served: true
     storage: true
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        type: object
diff --git a/test/e2e/data/kiali-manifests/1.3.1/kiali.monitoringdashboards.crd.yaml b/test/e2e/data/kiali-manifests/1.3.1/kiali.monitoringdashboards.crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: monitoringdashboards.monitoring.kiali.io
@@ -12,4 +12,10 @@ spec:
     plural: monitoringdashboards
     singular: monitoringdashboard
   scope: Namespaced
-  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object