From bbce72ca82d19195617f4fe5dab68adaa41c951d Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Wed, 7 Dec 2022 18:16:12 +0200 Subject: [PATCH] fix tests (hasDocuments.count) --- .../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 | 2 +- .../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 | 2 +- .../deployment/various_options_test.yaml | 2 +- .../deployment/volume_configMap_test.yaml | 2 +- .../tests/deployment/volume_custom_test.yaml | 2 +- .../deployment/volume_emptyDir_test.yaml | 2 +- .../deployment/volume_hostPath_test.yaml | 2 +- .../tests/deployment/volume_nfs_test.yaml | 2 +- .../tests/deployment/volume_pvc_test.yaml | 2 +- .../tests/deployment/volume_secret_test.yaml | 2 +- .../tests/deployment/volume_test.yaml | 2 +- .../externalInterfaces_test.yaml | 20 ++++----- library/common-test/tests/pvc/pvc_test.yaml | 2 +- library/common-test/tests/rbac/rbac_test.yaml | 2 +- .../tests/service/service_test.yaml | 2 +- .../tests/service/service_test_ClusterIP.yaml | 2 +- .../service/service_test_ExternalIP.yaml | 2 +- .../service/service_test_ExternalName.yaml | 2 +- .../service/service_test_LoadBalancer.yaml | 2 +- .../tests/service/service_test_NodePort.yaml | 2 +- .../tests/service/service_test_hostNet.yaml | 2 +- .../serviceAccount/serviceAccount_test.yaml | 2 +- .../tests/utils/utils_primary_port_test.yaml | 2 +- .../tests/utils/utils_primary_rbac_test.yaml | 42 +++++++++---------- .../utils_primary_serviceAccount_test.yaml | 12 +++--- .../utils/utils_primary_service_test.yaml | 2 +- .../1.0.0/templates/spawner/_portal.tpl | 1 + 46 files changed, 81 insertions(+), 80 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 7b75d0ab6e..1b20a3e529 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 @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 3ad11a67f6..0fcf9d0ee1 100644 --- a/library/common-test/tests/container_in_deployment/env_from.yaml +++ b/library/common-test/tests/container_in_deployment/env_from.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 97aaad996a..ed3db02d27 100644 --- a/library/common-test/tests/container_in_deployment/env_list.yaml +++ b/library/common-test/tests/container_in_deployment/env_list.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 39e9335008..587b88ef04 100644 --- a/library/common-test/tests/container_in_deployment/env_test.yaml +++ b/library/common-test/tests/container_in_deployment/env_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 73ea4d9b68..53752b3376 100644 --- a/library/common-test/tests/container_in_deployment/fixedEnv_test.yaml +++ b/library/common-test/tests/container_in_deployment/fixedEnv_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 b2421b9e96..1d6e691a9a 100644 --- a/library/common-test/tests/container_in_deployment/image_test.yaml +++ b/library/common-test/tests/container_in_deployment/image_test.yaml @@ -7,7 +7,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 34823bac7b..56aef6d4d3 100644 --- a/library/common-test/tests/container_in_deployment/lifecycle_test.yaml +++ b/library/common-test/tests/container_in_deployment/lifecycle_test.yaml @@ -7,7 +7,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 c63379864d..7deb73763e 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: 2 + count: 3 - 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 edcb2d4fb9..3e3653a923 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: 2 + count: 3 - 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 e20d970018..9c7dd6b285 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: 2 + count: 3 - 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 119ef93e6f..81bbfff97e 100644 --- a/library/common-test/tests/container_in_deployment/securityContext_test.yaml +++ b/library/common-test/tests/container_in_deployment/securityContext_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment 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 0641e39c6e..12c9d69872 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 @@ -7,7 +7,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 65a40cca8e..a8700be00a 100644 --- a/library/common-test/tests/container_in_deployment/volumeMounts_test.yaml +++ b/library/common-test/tests/container_in_deployment/volumeMounts_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 677a3cc4ec..48bb393c69 100644 --- a/library/common-test/tests/deployment/annotation_test.yaml +++ b/library/common-test/tests/deployment/annotation_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 37d0e90e9a..e3f0571451 100644 --- a/library/common-test/tests/deployment/controller_test.yaml +++ b/library/common-test/tests/deployment/controller_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment - equal: @@ -31,7 +31,7 @@ tests: enabled: false asserts: - hasDocuments: - count: 1 + count: 2 - 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 7de57482be..17cb627b38 100644 --- a/library/common-test/tests/deployment/default_test.yaml +++ b/library/common-test/tests/deployment/default_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 518b578c2f..bcb76335ab 100644 --- a/library/common-test/tests/deployment/dns-network_test.yaml +++ b/library/common-test/tests/deployment/dns-network_test.yaml @@ -7,7 +7,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/deployment/label_test.yaml b/library/common-test/tests/deployment/label_test.yaml index cebe3ee090..979eac28de 100644 --- a/library/common-test/tests/deployment/label_test.yaml +++ b/library/common-test/tests/deployment/label_test.yaml @@ -8,7 +8,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 6f86e70010..8c220ae69b 100644 --- a/library/common-test/tests/deployment/names_test.yaml +++ b/library/common-test/tests/deployment/names_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 977237499c..597a9dd821 100644 --- a/library/common-test/tests/deployment/podSecurityContext_test.yaml +++ b/library/common-test/tests/deployment/podSecurityContext_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 8d57d3c813..e201e4878a 100644 --- a/library/common-test/tests/deployment/serviceAccountName_test.yaml +++ b/library/common-test/tests/deployment/serviceAccountName_test.yaml @@ -7,7 +7,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 d097d07f92..3562594888 100644 --- a/library/common-test/tests/deployment/various_options_test.yaml +++ b/library/common-test/tests/deployment/various_options_test.yaml @@ -7,7 +7,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/deployment/volume_configMap_test.yaml b/library/common-test/tests/deployment/volume_configMap_test.yaml index 7d3422449a..fa52d42acf 100644 --- a/library/common-test/tests/deployment/volume_configMap_test.yaml +++ b/library/common-test/tests/deployment/volume_configMap_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment - isNull: diff --git a/library/common-test/tests/deployment/volume_custom_test.yaml b/library/common-test/tests/deployment/volume_custom_test.yaml index 510ef6047b..70c7ad86e6 100644 --- a/library/common-test/tests/deployment/volume_custom_test.yaml +++ b/library/common-test/tests/deployment/volume_custom_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment - isNull: diff --git a/library/common-test/tests/deployment/volume_emptyDir_test.yaml b/library/common-test/tests/deployment/volume_emptyDir_test.yaml index d6121c5eef..1ac34b86fe 100644 --- a/library/common-test/tests/deployment/volume_emptyDir_test.yaml +++ b/library/common-test/tests/deployment/volume_emptyDir_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment - isNull: diff --git a/library/common-test/tests/deployment/volume_hostPath_test.yaml b/library/common-test/tests/deployment/volume_hostPath_test.yaml index 47a36ac13b..ca2ae9acb6 100644 --- a/library/common-test/tests/deployment/volume_hostPath_test.yaml +++ b/library/common-test/tests/deployment/volume_hostPath_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment - isNull: diff --git a/library/common-test/tests/deployment/volume_nfs_test.yaml b/library/common-test/tests/deployment/volume_nfs_test.yaml index 5e27b898e2..edb2abd912 100644 --- a/library/common-test/tests/deployment/volume_nfs_test.yaml +++ b/library/common-test/tests/deployment/volume_nfs_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment - isNull: diff --git a/library/common-test/tests/deployment/volume_pvc_test.yaml b/library/common-test/tests/deployment/volume_pvc_test.yaml index 372d818fa7..f2d6f6a4f8 100644 --- a/library/common-test/tests/deployment/volume_pvc_test.yaml +++ b/library/common-test/tests/deployment/volume_pvc_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment - isNull: diff --git a/library/common-test/tests/deployment/volume_secret_test.yaml b/library/common-test/tests/deployment/volume_secret_test.yaml index bef62f362d..f4d96ec4e6 100644 --- a/library/common-test/tests/deployment/volume_secret_test.yaml +++ b/library/common-test/tests/deployment/volume_secret_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment - isNull: diff --git a/library/common-test/tests/deployment/volume_test.yaml b/library/common-test/tests/deployment/volume_test.yaml index 0d47fb3a07..34c3316bb6 100644 --- a/library/common-test/tests/deployment/volume_test.yaml +++ b/library/common-test/tests/deployment/volume_test.yaml @@ -6,7 +6,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment - isNull: diff --git a/library/common-test/tests/externalInterfaces/externalInterfaces_test.yaml b/library/common-test/tests/externalInterfaces/externalInterfaces_test.yaml index 7715d021c6..f08694a450 100644 --- a/library/common-test/tests/externalInterfaces/externalInterfaces_test.yaml +++ b/library/common-test/tests/externalInterfaces/externalInterfaces_test.yaml @@ -8,7 +8,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment @@ -117,7 +117,7 @@ tests: - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-0", "type": "macvlan", "master": "ens3s0", "ipam": {"type": "dhcp"}}' asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: NetworkAttachmentDefinition - isAPIVersion: @@ -145,7 +145,7 @@ tests: - ix-RELEASE-NAME-0 asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: Deployment - isSubset: @@ -171,7 +171,7 @@ tests: - ix-RELEASE-NAME-0 asserts: - hasDocuments: - count: 4 + count: 5 - isKind: of: NetworkAttachmentDefinition - isAPIVersion: @@ -198,7 +198,7 @@ tests: - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-1", "type": "macvlan", "master": "ens5s0", "ipam": {"type": "dhcp"}}' asserts: - hasDocuments: - count: 4 + count: 5 - isKind: of: NetworkAttachmentDefinition - isAPIVersion: @@ -228,7 +228,7 @@ tests: - ix-RELEASE-NAME-1 asserts: - hasDocuments: - count: 4 + count: 5 - isKind: of: Deployment - isSubset: @@ -255,7 +255,7 @@ tests: - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-0", "type": "macvlan", "master": "ens3s0", "ipam": {"type": "dhcp"}}' asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: NetworkAttachmentDefinition - isAPIVersion: @@ -285,7 +285,7 @@ tests: - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-0", "type": "macvlan", "master": "ens3s0", "ipam": {"type": "dhcp"}}' asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: NetworkAttachmentDefinition - isAPIVersion: @@ -313,7 +313,7 @@ tests: - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-0", "type": "macvlan", "master": "ens3s0", "ipam": {"type": "dhcp"}}' asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: NetworkAttachmentDefinition - isAPIVersion: @@ -351,7 +351,7 @@ tests: - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-0", "type": "macvlan", "master": "ens3s0", "ipam": {"type": "dhcp"}}' asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: NetworkAttachmentDefinition - isAPIVersion: diff --git a/library/common-test/tests/pvc/pvc_test.yaml b/library/common-test/tests/pvc/pvc_test.yaml index 5407a4fbb5..d068f7ecea 100644 --- a/library/common-test/tests/pvc/pvc_test.yaml +++ b/library/common-test/tests/pvc/pvc_test.yaml @@ -8,7 +8,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/rbac/rbac_test.yaml b/library/common-test/tests/rbac/rbac_test.yaml index e460c4b216..a20210e228 100644 --- a/library/common-test/tests/rbac/rbac_test.yaml +++ b/library/common-test/tests/rbac/rbac_test.yaml @@ -11,7 +11,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/service/service_test.yaml b/library/common-test/tests/service/service_test.yaml index ef8ad887a0..19df89493c 100644 --- a/library/common-test/tests/service/service_test.yaml +++ b/library/common-test/tests/service/service_test.yaml @@ -8,7 +8,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/service/service_test_ClusterIP.yaml b/library/common-test/tests/service/service_test_ClusterIP.yaml index e0bb94422c..1994f833b8 100644 --- a/library/common-test/tests/service/service_test_ClusterIP.yaml +++ b/library/common-test/tests/service/service_test_ClusterIP.yaml @@ -9,7 +9,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/service/service_test_ExternalIP.yaml b/library/common-test/tests/service/service_test_ExternalIP.yaml index 11f3740e86..27d71203e2 100644 --- a/library/common-test/tests/service/service_test_ExternalIP.yaml +++ b/library/common-test/tests/service/service_test_ExternalIP.yaml @@ -8,7 +8,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/service/service_test_ExternalName.yaml b/library/common-test/tests/service/service_test_ExternalName.yaml index abdf8b1587..245810151e 100644 --- a/library/common-test/tests/service/service_test_ExternalName.yaml +++ b/library/common-test/tests/service/service_test_ExternalName.yaml @@ -8,7 +8,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/service/service_test_LoadBalancer.yaml b/library/common-test/tests/service/service_test_LoadBalancer.yaml index 4d13e04197..326a6c1166 100644 --- a/library/common-test/tests/service/service_test_LoadBalancer.yaml +++ b/library/common-test/tests/service/service_test_LoadBalancer.yaml @@ -8,7 +8,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/service/service_test_NodePort.yaml b/library/common-test/tests/service/service_test_NodePort.yaml index de60f3ab85..1616ab0ef1 100644 --- a/library/common-test/tests/service/service_test_NodePort.yaml +++ b/library/common-test/tests/service/service_test_NodePort.yaml @@ -8,7 +8,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/service/service_test_hostNet.yaml b/library/common-test/tests/service/service_test_hostNet.yaml index 5b9f9f2416..489ff85740 100644 --- a/library/common-test/tests/service/service_test_hostNet.yaml +++ b/library/common-test/tests/service/service_test_hostNet.yaml @@ -9,7 +9,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - isKind: of: Deployment diff --git a/library/common-test/tests/serviceAccount/serviceAccount_test.yaml b/library/common-test/tests/serviceAccount/serviceAccount_test.yaml index bedcdc83df..7a363a538b 100644 --- a/library/common-test/tests/serviceAccount/serviceAccount_test.yaml +++ b/library/common-test/tests/serviceAccount/serviceAccount_test.yaml @@ -9,7 +9,7 @@ tests: documentIndex: &deploymentDoc 0 asserts: - hasDocuments: - count: 2 + count: 3 - 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 6e5ea1e7c9..11a6fb9ecb 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: 2 + count: 3 - 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 9a95e4180e..3ed0215e2a 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: 2 + count: 3 - it: should fail with more than 1 primary rbac set: @@ -45,7 +45,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 4 + count: 5 - isKind: of: Role - equal: @@ -63,7 +63,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 4 + count: 5 - isKind: of: RoleBinding - equal: @@ -82,7 +82,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 4 + count: 5 - isKind: of: ClusterRole - equal: @@ -101,7 +101,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 4 + count: 5 - isKind: of: ClusterRoleBinding - equal: @@ -124,7 +124,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: Role - equal: @@ -147,7 +147,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: Role - equal: @@ -170,7 +170,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: RoleBinding - equal: @@ -193,7 +193,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: RoleBinding - equal: @@ -217,7 +217,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: ClusterRole - equal: @@ -241,7 +241,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: ClusterRole - equal: @@ -265,7 +265,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: ClusterRoleBinding - equal: @@ -289,7 +289,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: ClusterRoleBinding - equal: @@ -312,7 +312,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: Role - equal: @@ -335,7 +335,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: Role - equal: @@ -358,7 +358,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: RoleBinding - equal: @@ -381,7 +381,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: RoleBinding - equal: @@ -405,7 +405,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: ClusterRole - equal: @@ -429,7 +429,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: ClusterRole - equal: @@ -453,7 +453,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - isKind: of: ClusterRoleBinding - equal: @@ -477,7 +477,7 @@ tests: subjects: *subjects asserts: - hasDocuments: - count: 6 + count: 7 - 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 f40b5e6f3b..0a653960fe 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: 2 + count: 3 - it: should fail with more than 1 primary serviceAccounts set: @@ -30,7 +30,7 @@ tests: primary: false asserts: - hasDocuments: - count: 3 + count: 4 - isKind: of: ServiceAccount - equal: @@ -49,7 +49,7 @@ tests: primary: false asserts: - hasDocuments: - count: 4 + count: 5 - isKind: of: ServiceAccount - equal: @@ -68,7 +68,7 @@ tests: primary: false asserts: - hasDocuments: - count: 4 + count: 5 - isKind: of: ServiceAccount - equal: @@ -87,7 +87,7 @@ tests: primary: true asserts: - hasDocuments: - count: 4 + count: 5 - isKind: of: ServiceAccount - equal: @@ -106,7 +106,7 @@ tests: primary: true asserts: - hasDocuments: - count: 4 + count: 5 - 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 c4d5cb2d9f..e126310e10 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: 2 + count: 3 - isKind: of: Deployment - equal: diff --git a/library/common/1.0.0/templates/spawner/_portal.tpl b/library/common/1.0.0/templates/spawner/_portal.tpl index 63f85d3669..ef396355a4 100644 --- a/library/common/1.0.0/templates/spawner/_portal.tpl +++ b/library/common/1.0.0/templates/spawner/_portal.tpl @@ -2,6 +2,7 @@ {{- if .Values.portal -}} {{- if .Values.portal.enabled -}} {{- include "ix.v1.common.class.portal" (dict "root" $) -}} + {{/* TODO: Unittests */}} {{- end -}} {{- end -}} {{- end -}}