diff --git a/ci/rstudio-workbench/tests/ingress_test.yaml b/ci/rstudio-workbench/tests/ingress_test.yaml index ef79b777..ad7f878d 100644 --- a/ci/rstudio-workbench/tests/ingress_test.yaml +++ b/ci/rstudio-workbench/tests/ingress_test.yaml @@ -26,6 +26,18 @@ tests: asserts: - notExists: path: "spec.tls" + - it: should include the tls path if tls has values specified and ingress is enabled + template: ingress.yaml + set: + ingress: + enabled: true + tls: + - secretName: chart-example-tls + hosts: + - chart-example.local + asserts: + - exists: + path: "spec.tls" - it: should include the ingressClassName if defined and ingress is enabled template: ingress.yaml set: @@ -36,3 +48,11 @@ tests: - equal: path: "spec.ingressClassName" value: "alb" + - it: should not include the ingressClassName if it is not defined and ingress is enabled + template: ingress.yaml + set: + ingress: + enabled: true + asserts: + - notExists: + path: "spec.ingressClassName" diff --git a/ci/rstudio-workbench/tests/prometheus_test.yaml b/ci/rstudio-workbench/tests/prometheus_test.yaml index 74199d4e..4bae9f00 100644 --- a/ci/rstudio-workbench/tests/prometheus_test.yaml +++ b/ci/rstudio-workbench/tests/prometheus_test.yaml @@ -8,7 +8,7 @@ templates: - deployment.yaml - svc.yaml tests: - - it: should ensure the specified metrics port is used in the service + - it: should ensure the specified metrics port is used in the service if prometheus is enabled and legacy is not true template: svc.yaml set: prometheus: @@ -21,7 +21,7 @@ tests: - equal: path: "spec.ports[1].port" value: 8989 - - it: should ensure the legacy metrics port is used in the service + - it: should ensure the legacy metrics port is used in the service if prometheus is enabled and legacy is true template: svc.yaml set: prometheus: