From a1b34d3e46cbb7474907768471f1e687f64529d6 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 29 Jan 2024 14:27:05 +0100
Subject: [PATCH] OZG-3942 new helm unittest framework
---
Jenkinsfile | 2 +-
ozgcloud-elasticsearch-operator/run_helm_test.sh | 2 +-
.../ozgcloud_elasticsearch_operator_edit_role_test.yaml | 6 +++---
.../ozgcloud_elasticsearch_operator_view_role_test.yaml | 6 +++---
ozgcloud-keycloak-operator/run_helm_test.sh | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 00a8373..8020f96 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -206,7 +206,7 @@ Void testAndDeployElasticsearchHelmChart(String helmChartVersion){
Void runHelmTests(){
sh 'helm lint -f ../../test/helm/linter_values.yaml'
- sh "helm unittest --helm3 -f '../../test/helm/*.yaml' -f '../../test/helm/*/*.yaml' ."
+ sh "helm unittest -f '../../test/helm/*/*.yaml' ."
sh "helm package --version=${HELM_CHART_VERSION} ."
}
diff --git a/ozgcloud-elasticsearch-operator/run_helm_test.sh b/ozgcloud-elasticsearch-operator/run_helm_test.sh
index 8097a39..e02dfa8 100755
--- a/ozgcloud-elasticsearch-operator/run_helm_test.sh
+++ b/ozgcloud-elasticsearch-operator/run_helm_test.sh
@@ -4,4 +4,4 @@ set -e
helm template ./src/main/helm/ -f src/test/helm/linter_values.yaml
helm lint -f src/test/helm/linter_values.yaml ./src/main/helm/
-cd src/main/helm && helm unittest --helm3 -f '../../test/helm/*/*.yaml' -f '../../test/helm/*.yaml' .
+cd src/main/helm && helm unittest -f '../../test/helm/*/*.yaml' .
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_edit_role_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_edit_role_test.yaml
index 078cf0a..6bc7996 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_edit_role_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_edit_role_test.yaml
@@ -22,17 +22,17 @@ tests:
- it: should have metadata labels name
asserts:
- equal:
- path: metadata.labels.[app.kubernetes.io/name]
+ path: metadata.labels["app.kubernetes.io/name"]
value: release-name
- it: should have metadata labels instance
asserts:
- equal:
- path: metadata.labels.[app.kubernetes.io/instance]
+ path: metadata.labels["app.kubernetes.io/instance"]
value: release-name
- it: should have metadata labels component
asserts:
- equal:
- path: metadata.labels.[app.kubernetes.io/component]
+ path: metadata.labels["app.kubernetes.io/component"]
value: ozgcloud-elasticsearch-operator
- it: should have rules for ozgcloudelasticsearchs resource
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_view_role_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_view_role_test.yaml
index 5112d90..5361034 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_view_role_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_view_role_test.yaml
@@ -22,17 +22,17 @@ tests:
- it: should have metadata labels name
asserts:
- equal:
- path: metadata.labels.[app.kubernetes.io/name]
+ path: metadata.labels["app.kubernetes.io/name"]
value: release-name
- it: should have metadata labels instance
asserts:
- equal:
- path: metadata.labels.[app.kubernetes.io/instance]
+ path: metadata.labels["app.kubernetes.io/instance"]
value: release-name
- it: should have metadata labels component
asserts:
- equal:
- path: metadata.labels.[app.kubernetes.io/component]
+ path: metadata.labels["app.kubernetes.io/component"]
value: ozgcloud-elasticsearch-operator
- it: should have rules for ozgcloudelasticsearchs resource
diff --git a/ozgcloud-keycloak-operator/run_helm_test.sh b/ozgcloud-keycloak-operator/run_helm_test.sh
index 8097a39..44b6c30 100755
--- a/ozgcloud-keycloak-operator/run_helm_test.sh
+++ b/ozgcloud-keycloak-operator/run_helm_test.sh
@@ -4,4 +4,4 @@ set -e
helm template ./src/main/helm/ -f src/test/helm/linter_values.yaml
helm lint -f src/test/helm/linter_values.yaml ./src/main/helm/
-cd src/main/helm && helm unittest --helm3 -f '../../test/helm/*/*.yaml' -f '../../test/helm/*.yaml' .
+cd src/main/helm && helm unittest -f '../../test/helm/*/*.yaml' .
--
GitLab