From d3d4653eaed5ad6d45e15a044e95638e635c7958 Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Wed, 16 Oct 2019 19:06:42 +0100 Subject: [PATCH 01/12] switch data-cy selectors to id selectors --- cypress/fixtures/.keep | 0 cypress/fixtures/crd.yaml | 11 ++ cypress/fixtures/example-foo.yaml | 7 + cypress/integration/crd.spec.js | 167 ++++++++++++++++++ cypress/support/commands.js | 34 +++- i18n/fr/messages.fr.xlf | 54 +++--- i18n/ja/messages.ja.xlf | 48 ++--- i18n/ko/messages.ko.xlf | 49 ++--- i18n/messages.xlf | 48 ++--- i18n/zh/messages.zh.xlf | 48 ++--- package-lock.json | 6 +- package.json | 2 +- src/app/frontend/chrome/nav/template.html | 1 + .../components/list/column/menu/template.html | 3 + .../components/list/zerostate/template.html | 1 + .../dialogs/deleteresource/template.html | 1 + .../common/dialogs/editresource/template.html | 1 + src/app/frontend/crd/detail/template.html | 2 + 18 files changed, 353 insertions(+), 130 deletions(-) delete mode 100644 cypress/fixtures/.keep create mode 100644 cypress/fixtures/crd.yaml create mode 100644 cypress/fixtures/example-foo.yaml create mode 100644 cypress/integration/crd.spec.js diff --git a/cypress/fixtures/.keep b/cypress/fixtures/.keep deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/cypress/fixtures/crd.yaml b/cypress/fixtures/crd.yaml new file mode 100644 index 000000000000..4a457068dcd1 --- /dev/null +++ b/cypress/fixtures/crd.yaml @@ -0,0 +1,11 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: foos.samplecontroller.k8s.io +spec: + group: samplecontroller.k8s.io + version: v1alpha1 + names: + kind: Foo + plural: foos + scope: Namespaced diff --git a/cypress/fixtures/example-foo.yaml b/cypress/fixtures/example-foo.yaml new file mode 100644 index 000000000000..897059c3d0ca --- /dev/null +++ b/cypress/fixtures/example-foo.yaml @@ -0,0 +1,7 @@ +apiVersion: samplecontroller.k8s.io/v1alpha1 +kind: Foo +metadata: + name: example-foo +spec: + deploymentName: example-foo + replicas: 1 diff --git a/cypress/integration/crd.spec.js b/cypress/integration/crd.spec.js new file mode 100644 index 000000000000..93ff5d3894b5 --- /dev/null +++ b/cypress/integration/crd.spec.js @@ -0,0 +1,167 @@ +describe('Custom Resource Definitions', () => { + before(() => { + cy.visit('/'); + }); + + it('crd list is initially empty', () => { + cy.get('#sidebar-crd').click(); + cy.url().should('include', '/#/customresourcedefinition'); + + cy.get('#zero-state').should('be.visible'); + }); + + it('create a crd', () => { + cy.fixture('crd.yaml').then(crd => { + cy.createResource({content: crd}); + cy.reload(); + }); + }); + + it('crd list should contain the new crd', () => { + cy.get('#zero-state').should('not.be.visible'); + cy.get('kd-crd-list').within(() => { + cy.get('mat-row').should('have.length', 1); + }); + }); + + it('go to crd details page', () => { + cy.get('kd-crd-list').within(() => { + cy.get('a') + .first() + .click(); + }); + cy.url().should( + 'include', + '/#/customresourcedefinition/foos.samplecontroller.k8s.io?namespace=default', + ); + + // loads correctly + cy.get('kd-object-meta').within(() => { + cy.get('kd-property') + .first() + .contains('foos.samplecontroller.k8s.io'); + }); + + // has resource information + cy.get('#resource-information').within(() => { + cy.get('kd-property').should('have.length', 3); + + cy.get('kd-property') + .eq(0) + .contains('v1alpha1'); + cy.get('kd-property') + .eq(1) + .contains('Namespaced'); + cy.get('kd-property') + .eq(2) + .contains('samplecontroller.k8s.io'); + }); + + // has accepted names + cy.get('#accepted-names').within(() => { + cy.get('kd-property').should('have.length', 4); + + cy.get('kd-property') + .eq(0) + .contains('foos'); + cy.get('kd-property') + .eq(1) + .contains('foo'); + cy.get('kd-property') + .eq(2) + .contains('Foo'); + cy.get('kd-property') + .eq(3) + .contains('FooList'); + }); + + // has empty object section + cy.get('kd-crd-object-list').within(() => { + cy.get('#zero-state').should('be.visible'); + }); + + // has one version + cy.get('kd-crd-versions-list').within(() => { + cy.get('mat-row').should('have.length', 1); + + cy.get('mat-cell') + .first() + .contains('v1alpha1'); + }); + }); + + it('create a crd object', () => { + cy.fixture('example-foo.yaml').then(object => { + cy.createResource({content: object, namespace: 'default'}); + cy.reload(); + }); + }); + + it('crd objects list should contain the new object', () => { + cy.get('kd-crd-object-list').within(() => { + cy.get('#zero-state').should('not.be.visible'); + + cy.get('mat-row').should('have.length', 1); + cy.get('mat-cell') + .first() + .contains('example-foo'); + }); + }); + + it('go to object detail page', () => { + cy.get('kd-crd-object-list').within(() => { + cy.get('a') + .first() + .click(); + }); + + cy.url().should( + 'include', + '/#/customresourcedefinition/foos.samplecontroller.k8s.io/default/example-foo?namespace=default', + ); + + cy.get('kd-object-meta').within(() => { + // Name + cy.get('kd-property') + .eq(0) + .contains('example-foo'); + + // Namespace + cy.get('kd-property') + .eq(1) + .contains('default'); + }); + }); + + it('delete crd object', () => { + cy.server(); + cy.route('DELETE', '/api/v1/_raw/foos.samplecontroller.k8s.io/**').as('deleteObject'); + + cy.get('kd-actionbar-detail-delete').click(); + cy.get('#confirm-delete').click(); + + cy.wait('@deleteObject'); + + // browser goes to the crd list page on deletion + cy.url().should('include', '/#/customresourcedefinition?namespace=default'); + }); + + it('delete crd', () => { + cy.server(); + cy.route('DELETE', '/api/v1/_raw/customresourcedefinition/**').as('deleteCRD'); + + cy.get('#delete').should('not.be.visible'); + cy.get('#more-menu').click(); + cy.get('#delete').should('be.visible'); + + cy.get('#delete').click(); + cy.get('#confirm-delete').click(); + + cy.wait('@deleteCRD'); + + cy.reload(); + cy.get('kd-crd-list').within(() => { + cy.get('#zero-state').should('be.visible'); + }); + }); +}); diff --git a/cypress/support/commands.js b/cypress/support/commands.js index d60f01bf99a7..a1e91f54a080 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -1,3 +1,31 @@ -// *********************************************** -// Create various custom commands and overwrite existing commands. -// *********************************************** +Cypress.Commands.add( + 'createResource', + ({resource = '', name = '', namespace = '', content = ''}) => { + return getCsrfToken('appdeploymentfromfile').then(response => { + const {token} = response.body; + + return cy.request({ + url: '/api/v1/appdeploymentfromfile', + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + 'X-CSRF-TOKEN': token, + }, + body: { + name, + namespace, + resource, + content, + }, + }); + }); + }, +); + +function getCsrfToken(action) { + return cy.request({ + url: `api/v1/csrftoken/${action}`, + method: 'GET', + }); +} diff --git a/i18n/fr/messages.fr.xlf b/i18n/fr/messages.fr.xlf index 0ad239c74332..6c6a2d8f9f79 100644 --- a/i18n/fr/messages.fr.xlf +++ b/i18n/fr/messages.fr.xlf @@ -31,7 +31,7 @@ Mettre à jour ../src/app/frontend/common/dialogs/editresource/template.html - 42 + 43 @@ -39,11 +39,11 @@ Annuler ../src/app/frontend/common/dialogs/editresource/template.html - 46 + 47 ../src/app/frontend/common/dialogs/deleteresource/template.html - 48 + 49 ../src/app/frontend/create/from/form/createnamespace/template.html @@ -87,11 +87,11 @@ Supprimer ../src/app/frontend/common/dialogs/deleteresource/template.html - 44 + 45 ../src/app/frontend/common/components/list/column/menu/template.html - 51 + 53 @@ -1167,19 +1167,19 @@ Éditer ../src/app/frontend/common/components/list/column/menu/template.html - 48 + 49 There is nothing to display here Il n'y a rien à afficher ici - ../src/app/frontend/common/components/zerostate/template.html - 23 + ../src/app/frontend/common/components/list/zerostate/template.html + 22 - ../src/app/frontend/common/components/list/zerostate/template.html - 21 + ../src/app/frontend/common/components/zerostate/template.html + 23 @@ -1919,7 +1919,7 @@ ../src/app/frontend/crd/detail/template.html - 67 + 69 @@ -2027,7 +2027,7 @@ ../src/app/frontend/crd/detail/template.html - 38 + 39 @@ -2355,7 +2355,7 @@ Tous les espaces de noms ../src/app/frontend/common/components/namespace/template.html - 33 + 34 @@ -2363,7 +2363,7 @@ ESPACES DE NOMS ../src/app/frontend/common/components/namespace/template.html - 34 + 35 @@ -2467,7 +2467,7 @@ Aucune ressource trouvée. ../src/app/frontend/common/components/list/zerostate/template.html - 24 + 25 @@ -2499,7 +2499,7 @@ Version ../src/app/frontend/crd/detail/template.html - 28 + 29 @@ -2507,7 +2507,7 @@ Portée ../src/app/frontend/crd/detail/template.html - 33 + 34 @@ -2515,7 +2515,7 @@ Sous-ressources ../src/app/frontend/crd/detail/template.html - 43 + 44 @@ -2523,7 +2523,7 @@ Noms acceptés ../src/app/frontend/crd/detail/template.html - 51 + 52 @@ -2531,7 +2531,7 @@ Pluriel ../src/app/frontend/crd/detail/template.html - 57 + 59 @@ -2539,7 +2539,7 @@ Singulier ../src/app/frontend/crd/detail/template.html - 62 + 64 @@ -2547,7 +2547,7 @@ Type de liste ../src/app/frontend/crd/detail/template.html - 72 + 74 @@ -2555,7 +2555,7 @@ Noms abrégés ../src/app/frontend/crd/detail/template.html - 77 + 79 @@ -2563,7 +2563,7 @@ Catégories ../src/app/frontend/crd/detail/template.html - 82 + 84 @@ -2835,7 +2835,7 @@ ../src/app/frontend/chrome/nav/template.html - 136 + 137 @@ -2844,7 +2844,7 @@ Paramètres ../src/app/frontend/chrome/nav/template.html - 147 + 148 @@ -2853,7 +2853,7 @@ À propos ../src/app/frontend/chrome/nav/template.html - 152 + 153 diff --git a/i18n/ja/messages.ja.xlf b/i18n/ja/messages.ja.xlf index 137e95a2484d..1450332a45f9 100644 --- a/i18n/ja/messages.ja.xlf +++ b/i18n/ja/messages.ja.xlf @@ -31,7 +31,7 @@ 更新 ../src/app/frontend/common/dialogs/editresource/template.html - 42 + 43 @@ -39,11 +39,11 @@ キャンセル ../src/app/frontend/common/dialogs/editresource/template.html - 46 + 47 ../src/app/frontend/common/dialogs/deleteresource/template.html - 48 + 49 ../src/app/frontend/create/from/form/createnamespace/template.html @@ -87,11 +87,11 @@ 削除 ../src/app/frontend/common/dialogs/deleteresource/template.html - 44 + 45 ../src/app/frontend/common/components/list/column/menu/template.html - 51 + 53 @@ -523,7 +523,7 @@ 編集 ../src/app/frontend/common/components/list/column/menu/template.html - 48 + 49 @@ -1331,7 +1331,7 @@ ../src/app/frontend/crd/detail/template.html - 67 + 69 @@ -1464,7 +1464,7 @@ ../src/app/frontend/crd/detail/template.html - 38 + 39 @@ -1668,7 +1668,7 @@ 表示するものがありません ../src/app/frontend/common/components/list/zerostate/template.html - 21 + 22 ../src/app/frontend/common/components/zerostate/template.html @@ -1680,7 +1680,7 @@ リソースがありません。 ../src/app/frontend/common/components/list/zerostate/template.html - 24 + 25 @@ -1756,7 +1756,7 @@ すべてのネームスペース ../src/app/frontend/common/components/namespace/template.html - 33 + 34 @@ -1764,7 +1764,7 @@ ネームスペース ../src/app/frontend/common/components/namespace/template.html - 34 + 35 @@ -2565,7 +2565,7 @@ ../src/app/frontend/chrome/nav/template.html - 136 + 137 @@ -2574,7 +2574,7 @@ 設定 ../src/app/frontend/chrome/nav/template.html - 147 + 148 @@ -2583,7 +2583,7 @@ Kubernetes Dashboard について ../src/app/frontend/chrome/nav/template.html - 152 + 153 @@ -2907,7 +2907,7 @@ バージョン ../src/app/frontend/crd/detail/template.html - 28 + 29 @@ -2915,7 +2915,7 @@ スコープ ../src/app/frontend/crd/detail/template.html - 33 + 34 @@ -2923,7 +2923,7 @@ サブリソース ../src/app/frontend/crd/detail/template.html - 43 + 44 @@ -2931,7 +2931,7 @@ 容認された名前 ../src/app/frontend/crd/detail/template.html - 51 + 52 @@ -2939,7 +2939,7 @@ 複数 ../src/app/frontend/crd/detail/template.html - 57 + 59 @@ -2947,7 +2947,7 @@ 単数 ../src/app/frontend/crd/detail/template.html - 62 + 64 @@ -2955,7 +2955,7 @@ 種類一覧 ../src/app/frontend/crd/detail/template.html - 72 + 74 @@ -2963,7 +2963,7 @@ 省略名 ../src/app/frontend/crd/detail/template.html - 77 + 79 @@ -2971,7 +2971,7 @@ カテゴリー ../src/app/frontend/crd/detail/template.html - 82 + 84 diff --git a/i18n/ko/messages.ko.xlf b/i18n/ko/messages.ko.xlf index 6bbf5ec76eaa..566fc97550ac 100644 --- a/i18n/ko/messages.ko.xlf +++ b/i18n/ko/messages.ko.xlf @@ -31,7 +31,7 @@ 업데이트 ../src/app/frontend/common/dialogs/editresource/template.html - 42 + 43 @@ -39,11 +39,11 @@ 취소 ../src/app/frontend/common/dialogs/editresource/template.html - 46 + 47 ../src/app/frontend/common/dialogs/deleteresource/template.html - 48 + 49 ../src/app/frontend/create/from/form/createnamespace/template.html @@ -87,11 +87,11 @@ 삭제 ../src/app/frontend/common/dialogs/deleteresource/template.html - 44 + 45 ../src/app/frontend/common/components/list/column/menu/template.html - 51 + 53 @@ -727,7 +727,7 @@ 편집 ../src/app/frontend/common/components/list/column/menu/template.html - 48 + 49 @@ -1523,7 +1523,7 @@ ../src/app/frontend/crd/detail/template.html - 67 + 69 @@ -1613,7 +1613,7 @@ ../src/app/frontend/crd/detail/template.html - 38 + 39 @@ -1781,7 +1781,7 @@ 여기에 표시할 항목이 없습니다. ../src/app/frontend/common/components/list/zerostate/template.html - 21 + 22 ../src/app/frontend/common/components/zerostate/template.html @@ -1793,7 +1793,7 @@ 검색된 리소스가 없습니다. ../src/app/frontend/common/components/list/zerostate/template.html - 24 + 25 @@ -1917,7 +1917,7 @@ 모든 네임스페이스 ../src/app/frontend/common/components/namespace/template.html - 33 + 34 @@ -1925,7 +1925,7 @@ 네임스페이스 ../src/app/frontend/common/components/namespace/template.html - 34 + 35 @@ -2619,7 +2619,7 @@ ../src/app/frontend/chrome/nav/template.html - 136 + 137 @@ -2629,7 +2629,7 @@ ../src/app/frontend/chrome/nav/template.html - 147 + 148 @@ -2639,7 +2639,7 @@ ../src/app/frontend/chrome/nav/template.html - 152 + 153 @@ -2969,7 +2969,7 @@ 버전 ../src/app/frontend/crd/detail/template.html - 28 + 29 @@ -2977,7 +2977,7 @@ 범위 ../src/app/frontend/crd/detail/template.html - 33 + 34 @@ -2985,7 +2985,7 @@ Subresources ../src/app/frontend/crd/detail/template.html - 43 + 44 @@ -2993,7 +2993,7 @@ Accepted Names ../src/app/frontend/crd/detail/template.html - 51 + 52 @@ -3001,7 +3001,7 @@ 복수 ../src/app/frontend/crd/detail/template.html - 57 + 59 @@ -3009,7 +3009,7 @@ 단수 ../src/app/frontend/crd/detail/template.html - 62 + 64 @@ -3017,7 +3017,7 @@ 종류 리스트 ../src/app/frontend/crd/detail/template.html - 72 + 74 @@ -3025,7 +3025,7 @@ 단축 이름 ../src/app/frontend/crd/detail/template.html - 77 + 79 @@ -3033,7 +3033,7 @@ 카테고리 ../src/app/frontend/crd/detail/template.html - 82 + 84 @@ -3339,6 +3339,7 @@ + ../src/app/frontend/create/from/form/template.html 54 diff --git a/i18n/messages.xlf b/i18n/messages.xlf index 7b66f8b7b6ab..63d849ee40a5 100644 --- a/i18n/messages.xlf +++ b/i18n/messages.xlf @@ -28,18 +28,18 @@ Update ../src/app/frontend/common/dialogs/editresource/template.html - 42 + 43 Cancel ../src/app/frontend/common/dialogs/editresource/template.html - 46 + 47 ../src/app/frontend/common/dialogs/deleteresource/template.html - 48 + 49 ../src/app/frontend/create/from/form/createnamespace/template.html @@ -74,11 +74,11 @@ Delete ../src/app/frontend/common/dialogs/deleteresource/template.html - 44 + 45 ../src/app/frontend/common/components/list/column/menu/template.html - 51 + 53 @@ -646,7 +646,7 @@ Edit ../src/app/frontend/common/components/list/column/menu/template.html - 48 + 49 @@ -1411,7 +1411,7 @@ ../src/app/frontend/crd/detail/template.html - 67 + 69 @@ -1496,7 +1496,7 @@ ../src/app/frontend/crd/detail/template.html - 38 + 39 @@ -1645,7 +1645,7 @@ There is nothing to display here ../src/app/frontend/common/components/list/zerostate/template.html - 21 + 22 ../src/app/frontend/common/components/zerostate/template.html @@ -1656,7 +1656,7 @@ No resources found. ../src/app/frontend/common/components/list/zerostate/template.html - 24 + 25 @@ -1762,14 +1762,14 @@ All namespaces ../src/app/frontend/common/components/namespace/template.html - 33 + 34 NAMESPACES ../src/app/frontend/common/components/namespace/template.html - 34 + 35 @@ -2362,7 +2362,7 @@ ../src/app/frontend/chrome/nav/template.html - 136 + 137 @@ -2370,7 +2370,7 @@ ../src/app/frontend/chrome/nav/template.html - 147 + 148 @@ -2378,7 +2378,7 @@ ../src/app/frontend/chrome/nav/template.html - 152 + 153 @@ -2654,63 +2654,63 @@ Version ../src/app/frontend/crd/detail/template.html - 28 + 29 Scope ../src/app/frontend/crd/detail/template.html - 33 + 34 Subresources ../src/app/frontend/crd/detail/template.html - 43 + 44 Accepted Names ../src/app/frontend/crd/detail/template.html - 51 + 52 Plural ../src/app/frontend/crd/detail/template.html - 57 + 59 Singular ../src/app/frontend/crd/detail/template.html - 62 + 64 List Kind ../src/app/frontend/crd/detail/template.html - 72 + 74 Short Names ../src/app/frontend/crd/detail/template.html - 77 + 79 Categories ../src/app/frontend/crd/detail/template.html - 82 + 84 diff --git a/i18n/zh/messages.zh.xlf b/i18n/zh/messages.zh.xlf index 0f43c5e2ea59..5356321dc28d 100644 --- a/i18n/zh/messages.zh.xlf +++ b/i18n/zh/messages.zh.xlf @@ -31,7 +31,7 @@ 更新 ../src/app/frontend/common/dialogs/editresource/template.html - 42 + 43 @@ -39,11 +39,11 @@ 取消 ../src/app/frontend/common/dialogs/editresource/template.html - 46 + 47 ../src/app/frontend/common/dialogs/deleteresource/template.html - 48 + 49 ../src/app/frontend/create/from/form/createnamespace/template.html @@ -87,11 +87,11 @@ 删除 ../src/app/frontend/common/dialogs/deleteresource/template.html - 44 + 45 ../src/app/frontend/common/components/list/column/menu/template.html - 51 + 53 @@ -727,7 +727,7 @@ 编辑 ../src/app/frontend/common/components/list/column/menu/template.html - 48 + 49 @@ -1523,7 +1523,7 @@ ../src/app/frontend/crd/detail/template.html - 67 + 69 @@ -1613,7 +1613,7 @@ ../src/app/frontend/crd/detail/template.html - 38 + 39 @@ -1781,7 +1781,7 @@ 这里没有可以显示的 ../src/app/frontend/common/components/list/zerostate/template.html - 21 + 22 ../src/app/frontend/common/components/zerostate/template.html @@ -1793,7 +1793,7 @@ 找不到资源。 ../src/app/frontend/common/components/list/zerostate/template.html - 24 + 25 @@ -1869,7 +1869,7 @@ 全部命名空间 ../src/app/frontend/common/components/namespace/template.html - 33 + 34 @@ -1877,7 +1877,7 @@ 命名空间 ../src/app/frontend/common/components/namespace/template.html - 34 + 35 @@ -2619,7 +2619,7 @@ ../src/app/frontend/chrome/nav/template.html - 136 + 137 @@ -2629,7 +2629,7 @@ ../src/app/frontend/chrome/nav/template.html - 147 + 148 @@ -2639,7 +2639,7 @@ ../src/app/frontend/chrome/nav/template.html - 152 + 153 @@ -2969,7 +2969,7 @@ Version ../src/app/frontend/crd/detail/template.html - 28 + 29 @@ -2977,7 +2977,7 @@ Scope ../src/app/frontend/crd/detail/template.html - 33 + 34 @@ -2985,7 +2985,7 @@ Subresources ../src/app/frontend/crd/detail/template.html - 43 + 44 @@ -2993,7 +2993,7 @@ Accepted Names ../src/app/frontend/crd/detail/template.html - 51 + 52 @@ -3001,7 +3001,7 @@ Plural ../src/app/frontend/crd/detail/template.html - 57 + 59 @@ -3009,7 +3009,7 @@ Singular ../src/app/frontend/crd/detail/template.html - 62 + 64 @@ -3017,7 +3017,7 @@ List Kind ../src/app/frontend/crd/detail/template.html - 72 + 74 @@ -3025,7 +3025,7 @@ Short Names ../src/app/frontend/crd/detail/template.html - 77 + 79 @@ -3033,7 +3033,7 @@ Categories ../src/app/frontend/crd/detail/template.html - 82 + 84 diff --git a/package-lock.json b/package-lock.json index 5f82aff1ab1b..a90f2eb20c96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3544,9 +3544,9 @@ "dev": true }, "@types/node": { - "version": "12.7.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz", - "integrity": "sha512-KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==", + "version": "12.11.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.0.tgz", + "integrity": "sha512-7v0K9WHdjFpE3LMj1rdRan7PDO2d9Qky51T0cYzzk7fWoqoYKu/fZHnrF7OhNZVx0uKwYoQFMZ3dgVD51s/vYA==", "dev": true }, "@types/normalize-package-data": { diff --git a/package.json b/package.json index 8a80dddda5a3..4f2183a68a7c 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "@types/jasminewd2": "2.0.8", "@types/js-yaml": "3.12.1", "@types/lodash": "4.14.143", - "@types/node": "12.7.12", + "@types/node": "12.11.0", "babel": "6.23.0", "babel-preset-env": "1.7.0", "babel-register": "6.26.0", diff --git a/src/app/frontend/chrome/nav/template.html b/src/app/frontend/chrome/nav/template.html index 0d28f19b55a9..ce4fd9c61dc7 100644 --- a/src/app/frontend/chrome/nav/template.html +++ b/src/app/frontend/chrome/nav/template.html @@ -131,6 +131,7 @@
Custom Resource Definitions diff --git a/src/app/frontend/common/components/list/column/menu/template.html b/src/app/frontend/common/components/list/column/menu/template.html index 7897c4021f32..52a90aefe284 100644 --- a/src/app/frontend/common/components/list/column/menu/template.html +++ b/src/app/frontend/common/components/list/column/menu/template.html @@ -44,15 +44,18 @@ more_vert diff --git a/src/app/frontend/common/components/list/zerostate/template.html b/src/app/frontend/common/components/list/zerostate/template.html index 5d8e1225aab9..d00962648855 100644 --- a/src/app/frontend/common/components/list/zerostate/template.html +++ b/src/app/frontend/common/components/list/zerostate/template.html @@ -15,6 +15,7 @@ -->
@@ -50,6 +51,7 @@
Accepted Names
From c6f9e5295c4bf84e5e4e6eec3b9323b1e3bb280b Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Wed, 16 Oct 2019 20:41:00 +0100 Subject: [PATCH 02/12] update apiextensions version to v1 --- src/app/backend/client/verber.go | 2 +- src/app/backend/resource/common/resourcechannels.go | 4 ++-- .../resource/customresourcedefinition/client.go | 2 +- .../resource/customresourcedefinition/common.go | 4 ++-- .../resource/customresourcedefinition/detail.go | 11 ++++++----- .../backend/resource/customresourcedefinition/list.go | 4 ++-- .../resource/customresourcedefinition/list_test.go | 2 +- .../resource/customresourcedefinition/objects.go | 9 +++++---- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/app/backend/client/verber.go b/src/app/backend/client/verber.go index 4a5a4394d6d1..cf13e471e1a6 100644 --- a/src/app/backend/client/verber.go +++ b/src/app/backend/client/verber.go @@ -21,7 +21,7 @@ import ( clientapi "github.com/kubernetes/dashboard/src/app/backend/client/api" "github.com/kubernetes/dashboard/src/app/backend/errors" "github.com/kubernetes/dashboard/src/app/backend/resource/customresourcedefinition" - apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" restclient "k8s.io/client-go/rest" diff --git a/src/app/backend/resource/common/resourcechannels.go b/src/app/backend/resource/common/resourcechannels.go index 2d6d7683ff04..f923be636444 100644 --- a/src/app/backend/resource/common/resourcechannels.go +++ b/src/app/backend/resource/common/resourcechannels.go @@ -24,7 +24,7 @@ import ( extensions "k8s.io/api/extensions/v1beta1" rbac "k8s.io/api/rbac/v1" storage "k8s.io/api/storage/v1" - apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" client "k8s.io/client-go/kubernetes" @@ -851,7 +851,7 @@ func GetCustomResourceDefinitionChannel(client apiextensionsclientset.Interface, } go func() { - list, err := client.ApiextensionsV1beta1().CustomResourceDefinitions().List(api.ListEverything) + list, err := client.ApiextensionsV1().CustomResourceDefinitions().List(api.ListEverything) for i := 0; i < numReads; i++ { channel.List <- list channel.Error <- err diff --git a/src/app/backend/resource/customresourcedefinition/client.go b/src/app/backend/resource/customresourcedefinition/client.go index 2a52eccb3b1e..490dd4f2bda5 100644 --- a/src/app/backend/resource/customresourcedefinition/client.go +++ b/src/app/backend/resource/customresourcedefinition/client.go @@ -15,7 +15,7 @@ package customresourcedefinition import ( - apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" diff --git a/src/app/backend/resource/customresourcedefinition/common.go b/src/app/backend/resource/customresourcedefinition/common.go index 7a02ee7e373f..50e4d210d867 100644 --- a/src/app/backend/resource/customresourcedefinition/common.go +++ b/src/app/backend/resource/customresourcedefinition/common.go @@ -18,7 +18,7 @@ import ( "github.com/kubernetes/dashboard/src/app/backend/resource/common" "github.com/kubernetes/dashboard/src/app/backend/resource/dataselect" api "k8s.io/api/core/v1" - apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -92,7 +92,7 @@ func fromObjectCells(cells []dataselect.DataCell) []CustomResourceObject { func getCustomResourceDefinitionGroupVersion(crd *apiextensions.CustomResourceDefinition) schema.GroupVersion { return schema.GroupVersion{ Group: crd.Spec.Group, - Version: crd.Spec.Version, + Version: crd.Spec.Versions[0].Name, } } diff --git a/src/app/backend/resource/customresourcedefinition/detail.go b/src/app/backend/resource/customresourcedefinition/detail.go index 905c32d145b7..01927cb645b3 100644 --- a/src/app/backend/resource/customresourcedefinition/detail.go +++ b/src/app/backend/resource/customresourcedefinition/detail.go @@ -18,7 +18,7 @@ import ( "github.com/kubernetes/dashboard/src/app/backend/errors" "github.com/kubernetes/dashboard/src/app/backend/resource/common" "github.com/kubernetes/dashboard/src/app/backend/resource/dataselect" - apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" @@ -44,7 +44,7 @@ type CustomResourceDefinitionVersion struct { // GetCustomResourceDefinitionDetail returns detailed information about a custom resource definition. func GetCustomResourceDefinitionDetail(client apiextensionsclientset.Interface, config *rest.Config, name string) (*CustomResourceDefinitionDetail, error) { - customResourceDefinition, err := client.ApiextensionsV1beta1(). + customResourceDefinition, err := client.ApiextensionsV1(). CustomResourceDefinitions(). Get(name, metav1.GetOptions{}) nonCriticalErrors, criticalError := errors.HandleError(err) @@ -63,11 +63,12 @@ func GetCustomResourceDefinitionDetail(client apiextensionsclientset.Interface, func toCustomResourceDefinitionDetail(crd *apiextensions.CustomResourceDefinition, objects CustomResourceObjectList, nonCriticalErrors []error) *CustomResourceDefinitionDetail { subresources := []string{} - if crd.Spec.Subresources != nil { - if crd.Spec.Subresources.Scale != nil { + crdSubresources := crd.Spec.Versions[0].Subresources + if crdSubresources != nil { + if crdSubresources.Scale != nil { subresources = append(subresources, "Scale") } - if crd.Spec.Subresources.Status != nil { + if crdSubresources.Status != nil { subresources = append(subresources, "Status") } } diff --git a/src/app/backend/resource/customresourcedefinition/list.go b/src/app/backend/resource/customresourcedefinition/list.go index c16e72df4026..da42f5ff5d6b 100644 --- a/src/app/backend/resource/customresourcedefinition/list.go +++ b/src/app/backend/resource/customresourcedefinition/list.go @@ -19,7 +19,7 @@ import ( "github.com/kubernetes/dashboard/src/app/backend/errors" "github.com/kubernetes/dashboard/src/app/backend/resource/common" "github.com/kubernetes/dashboard/src/app/backend/resource/dataselect" - apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" ) @@ -81,7 +81,7 @@ func toCustomResourceDefinition(crd *apiextensions.CustomResourceDefinition) Cus return CustomResourceDefinition{ ObjectMeta: api.NewObjectMeta(crd.ObjectMeta), TypeMeta: api.NewTypeMeta(api.ResourceKindCustomResourceDefinition), - Version: crd.Spec.Version, + Version: crd.Spec.Versions[0].Name, Group: crd.Spec.Group, Scope: crd.Spec.Scope, Names: crd.Status.AcceptedNames, diff --git a/src/app/backend/resource/customresourcedefinition/list_test.go b/src/app/backend/resource/customresourcedefinition/list_test.go index ecdfeea5b43e..0f80f38e524d 100644 --- a/src/app/backend/resource/customresourcedefinition/list_test.go +++ b/src/app/backend/resource/customresourcedefinition/list_test.go @@ -20,7 +20,7 @@ import ( "github.com/kubernetes/dashboard/src/app/backend/api" "github.com/kubernetes/dashboard/src/app/backend/resource/dataselect" - apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/src/app/backend/resource/customresourcedefinition/objects.go b/src/app/backend/resource/customresourcedefinition/objects.go index 5f4e460b6b3d..dfa56b0218ad 100644 --- a/src/app/backend/resource/customresourcedefinition/objects.go +++ b/src/app/backend/resource/customresourcedefinition/objects.go @@ -21,7 +21,7 @@ import ( "github.com/kubernetes/dashboard/src/app/backend/errors" "github.com/kubernetes/dashboard/src/app/backend/resource/common" "github.com/kubernetes/dashboard/src/app/backend/resource/dataselect" - apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" @@ -89,7 +89,7 @@ func GetCustomResourceObjectList(client apiextensionsclientset.Interface, config dsQuery *dataselect.DataSelectQuery, crdName string) (*CustomResourceObjectList, error) { var list *CustomResourceObjectList - customResourceDefinition, err := client.ApiextensionsV1beta1(). + customResourceDefinition, err := client.ApiextensionsV1(). CustomResourceDefinitions(). Get(crdName, metav1.GetOptions{}) nonCriticalErrors, criticalError := errors.HandleError(err) @@ -135,7 +135,7 @@ func GetCustomResourceObjectList(client apiextensionsclientset.Interface, config func GetCustomResourceObjectDetail(client apiextensionsclientset.Interface, namespace *common.NamespaceQuery, config *rest.Config, crdName string, name string) (*CustomResourceObjectDetail, error) { var detail *CustomResourceObjectDetail - customResourceDefinition, err := client.ApiextensionsV1beta1(). + customResourceDefinition, err := client.ApiextensionsV1(). CustomResourceDefinitions(). Get(crdName, metav1.GetOptions{}) nonCriticalErrors, criticalError := errors.HandleError(err) @@ -173,5 +173,6 @@ func GetCustomResourceObjectDetail(client apiextensionsclientset.Interface, name // E.g. changes "Foo" to "foos.samplecontroller.k8s.io" func toCRDObject(object *CustomResourceObject, crd *apiextensions.CustomResourceDefinition) { object.TypeMeta.Kind = api.ResourceKind(crd.Name) - object.TypeMeta.Scalable = crd.Spec.Subresources != nil && crd.Spec.Subresources.Scale != nil + crdSubresources := crd.Spec.Versions[0].Subresources + object.TypeMeta.Scalable = crdSubresources != nil && crdSubresources.Scale != nil } From 67d29368214a77a5739bbfc24a2ec1919d81902f Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Wed, 16 Oct 2019 21:09:30 +0100 Subject: [PATCH 03/12] update crd object delete test --- cypress/integration/crd.spec.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cypress/integration/crd.spec.js b/cypress/integration/crd.spec.js index 93ff5d3894b5..97bae9d496eb 100644 --- a/cypress/integration/crd.spec.js +++ b/cypress/integration/crd.spec.js @@ -142,8 +142,13 @@ describe('Custom Resource Definitions', () => { cy.wait('@deleteObject'); - // browser goes to the crd list page on deletion - cy.url().should('include', '/#/customresourcedefinition?namespace=default'); + cy.go('back'); // to crd detail + + cy.get('kd-crd-object-list').within(() => { + cy.get('#zero-state').should('be.visible'); + }); + + cy.go('back'); // to crd list }); it('delete crd', () => { From caa7c0a790332cee71d8d1df7a8e598b649c372e Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Wed, 16 Oct 2019 21:19:06 +0100 Subject: [PATCH 04/12] add ids to resource information template --- cypress/integration/crd.spec.js | 9 +++------ src/app/frontend/crd/detail/template.html | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cypress/integration/crd.spec.js b/cypress/integration/crd.spec.js index 97bae9d496eb..5e4a79b1a46e 100644 --- a/cypress/integration/crd.spec.js +++ b/cypress/integration/crd.spec.js @@ -46,14 +46,11 @@ describe('Custom Resource Definitions', () => { cy.get('#resource-information').within(() => { cy.get('kd-property').should('have.length', 3); - cy.get('kd-property') - .eq(0) + cy.get('#resource-version') .contains('v1alpha1'); - cy.get('kd-property') - .eq(1) + cy.get('#resource-scope') .contains('Namespaced'); - cy.get('kd-property') - .eq(2) + cy.get('#resource-group') .contains('samplecontroller.k8s.io'); }); diff --git a/src/app/frontend/crd/detail/template.html b/src/app/frontend/crd/detail/template.html index d5b93215fc44..2227b57f8c2d 100644 --- a/src/app/frontend/crd/detail/template.html +++ b/src/app/frontend/crd/detail/template.html @@ -27,17 +27,17 @@
Version
-
{{crd?.version}}
+
{{crd?.version}}
Scope
-
{{crd?.scope}}
+
{{crd?.scope}}
Group
-
{{crd?.group}}
+
{{crd?.group}}
Date: Wed, 16 Oct 2019 21:29:08 +0100 Subject: [PATCH 05/12] fix crd version in test --- .../backend/resource/customresourcedefinition/list_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/backend/resource/customresourcedefinition/list_test.go b/src/app/backend/resource/customresourcedefinition/list_test.go index 0f80f38e524d..89e3719904cf 100644 --- a/src/app/backend/resource/customresourcedefinition/list_test.go +++ b/src/app/backend/resource/customresourcedefinition/list_test.go @@ -42,7 +42,11 @@ func TestGetCustomResourceDefinition(t *testing.T) { Kind: "Foo", Plural: "foos", }, - Version: "v1alpha1", + Versions: []apiextensions.CustomResourceDefinitionVersion{ + { + Name: "v1alpha1", + }, + }, }, }, }, From 690e20ef249871fe6beb5935ed4906935bdf96bb Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Wed, 16 Oct 2019 21:30:55 +0100 Subject: [PATCH 06/12] fix frontend --- i18n/fr/messages.fr.xlf | 20 ++++++++++---------- i18n/ja/messages.ja.xlf | 20 ++++++++++---------- i18n/ko/messages.ko.xlf | 21 +++++++++++---------- i18n/messages.xlf | 20 ++++++++++---------- i18n/zh/messages.zh.xlf | 20 ++++++++++---------- src/app/frontend/crd/detail/template.html | 9 ++++++--- 6 files changed, 57 insertions(+), 53 deletions(-) diff --git a/i18n/fr/messages.fr.xlf b/i18n/fr/messages.fr.xlf index 6c6a2d8f9f79..48b40f661b2e 100644 --- a/i18n/fr/messages.fr.xlf +++ b/i18n/fr/messages.fr.xlf @@ -1919,7 +1919,7 @@ ../src/app/frontend/crd/detail/template.html - 69 + 72 @@ -2027,7 +2027,7 @@ ../src/app/frontend/crd/detail/template.html - 39 + 41 @@ -2507,7 +2507,7 @@ Portée ../src/app/frontend/crd/detail/template.html - 34 + 35 @@ -2515,7 +2515,7 @@ Sous-ressources ../src/app/frontend/crd/detail/template.html - 44 + 47 @@ -2523,7 +2523,7 @@ Noms acceptés ../src/app/frontend/crd/detail/template.html - 52 + 55 @@ -2531,7 +2531,7 @@ Pluriel ../src/app/frontend/crd/detail/template.html - 59 + 62 @@ -2539,7 +2539,7 @@ Singulier ../src/app/frontend/crd/detail/template.html - 64 + 67 @@ -2547,7 +2547,7 @@ Type de liste ../src/app/frontend/crd/detail/template.html - 74 + 77 @@ -2555,7 +2555,7 @@ Noms abrégés ../src/app/frontend/crd/detail/template.html - 79 + 82 @@ -2563,7 +2563,7 @@ Catégories ../src/app/frontend/crd/detail/template.html - 84 + 87 diff --git a/i18n/ja/messages.ja.xlf b/i18n/ja/messages.ja.xlf index 1450332a45f9..9078bb06010b 100644 --- a/i18n/ja/messages.ja.xlf +++ b/i18n/ja/messages.ja.xlf @@ -1331,7 +1331,7 @@ ../src/app/frontend/crd/detail/template.html - 69 + 72 @@ -1464,7 +1464,7 @@ ../src/app/frontend/crd/detail/template.html - 39 + 41 @@ -2915,7 +2915,7 @@ スコープ ../src/app/frontend/crd/detail/template.html - 34 + 35 @@ -2923,7 +2923,7 @@ サブリソース ../src/app/frontend/crd/detail/template.html - 44 + 47 @@ -2931,7 +2931,7 @@ 容認された名前 ../src/app/frontend/crd/detail/template.html - 52 + 55 @@ -2939,7 +2939,7 @@ 複数 ../src/app/frontend/crd/detail/template.html - 59 + 62 @@ -2947,7 +2947,7 @@ 単数 ../src/app/frontend/crd/detail/template.html - 64 + 67 @@ -2955,7 +2955,7 @@ 種類一覧 ../src/app/frontend/crd/detail/template.html - 74 + 77 @@ -2963,7 +2963,7 @@ 省略名 ../src/app/frontend/crd/detail/template.html - 79 + 82 @@ -2971,7 +2971,7 @@ カテゴリー ../src/app/frontend/crd/detail/template.html - 84 + 87 diff --git a/i18n/ko/messages.ko.xlf b/i18n/ko/messages.ko.xlf index 566fc97550ac..71929bc6530c 100644 --- a/i18n/ko/messages.ko.xlf +++ b/i18n/ko/messages.ko.xlf @@ -1523,7 +1523,7 @@ ../src/app/frontend/crd/detail/template.html - 69 + 72 @@ -1613,7 +1613,7 @@ ../src/app/frontend/crd/detail/template.html - 39 + 41 @@ -2977,7 +2977,7 @@ 범위 ../src/app/frontend/crd/detail/template.html - 34 + 35 @@ -2985,7 +2985,7 @@ Subresources ../src/app/frontend/crd/detail/template.html - 44 + 47 @@ -2993,7 +2993,7 @@ Accepted Names ../src/app/frontend/crd/detail/template.html - 52 + 55 @@ -3001,7 +3001,7 @@ 복수 ../src/app/frontend/crd/detail/template.html - 59 + 62 @@ -3009,7 +3009,7 @@ 단수 ../src/app/frontend/crd/detail/template.html - 64 + 67 @@ -3017,7 +3017,7 @@ 종류 리스트 ../src/app/frontend/crd/detail/template.html - 74 + 77 @@ -3025,7 +3025,7 @@ 단축 이름 ../src/app/frontend/crd/detail/template.html - 79 + 82 @@ -3033,7 +3033,7 @@ 카테고리 ../src/app/frontend/crd/detail/template.html - 84 + 87 @@ -3340,6 +3340,7 @@ + ../src/app/frontend/create/from/form/template.html 54 diff --git a/i18n/messages.xlf b/i18n/messages.xlf index 63d849ee40a5..ec48a03dbb77 100644 --- a/i18n/messages.xlf +++ b/i18n/messages.xlf @@ -1411,7 +1411,7 @@ ../src/app/frontend/crd/detail/template.html - 69 + 72 @@ -1496,7 +1496,7 @@ ../src/app/frontend/crd/detail/template.html - 39 + 41 @@ -2661,56 +2661,56 @@ Scope ../src/app/frontend/crd/detail/template.html - 34 + 35 Subresources ../src/app/frontend/crd/detail/template.html - 44 + 47 Accepted Names ../src/app/frontend/crd/detail/template.html - 52 + 55 Plural ../src/app/frontend/crd/detail/template.html - 59 + 62 Singular ../src/app/frontend/crd/detail/template.html - 64 + 67 List Kind ../src/app/frontend/crd/detail/template.html - 74 + 77 Short Names ../src/app/frontend/crd/detail/template.html - 79 + 82 Categories ../src/app/frontend/crd/detail/template.html - 84 + 87 diff --git a/i18n/zh/messages.zh.xlf b/i18n/zh/messages.zh.xlf index 5356321dc28d..6e544fdf99d8 100644 --- a/i18n/zh/messages.zh.xlf +++ b/i18n/zh/messages.zh.xlf @@ -1523,7 +1523,7 @@ ../src/app/frontend/crd/detail/template.html - 69 + 72 @@ -1613,7 +1613,7 @@ ../src/app/frontend/crd/detail/template.html - 39 + 41 @@ -2977,7 +2977,7 @@ Scope ../src/app/frontend/crd/detail/template.html - 34 + 35 @@ -2985,7 +2985,7 @@ Subresources ../src/app/frontend/crd/detail/template.html - 44 + 47 @@ -2993,7 +2993,7 @@ Accepted Names ../src/app/frontend/crd/detail/template.html - 52 + 55 @@ -3001,7 +3001,7 @@ Plural ../src/app/frontend/crd/detail/template.html - 59 + 62 @@ -3009,7 +3009,7 @@ Singular ../src/app/frontend/crd/detail/template.html - 64 + 67 @@ -3017,7 +3017,7 @@ List Kind ../src/app/frontend/crd/detail/template.html - 74 + 77 @@ -3025,7 +3025,7 @@ Short Names ../src/app/frontend/crd/detail/template.html - 79 + 82 @@ -3033,7 +3033,7 @@ Categories ../src/app/frontend/crd/detail/template.html - 84 + 87 diff --git a/src/app/frontend/crd/detail/template.html b/src/app/frontend/crd/detail/template.html index 2227b57f8c2d..08d945f0cf59 100644 --- a/src/app/frontend/crd/detail/template.html +++ b/src/app/frontend/crd/detail/template.html @@ -27,17 +27,20 @@
Version
-
{{crd?.version}}
+
{{crd?.version}}
Scope
-
{{crd?.scope}}
+
{{crd?.scope}}
Group
-
{{crd?.group}}
+
{{crd?.group}}
Date: Wed, 16 Oct 2019 21:56:50 +0100 Subject: [PATCH 07/12] remove 'before' --- cypress/integration/crd.spec.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cypress/integration/crd.spec.js b/cypress/integration/crd.spec.js index 5e4a79b1a46e..a7906bcda3ea 100644 --- a/cypress/integration/crd.spec.js +++ b/cypress/integration/crd.spec.js @@ -1,9 +1,7 @@ describe('Custom Resource Definitions', () => { - before(() => { + it('crd list is initially empty', () => { cy.visit('/'); - }); - it('crd list is initially empty', () => { cy.get('#sidebar-crd').click(); cy.url().should('include', '/#/customresourcedefinition'); From 7a08d288a33ef4e853dde13d159518294a7b1b05 Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Wed, 16 Oct 2019 22:17:34 +0100 Subject: [PATCH 08/12] update kind to 1.16.1 --- aio/scripts/start-cluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aio/scripts/start-cluster.sh b/aio/scripts/start-cluster.sh index f00ffc167e34..4d3a19ba4456 100755 --- a/aio/scripts/start-cluster.sh +++ b/aio/scripts/start-cluster.sh @@ -36,7 +36,7 @@ function start-ci-heapster { } function start-kind { - ${KIND_BIN} create cluster --name="k8s-cluster-ci" + ${KIND_BIN} create cluster --name="k8s-cluster-ci" --image=kindest/node:v1.16.2 ensure-kubeconfig if [ "${CI}" = true ] ; then start-ci-heapster From 0f14fcda7b647c1290638a9c99ee0fb6c279b5d9 Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Wed, 16 Oct 2019 22:40:38 +0100 Subject: [PATCH 09/12] update kind version --- aio/scripts/conf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aio/scripts/conf.sh b/aio/scripts/conf.sh index f3bff7d43600..348681a25b53 100644 --- a/aio/scripts/conf.sh +++ b/aio/scripts/conf.sh @@ -41,7 +41,7 @@ ARCH=$(uname | awk '{print tolower($0)}') # Local cluster configuration (check start-cluster.sh script for more details). HEAPSTER_VERSION="v1.5.4" HEAPSTER_PORT=8082 -KIND_VERSION="0.2.1" +KIND_VERSION="0.5.1" KIND_BIN=${CACHE_DIR}/kind-${KIND_VERSION} # Setup logger. From e05d12a57406f7c3d8b025ec7c91c17e0917b5cc Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Wed, 16 Oct 2019 22:49:49 +0100 Subject: [PATCH 10/12] update kind version --- aio/scripts/conf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aio/scripts/conf.sh b/aio/scripts/conf.sh index 348681a25b53..70ec88c27f4f 100644 --- a/aio/scripts/conf.sh +++ b/aio/scripts/conf.sh @@ -41,7 +41,7 @@ ARCH=$(uname | awk '{print tolower($0)}') # Local cluster configuration (check start-cluster.sh script for more details). HEAPSTER_VERSION="v1.5.4" HEAPSTER_PORT=8082 -KIND_VERSION="0.5.1" +KIND_VERSION="v0.5.1" KIND_BIN=${CACHE_DIR}/kind-${KIND_VERSION} # Setup logger. From 4aca96067388bcc0bb96d5afd44423333ace261c Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Wed, 16 Oct 2019 23:17:37 +0100 Subject: [PATCH 11/12] add reloads --- cypress/integration/crd.spec.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cypress/integration/crd.spec.js b/cypress/integration/crd.spec.js index a7906bcda3ea..4142067b31f3 100644 --- a/cypress/integration/crd.spec.js +++ b/cypress/integration/crd.spec.js @@ -139,10 +139,12 @@ describe('Custom Resource Definitions', () => { cy.go('back'); // to crd detail + cy.reload(); cy.get('kd-crd-object-list').within(() => { cy.get('#zero-state').should('be.visible'); }); + cy.reload(); cy.go('back'); // to crd list }); @@ -150,10 +152,7 @@ describe('Custom Resource Definitions', () => { cy.server(); cy.route('DELETE', '/api/v1/_raw/customresourcedefinition/**').as('deleteCRD'); - cy.get('#delete').should('not.be.visible'); cy.get('#more-menu').click(); - cy.get('#delete').should('be.visible'); - cy.get('#delete').click(); cy.get('#confirm-delete').click(); From 0dca0e2f82a8052519340478d99da4c400fadad9 Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Wed, 16 Oct 2019 23:32:46 +0100 Subject: [PATCH 12/12] remove crd delete tests --- cypress/integration/crd.spec.js | 36 --------------------------------- 1 file changed, 36 deletions(-) diff --git a/cypress/integration/crd.spec.js b/cypress/integration/crd.spec.js index 4142067b31f3..961710b50f0f 100644 --- a/cypress/integration/crd.spec.js +++ b/cypress/integration/crd.spec.js @@ -127,40 +127,4 @@ describe('Custom Resource Definitions', () => { .contains('default'); }); }); - - it('delete crd object', () => { - cy.server(); - cy.route('DELETE', '/api/v1/_raw/foos.samplecontroller.k8s.io/**').as('deleteObject'); - - cy.get('kd-actionbar-detail-delete').click(); - cy.get('#confirm-delete').click(); - - cy.wait('@deleteObject'); - - cy.go('back'); // to crd detail - - cy.reload(); - cy.get('kd-crd-object-list').within(() => { - cy.get('#zero-state').should('be.visible'); - }); - - cy.reload(); - cy.go('back'); // to crd list - }); - - it('delete crd', () => { - cy.server(); - cy.route('DELETE', '/api/v1/_raw/customresourcedefinition/**').as('deleteCRD'); - - cy.get('#more-menu').click(); - cy.get('#delete').click(); - cy.get('#confirm-delete').click(); - - cy.wait('@deleteCRD'); - - cy.reload(); - cy.get('kd-crd-list').within(() => { - cy.get('#zero-state').should('be.visible'); - }); - }); });