From 8acff53c65d3e37112a6174cc9d1cc0c0faaa47c Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Fri, 25 Nov 2022 16:26:37 +0200 Subject: [PATCH] update docCount on tests, now we render service --- .../command-arg_test.yaml | 2 + .../container_in_deployment/env_from.yaml | 2 + .../container_in_deployment/env_list.yaml | 2 + .../container_in_deployment/env_test.yaml | 2 + .../fixedEnv_test.yaml | 2 + .../container_in_deployment/image_test.yaml | 2 + .../lifecycle_test.yaml | 2 + .../container_in_deployment/port_test.yaml | 2 +- .../container_in_deployment/probe_test.yaml | 2 +- .../resources_test.yaml | 2 +- .../securityContext_test.yaml | 3 ++ .../various_options_test.yaml | 2 + .../volumeMounts_test.yaml | 2 + .../tests/deployment/annotation_test.yaml | 2 + .../tests/deployment/controller_test.yaml | 4 +- .../tests/deployment/default_test.yaml | 2 + .../tests/deployment/dns-network_test.yaml | 2 + .../tests/deployment/label_test.yaml | 2 + .../tests/deployment/names_test.yaml | 2 + .../deployment/podSecurityContext_test.yaml | 2 + .../deployment/serviceAccountName_test.yaml | 3 ++ .../deployment/various_options_test.yaml | 2 + .../tests/deployment/volume_test.yaml | 2 + library/common-test/tests/rbac/rbac_test.yaml | 3 +- .../serviceAccount/serviceAccount_test.yaml | 3 +- .../tests/utils/utils_primary_port_test.yaml | 2 +- .../tests/utils/utils_primary_rbac_test.yaml | 46 +++++++++---------- .../utils_primary_serviceAccount_test.yaml | 12 ++--- .../utils/utils_primary_service_test.yaml | 2 +- 29 files changed, 81 insertions(+), 37 deletions(-) diff --git a/library/common-test/tests/container_in_deployment/command-arg_test.yaml b/library/common-test/tests/container_in_deployment/command-arg_test.yaml index 249e0dce..7b75d0ab 100644 --- a/library/common-test/tests/container_in_deployment/command-arg_test.yaml +++ b/library/common-test/tests/container_in_deployment/command-arg_test.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/container_in_deployment/env_from.yaml b/library/common-test/tests/container_in_deployment/env_from.yaml index 0d52ca86..3ad11a67 100644 --- a/library/common-test/tests/container_in_deployment/env_from.yaml +++ b/library/common-test/tests/container_in_deployment/env_from.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/container_in_deployment/env_list.yaml b/library/common-test/tests/container_in_deployment/env_list.yaml index c292fda4..97aaad99 100644 --- a/library/common-test/tests/container_in_deployment/env_list.yaml +++ b/library/common-test/tests/container_in_deployment/env_list.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/container_in_deployment/env_test.yaml b/library/common-test/tests/container_in_deployment/env_test.yaml index 64f10e1d..39e93350 100644 --- a/library/common-test/tests/container_in_deployment/env_test.yaml +++ b/library/common-test/tests/container_in_deployment/env_test.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/container_in_deployment/fixedEnv_test.yaml b/library/common-test/tests/container_in_deployment/fixedEnv_test.yaml index 4a49c9e8..73ea4d9b 100644 --- a/library/common-test/tests/container_in_deployment/fixedEnv_test.yaml +++ b/library/common-test/tests/container_in_deployment/fixedEnv_test.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/container_in_deployment/image_test.yaml b/library/common-test/tests/container_in_deployment/image_test.yaml index e8ab0e40..a5086360 100644 --- a/library/common-test/tests/container_in_deployment/image_test.yaml +++ b/library/common-test/tests/container_in_deployment/image_test.yaml @@ -6,6 +6,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/container_in_deployment/lifecycle_test.yaml b/library/common-test/tests/container_in_deployment/lifecycle_test.yaml index 37998502..e8ff8bf8 100644 --- a/library/common-test/tests/container_in_deployment/lifecycle_test.yaml +++ b/library/common-test/tests/container_in_deployment/lifecycle_test.yaml @@ -6,6 +6,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/container_in_deployment/port_test.yaml b/library/common-test/tests/container_in_deployment/port_test.yaml index 03534306..d47a651b 100644 --- a/library/common-test/tests/container_in_deployment/port_test.yaml +++ b/library/common-test/tests/container_in_deployment/port_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 1 + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/container_in_deployment/probe_test.yaml b/library/common-test/tests/container_in_deployment/probe_test.yaml index a3cc82f0..5eeec11e 100644 --- a/library/common-test/tests/container_in_deployment/probe_test.yaml +++ b/library/common-test/tests/container_in_deployment/probe_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 1 + count: 2 - isKind: of: Deployment - isSubset: diff --git a/library/common-test/tests/container_in_deployment/resources_test.yaml b/library/common-test/tests/container_in_deployment/resources_test.yaml index b9da2b36..7d66084c 100644 --- a/library/common-test/tests/container_in_deployment/resources_test.yaml +++ b/library/common-test/tests/container_in_deployment/resources_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 1 + count: 2 - isKind: of: Deployment - equal: diff --git a/library/common-test/tests/container_in_deployment/securityContext_test.yaml b/library/common-test/tests/container_in_deployment/securityContext_test.yaml index 59a591cf..119ef93e 100644 --- a/library/common-test/tests/container_in_deployment/securityContext_test.yaml +++ b/library/common-test/tests/container_in_deployment/securityContext_test.yaml @@ -5,8 +5,11 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment + - it: should pass with securityContext changed documentIndex: *deploymentDoc set: diff --git a/library/common-test/tests/container_in_deployment/various_options_test.yaml b/library/common-test/tests/container_in_deployment/various_options_test.yaml index d4a1fa5b..0641e39c 100644 --- a/library/common-test/tests/container_in_deployment/various_options_test.yaml +++ b/library/common-test/tests/container_in_deployment/various_options_test.yaml @@ -6,6 +6,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/container_in_deployment/volumeMounts_test.yaml b/library/common-test/tests/container_in_deployment/volumeMounts_test.yaml index e26412f7..4f12aeef 100644 --- a/library/common-test/tests/container_in_deployment/volumeMounts_test.yaml +++ b/library/common-test/tests/container_in_deployment/volumeMounts_test.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment - isNull: diff --git a/library/common-test/tests/deployment/annotation_test.yaml b/library/common-test/tests/deployment/annotation_test.yaml index 98bc72bb..677a3cc4 100644 --- a/library/common-test/tests/deployment/annotation_test.yaml +++ b/library/common-test/tests/deployment/annotation_test.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment - isNotEmpty: diff --git a/library/common-test/tests/deployment/controller_test.yaml b/library/common-test/tests/deployment/controller_test.yaml index c388f0ca..37d0e90e 100644 --- a/library/common-test/tests/deployment/controller_test.yaml +++ b/library/common-test/tests/deployment/controller_test.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment - equal: @@ -29,7 +31,7 @@ tests: enabled: false asserts: - hasDocuments: - count: 0 + count: 1 - it: should pass with controller strategy changed and rollingUpdate strategies set documentIndex: *deploymentDoc diff --git a/library/common-test/tests/deployment/default_test.yaml b/library/common-test/tests/deployment/default_test.yaml index e2e4b4a1..7de57482 100644 --- a/library/common-test/tests/deployment/default_test.yaml +++ b/library/common-test/tests/deployment/default_test.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment - isAPIVersion: diff --git a/library/common-test/tests/deployment/dns-network_test.yaml b/library/common-test/tests/deployment/dns-network_test.yaml index f354daf2..518b578c 100644 --- a/library/common-test/tests/deployment/dns-network_test.yaml +++ b/library/common-test/tests/deployment/dns-network_test.yaml @@ -6,6 +6,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/deployment/label_test.yaml b/library/common-test/tests/deployment/label_test.yaml index 7a4e603b..cebe3ee0 100644 --- a/library/common-test/tests/deployment/label_test.yaml +++ b/library/common-test/tests/deployment/label_test.yaml @@ -7,6 +7,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment - equal: diff --git a/library/common-test/tests/deployment/names_test.yaml b/library/common-test/tests/deployment/names_test.yaml index a4dffb4c..6f86e700 100644 --- a/library/common-test/tests/deployment/names_test.yaml +++ b/library/common-test/tests/deployment/names_test.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment - equal: diff --git a/library/common-test/tests/deployment/podSecurityContext_test.yaml b/library/common-test/tests/deployment/podSecurityContext_test.yaml index f0a025ea..97723749 100644 --- a/library/common-test/tests/deployment/podSecurityContext_test.yaml +++ b/library/common-test/tests/deployment/podSecurityContext_test.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment - equal: diff --git a/library/common-test/tests/deployment/serviceAccountName_test.yaml b/library/common-test/tests/deployment/serviceAccountName_test.yaml index 7117bc96..8d57d3c8 100644 --- a/library/common-test/tests/deployment/serviceAccountName_test.yaml +++ b/library/common-test/tests/deployment/serviceAccountName_test.yaml @@ -4,7 +4,10 @@ templates: - common.yaml tests: - it: should pass with default values + documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/deployment/various_options_test.yaml b/library/common-test/tests/deployment/various_options_test.yaml index 3467fc33..d097d07f 100644 --- a/library/common-test/tests/deployment/various_options_test.yaml +++ b/library/common-test/tests/deployment/various_options_test.yaml @@ -6,6 +6,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/deployment/volume_test.yaml b/library/common-test/tests/deployment/volume_test.yaml index b0132071..eb94ff19 100644 --- a/library/common-test/tests/deployment/volume_test.yaml +++ b/library/common-test/tests/deployment/volume_test.yaml @@ -5,6 +5,8 @@ tests: - it: should pass with default values documentIndex: &deploymentDoc 0 asserts: + - hasDocuments: + count: 2 - isKind: of: Deployment - isNull: diff --git a/library/common-test/tests/rbac/rbac_test.yaml b/library/common-test/tests/rbac/rbac_test.yaml index 44536b9e..ddac929f 100644 --- a/library/common-test/tests/rbac/rbac_test.yaml +++ b/library/common-test/tests/rbac/rbac_test.yaml @@ -8,9 +8,10 @@ release: namespace: &ns some_name_space tests: - it: should pass with default values + documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 1 + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/serviceAccount/serviceAccount_test.yaml b/library/common-test/tests/serviceAccount/serviceAccount_test.yaml index 82479f93..07357e04 100644 --- a/library/common-test/tests/serviceAccount/serviceAccount_test.yaml +++ b/library/common-test/tests/serviceAccount/serviceAccount_test.yaml @@ -6,9 +6,10 @@ chart: appVersion: &appVer v1.2.3 tests: - it: should pass with default values + documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 1 + count: 2 - isKind: of: Deployment diff --git a/library/common-test/tests/utils/utils_primary_port_test.yaml b/library/common-test/tests/utils/utils_primary_port_test.yaml index def14607..6e5ea1e7 100644 --- a/library/common-test/tests/utils/utils_primary_port_test.yaml +++ b/library/common-test/tests/utils/utils_primary_port_test.yaml @@ -7,7 +7,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 1 + count: 2 - isKind: of: Deployment - equal: diff --git a/library/common-test/tests/utils/utils_primary_rbac_test.yaml b/library/common-test/tests/utils/utils_primary_rbac_test.yaml index 1baa9056..9a95e418 100644 --- a/library/common-test/tests/utils/utils_primary_rbac_test.yaml +++ b/library/common-test/tests/utils/utils_primary_rbac_test.yaml @@ -6,7 +6,7 @@ tests: - it: should pass with default values asserts: - hasDocuments: - count: 1 + count: 2 - it: should fail with more than 1 primary rbac set: @@ -45,7 +45,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: Role - equal: @@ -63,7 +63,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: RoleBinding - equal: @@ -82,7 +82,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: ClusterRole - equal: @@ -101,13 +101,13 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: ClusterRoleBinding - equal: path: metadata.name value: RELEASE-NAME-common-test -###asdsa + - it: should pass with main rbac set as primary and other not (Role - main) documentIndex: *roleDoc set: @@ -124,7 +124,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: Role - equal: @@ -147,7 +147,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: Role - equal: @@ -170,7 +170,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: RoleBinding - equal: @@ -193,7 +193,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: RoleBinding - equal: @@ -217,7 +217,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: ClusterRole - equal: @@ -241,7 +241,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: ClusterRole - equal: @@ -265,7 +265,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: ClusterRoleBinding - equal: @@ -289,13 +289,13 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: ClusterRoleBinding - equal: path: metadata.name value: RELEASE-NAME-common-test-other -###### + - it: should pass with other rbac set as primary and main not (Role - main) documentIndex: *roleDoc set: @@ -312,7 +312,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: Role - equal: @@ -335,7 +335,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: Role - equal: @@ -358,7 +358,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: RoleBinding - equal: @@ -381,7 +381,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: RoleBinding - equal: @@ -405,7 +405,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: ClusterRole - equal: @@ -429,7 +429,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: ClusterRole - equal: @@ -453,7 +453,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: ClusterRoleBinding - equal: @@ -477,7 +477,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 5 + count: 6 - isKind: of: ClusterRoleBinding - equal: diff --git a/library/common-test/tests/utils/utils_primary_serviceAccount_test.yaml b/library/common-test/tests/utils/utils_primary_serviceAccount_test.yaml index fe027b7e..f40b5e6f 100644 --- a/library/common-test/tests/utils/utils_primary_serviceAccount_test.yaml +++ b/library/common-test/tests/utils/utils_primary_serviceAccount_test.yaml @@ -6,7 +6,7 @@ tests: - it: should pass with default values asserts: - hasDocuments: - count: 1 + count: 2 - it: should fail with more than 1 primary serviceAccounts set: @@ -30,7 +30,7 @@ tests: primary: false asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: ServiceAccount - equal: @@ -49,7 +49,7 @@ tests: primary: false asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: ServiceAccount - equal: @@ -68,7 +68,7 @@ tests: primary: false asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: ServiceAccount - equal: @@ -87,7 +87,7 @@ tests: primary: true asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: ServiceAccount - equal: @@ -106,7 +106,7 @@ tests: primary: true asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: ServiceAccount - equal: diff --git a/library/common-test/tests/utils/utils_primary_service_test.yaml b/library/common-test/tests/utils/utils_primary_service_test.yaml index 65505306..7c74b574 100644 --- a/library/common-test/tests/utils/utils_primary_service_test.yaml +++ b/library/common-test/tests/utils/utils_primary_service_test.yaml @@ -7,7 +7,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 1 + count: 2 - isKind: of: Deployment - equal: