Merge pull request #32 from jhadvig/OCPBUGS-56830

OCPBUGS-56830: Add required fields to the CronTab CRD

Author: openshift-merge-bot[bot]

charts/console-crontab-plugin/templates/crontab-crd.yaml

@@ -16,9 +16,26 @@ spec:
       schema:
         openAPIV3Schema:
           type: object
+          required:
+            - apiVersion
+            - kind
+            - metadata
+            - spec
           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:
               type: object
+              required:
+                - cronSpec
+                - image
+                - replicas
               properties:
                 cronSpec:
                   type: string

integration-tests/e2e/crud.cy.ts

@@ -48,7 +48,7 @@ describe(`${PLUGIN_NAME}`, () => {
     nav.sidenav.clickNavLink(["Workloads", "CronTabs"]);
     common.resourceTitleShouldHaveText("CronTabs");
     listPage.clickCreateYAMLbutton();
-    cy.byLegacyTestID("resource-title").should("contain", "Create CronTab");
+    cy.get('[data-test="page-heading"] h1').should("contain", "Create CronTab");
     cy.byTestID("save-changes").click();
     common.inlineDangerAlert().should("not.exist");
     common.resourceTitleShouldHaveText(cronTabName);

integration-tests/views/common.ts

@@ -70,5 +70,5 @@ export const teardown = () => {
 export const common = {
   inlineDangerAlert: () => cy.get(".pf-c-alert.pf-m-inline.pf-m-danger"),
   resourceTitleShouldHaveText: (title: string) =>
-    cy.byLegacyTestID("resource-title").should("have.text", title),
+    cy.get('[data-test="page-heading"] h1').contains(title).should("exist"),
 };