From dba21b6c7789412e8e05e80fa55e4f68eb100603 Mon Sep 17 00:00:00 2001 From: Stavros Foteinopoulos Date: Wed, 13 Dec 2023 18:35:27 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Marco Ebert --- .../tests/controller-daemonset_test.yaml | 3 +++ .../tests/controller-deployment_test.yaml | 7 +++++-- charts/ingress-nginx/tests/controller-hpa_test.yaml | 6 ++++-- charts/ingress-nginx/tests/controller-keda_test.yaml | 7 +++++-- .../tests/controller-networkpolicy_test.yaml | 9 ++++++--- .../tests/controller-service-internal_test.yaml | 11 ++++++----- .../tests/controller-service-metrics_test.yaml | 9 ++++++--- .../ingress-nginx/tests/controller-service_test.yaml | 12 ++++++------ .../tests/default-backend-service_test.yaml | 8 ++++---- 9 files changed, 45 insertions(+), 27 deletions(-) diff --git a/charts/ingress-nginx/tests/controller-daemonset_test.yaml b/charts/ingress-nginx/tests/controller-daemonset_test.yaml index 3089e7a1e..fcd5110b3 100644 --- a/charts/ingress-nginx/tests/controller-daemonset_test.yaml +++ b/charts/ingress-nginx/tests/controller-daemonset_test.yaml @@ -11,3 +11,6 @@ tests: count: 1 - isKind: of: DaemonSet + - equal: + path: metadata.name + value: RELEASE-NAME-ingress-nginx-controller diff --git a/charts/ingress-nginx/tests/controller-deployment_test.yaml b/charts/ingress-nginx/tests/controller-deployment_test.yaml index 37d1673bc..01844612e 100644 --- a/charts/ingress-nginx/tests/controller-deployment_test.yaml +++ b/charts/ingress-nginx/tests/controller-deployment_test.yaml @@ -9,8 +9,11 @@ tests: count: 1 - isKind: of: Deployment + - equal: + path: metadata.name + value: RELEASE-NAME-ingress-nginx-controller - - it: should create a Deployment with 3 replicas when `controller.replicaCount` is 3 + - it: should create a Deployment with 3 replicas if `controller.replicaCount` is 3 set: controller.replicaCount: 3 asserts: @@ -18,7 +21,7 @@ tests: path: spec.replicas value: 3 - - it: should create a Deployment with resource limits when `controller.resources.limits` is set + - it: should create a Deployment with resource limits if `controller.resources.limits` is set set: controller.resources.limits.cpu: 500m controller.resources.limits.memory: 512Mi diff --git a/charts/ingress-nginx/tests/controller-hpa_test.yaml b/charts/ingress-nginx/tests/controller-hpa_test.yaml index fed1f7027..7cd668509 100644 --- a/charts/ingress-nginx/tests/controller-hpa_test.yaml +++ b/charts/ingress-nginx/tests/controller-hpa_test.yaml @@ -3,13 +3,15 @@ templates: - controller-hpa.yaml tests: - - it: should create an hpa when controller kind is Deployment and autoscaling is enabled + - it: should create a HPA if `controller.kind` is "Deployment" and `controller.autoscaling.enabled` is true set: controller.kind: Deployment controller.autoscaling.enabled: true - controller.keda.enabled: false asserts: - hasDocuments: count: 1 - isKind: of: HorizontalPodAutoscaler + - equal: + path: metadata.name + value: RELEASE-NAME-ingress-nginx-controller diff --git a/charts/ingress-nginx/tests/controller-keda_test.yaml b/charts/ingress-nginx/tests/controller-keda_test.yaml index 1f874b1e4..e6ca8dbfe 100644 --- a/charts/ingress-nginx/tests/controller-keda_test.yaml +++ b/charts/ingress-nginx/tests/controller-keda_test.yaml @@ -1,9 +1,9 @@ -suite: test controller keda +suite: Controller > KEDA templates: - controller-keda.yaml tests: - - it: should create a keda scaled object when controller kind is Deployment and keda is enabled + - it: should create a ScaledObject if `controller.kind` is "Deployment" and `controller.keda.enabled` is true set: controller.kind: Deployment controller.keda.enabled: true @@ -12,3 +12,6 @@ tests: count: 1 - isKind: of: ScaledObject + - equal: + path: metadata.name + value: RELEASE-NAME-ingress-nginx-controller diff --git a/charts/ingress-nginx/tests/controller-networkpolicy_test.yaml b/charts/ingress-nginx/tests/controller-networkpolicy_test.yaml index 3741d95c4..5de12e9c4 100644 --- a/charts/ingress-nginx/tests/controller-networkpolicy_test.yaml +++ b/charts/ingress-nginx/tests/controller-networkpolicy_test.yaml @@ -1,16 +1,16 @@ -suite: test controller network policy +suite: Controller > NetworkPolicy templates: - controller-networkpolicy.yaml tests: - - it: should not create a network policy by default + - it: should not create a NetworkPolicy if `controller.networkPolicy.enabled` is false set: controller.networkPolicy.enabled: false asserts: - hasDocuments: count: 0 - - it: should create a network policy when enabled + - it: should create a NetworkPolicy if `controller.networkPolicy.enabled` is true set: controller.networkPolicy.enabled: true asserts: @@ -18,3 +18,6 @@ tests: count: 1 - isKind: of: NetworkPolicy + - equal: + path: metadata.name + value: RELEASE-NAME-ingress-nginx-controller diff --git a/charts/ingress-nginx/tests/controller-service-internal_test.yaml b/charts/ingress-nginx/tests/controller-service-internal_test.yaml index 07e63bcf0..5465e1a2b 100644 --- a/charts/ingress-nginx/tests/controller-service-internal_test.yaml +++ b/charts/ingress-nginx/tests/controller-service-internal_test.yaml @@ -1,19 +1,17 @@ -suite: test controller internal service +suite: Controller > Service > Internal templates: - controller-service-internal.yaml tests: - - it: should not create an internal service by default + - it: should not create an internal Service if `controller.service.internal.enabled` is false set: - controller.service.enabled: true controller.service.internal.enabled: false asserts: - hasDocuments: count: 0 - - it: should create an internal service when enabled + - it: should create an internal Service if `controller.service.internal.enabled` is true and `controller.service.internal.annotations` are set set: - controller.service.enabled: true controller.service.internal.enabled: true controller.service.internal.annotations: test.annotation: "true" @@ -22,3 +20,6 @@ tests: count: 1 - isKind: of: Service + - equal: + path: metadata.name + value: RELEASE-NAME-ingress-nginx-controller-internal diff --git a/charts/ingress-nginx/tests/controller-service-metrics_test.yaml b/charts/ingress-nginx/tests/controller-service-metrics_test.yaml index 08f073d6b..afdb94046 100644 --- a/charts/ingress-nginx/tests/controller-service-metrics_test.yaml +++ b/charts/ingress-nginx/tests/controller-service-metrics_test.yaml @@ -1,16 +1,16 @@ -suite: test controller metrics service +suite: Controller > Service > Metrics templates: - controller-service-metrics.yaml tests: - - it: should not create a metrics service by default + - it: should not create a metrics Service if `controller.metrics.enabled` is false set: controller.metrics.enabled: false asserts: - hasDocuments: count: 0 - - it: should create a metrics service when enabled + - it: should create a metrics Service if `controller.metrics.enabled` is true set: controller.metrics.enabled: true asserts: @@ -18,3 +18,6 @@ tests: count: 1 - isKind: of: Service + - equal: + path: metadata.name + value: RELEASE-NAME-ingress-nginx-controller-metrics diff --git a/charts/ingress-nginx/tests/controller-service_test.yaml b/charts/ingress-nginx/tests/controller-service_test.yaml index b19ba5db1..2810d4679 100644 --- a/charts/ingress-nginx/tests/controller-service_test.yaml +++ b/charts/ingress-nginx/tests/controller-service_test.yaml @@ -1,18 +1,18 @@ -suite: test controller service +suite: Controller > Service templates: - controller-service.yaml tests: - - it: should not create any service by default + - it: should not create a Service if `controller.service.external.enabled` is false set: - controller.service.enabled: false + controller.service.external.enabled: false asserts: - hasDocuments: count: 0 - - it: should create a service when enabled + - it: should create a Service if `controller.service.external.enabled` is true set: - controller.service.enabled: true + controller.service.external.enabled: true asserts: - hasDocuments: count: 1 @@ -22,7 +22,7 @@ tests: path: metadata.name value: RELEASE-NAME-ingress-nginx-controller - - it: custom service type + - it: should create a Service of type "NodePort" if `controller.service.external.enabled` is true and `controller.service.type` is "NodePort" set: controller.service.enabled: true controller.service.type: NodePort diff --git a/charts/ingress-nginx/tests/default-backend-service_test.yaml b/charts/ingress-nginx/tests/default-backend-service_test.yaml index b9cea2bfd..f16904f9f 100644 --- a/charts/ingress-nginx/tests/default-backend-service_test.yaml +++ b/charts/ingress-nginx/tests/default-backend-service_test.yaml @@ -1,16 +1,16 @@ -suite: test default backend service +suite: Default Backend > Service templates: - default-backend-service.yaml tests: - - it: should not create any default backend service by default + - it: should not create a Service if `defaultBackend.enabled` is false set: defaultBackend.enabled: false asserts: - hasDocuments: count: 0 - - it: should create a default backend service when enabled + - it: should create a Service if `defaultBackend.enabled` is true set: defaultBackend.enabled: true asserts: @@ -22,7 +22,7 @@ tests: path: metadata.name value: RELEASE-NAME-ingress-nginx-defaultbackend - - it: verify service port configuration + - it: should create a Service with port 80 if `defaultBackend.service.port` is 80 set: defaultBackend.enabled: true defaultBackend.service.port: 80