config: Switch to usage of new config

Adapt all usages of config to the new format.
Remove code that was used by old config.
Update all sample and example configs.

Refs: #2135
Signed-off-by: Konstantin Yarovoy <[email protected]>

.github/workflows/actions.yml

@@ -400,7 +400,7 @@ jobs:
         mv cnf-testsuite /shared/$DIR 
         cd /shared/$DIR
         ./cnf-testsuite setup
-        wget -O cnf-testsuite.yml https://raw.githubusercontent.com/cnti-testcatalog/testsuite/main/example-cnfs/coredns/cnf-testsuite.yml
+        wget -O cnf-testsuite.yml https://raw.githubusercontent.com/cnti-testcatalog/testsuite/${GITHUB_SHA}/example-cnfs/coredns/cnf-testsuite.yml
         ./cnf-testsuite cnf_setup cnf-config=./cnf-testsuite.yml
         LOG_LEVEL=info ./cnf-testsuite all ~compatibility ~resilience ~reasonable_startup_time ~reasonable_image_size ~platform ~increase_capacity ~decrease_capacity ~install_script_helm ~helm_chart_valid ~helm_chart_published verbose
     - name: Delete Cluster
@@ -475,7 +475,7 @@ jobs:
         mv cnf-testsuite /shared/$DIR
         cd /shared/$DIR
         ./cnf-testsuite setup
-        wget -O cnf-testsuite.yml https://raw.githubusercontent.com/cnti-testcatalog/testsuite/main/example-cnfs/coredns/cnf-testsuite.yml
+        wget -O cnf-testsuite.yml https://raw.githubusercontent.com/cnti-testcatalog/testsuite/${GITHUB_SHA}/example-cnfs/coredns/cnf-testsuite.yml
         ./cnf-testsuite cnf_setup cnf-config=./cnf-testsuite.yml
         LOG_LEVEL=info ./cnf-testsuite all ~resilience ~compatibility ~pod_network_latency ~platform ~increase_capacity ~decrease_capacity ~ip_addresses ~liveness ~readiness ~rolling_update ~rolling_downgrade ~rolling_version_change ~nodeport_not_used ~hostport_not_used ~hardcoded_ip_addresses_in_k8s_runtime_configuration ~install_script_helm ~helm_chart_valid ~helm_chart_published ~rollback ~secrets_used ~immutable_configmap verbose
     - name: Delete Cluster
@@ -550,7 +550,7 @@ jobs:
         mv cnf-testsuite /shared/$DIR
         cd /shared/$DIR
         ./cnf-testsuite setup
-        wget -O cnf-testsuite.yml https://raw.githubusercontent.com/cnti-testcatalog/testsuite/main/example-cnfs/coredns/cnf-testsuite.yml
+        wget -O cnf-testsuite.yml https://raw.githubusercontent.com/cnti-testcatalog/testsuite/${GITHUB_SHA}/example-cnfs/coredns/cnf-testsuite.yml
         ./cnf-testsuite cnf_setup cnf-config=./cnf-testsuite.yml
         LOG_LEVEL=info ./cnf-testsuite all ~resilience ~platform ~ip_addresses ~liveness ~readiness ~rolling_update ~rolling_downgrade ~rolling_version_change ~nodeport_not_used ~hostport_not_used ~hardcoded_ip_addresses_in_k8s_runtime_configuration ~rollback ~secrets_used ~immutable_configmap ~reasonable_startup_time ~reasonable_image_size verbose
     - name: Delete Cluster

embedded_files/cnf-testsuite-v1-example.yml

@@ -0,0 +1,5 @@
+release_name: coredns
+helm_chart: stable/coredns
+helm_repository:
+  name: stable
+  repo_url: https://cncf.gitlab.io/stable

embedded_files/cnf-testsuite-v2-example.yml

@@ -13,7 +13,7 @@ deployments:
     - name: coredns
       helm_repo_name: stable
       helm_repo_url: https://cncf.gitlab.io/stable
-      helm_chart_name: coredns
+      helm_chart_name: stable/coredns
 #  helm_dirs:
 #    - name: envoy
 #      helm_directory: ../example-cnfs/envoy/envoy

example-cnfs/coredns/cnf-testsuite.yml

@@ -1,14 +1,15 @@
 ---
-helm_chart: stable/coredns # PUBLISHED_CNFS_HELM_CHART_REPO/NAME ; or
-helm_repository: # CONFIGURATION OF HELM REPO - ONLY NEEDED WHEN USING helm_chart
-  name: stable # HELM_CHART_REPOSITORY_NAME
-  repo_url: https://cncf.gitlab.io/stable # HELM_CHART_REPOSITORY_URL
-#helm_directory: coredns # PATH_TO_CNFS_HELM_CHART ; or
-#manifest_directory: coredns # PATH_TO_DIRECTORY_OF_CNFS_MANIFEST_FILES ; or
-release_name: coredns # DESIRED_HELM_RELEASE_NAME
-container_names:
+config_version: v2
+common:
+  container_names:
   - name: coredns
-    rolling_update_test_tag: "1.8.0"
+    rollback_from_tag: 1.8.0
+    rolling_update_test_tag: 1.8.0
     rolling_downgrade_test_tag: 1.6.7
     rolling_version_change_test_tag: 1.8.0
-    rollback_from_tag: 1.8.0
+deployments:
+  helm_charts:
+  - name: coredns
+    helm_chart_name: stable/coredns
+    helm_repo_name: stable
+    helm_repo_url: https://cncf.gitlab.io/stable

example-cnfs/envoy/cnf-testsuite.yml

@@ -1,3 +1,6 @@
 ---
-release_name: envoy 
-helm_directory: envoy
+config_version: v2
+deployments:
+  helm_dirs:
+  - name: envoy
+    helm_directory: envoy

example-cnfs/ip-forwarder/cnf-testsuite.yml

@@ -1,5 +1,14 @@
 ---
-helm_directory: vpp
-release_name: vpp
-rolling_update_test_tag: latest
-allowlist_helm_chart_container_names: [nginx, calico-node, kube-proxy, nginx-proxy, node-cache, kube-multus]
+config_version: v2
+common:
+  white_list_container_names:
+  - nginx
+  - calico-node
+  - kube-proxy
+  - nginx-proxy
+  - node-cache
+  - kube-multus
+deployments:
+  helm_dirs:
+  - name: vpp
+    helm_directory: vpp

example-cnfs/linkerd2/cnf-testsuite.yml

@@ -1,7 +1,9 @@
 ---
-release_name: linkerd 
-helm_values: "--set-file identityTrustAnchorsPEM=$(pwd)/ca.crt --set-file identity.issuer.tls.crtPEM=$(pwd)/issuer.crt --set-file identity.issuer.tls.keyPEM=$(pwd)/issuer-private.pem"
-helm_repository:
-    name: linkerd 
-    repo_url: https://helm.linkerd.io/stable
-helm_chart: linkerd/linkerd-control-plane
+config_version: v2
+deployments:
+  helm_charts:
+  - name: linkerd
+    helm_chart_name: linkerd/linkerd-control-plane
+    helm_values: --set-file identityTrustAnchorsPEM=$(pwd)/ca.crt --set-file identity.issuer.tls.crtPEM=$(pwd)/issuer.crt --set-file identity.issuer.tls.keyPEM=$(pwd)/issuer-private.pem
+    helm_repo_name: linkerd
+    helm_repo_url: https://helm.linkerd.io/stable

example-cnfs/nsm/cnf-testsuite.yml

@@ -1,6 +1,7 @@
 ---
-helm_directory: helm_chart
-release_name: nsm --set insecure=true
-helm_repository:
-  name: stable 
-  repo_url: https://cncf.gitlab.io/stable
+config_version: v2
+deployments:
+  helm_dirs:
+  # (kosstennbl) TODO: move helm addoional arguments from name to helm_values
+  - name: nsm --set insecure=true
+    helm_directory: helm_chart

example-cnfs/pantheon-nsm-nat/cnf-testsuite.yml

@@ -1,4 +1,15 @@
 ---
-helm_directory: nat-cnf 
-release_name: cnf-nat 
-allowlist_helm_chart_container_names: [node-cache, nginx, coredns, calico-node, kube-proxy, nginx-proxy, kube-multus]
+config_version: v2
+common:
+  white_list_container_names:
+  - node-cache
+  - nginx
+  - coredns
+  - calico-node
+  - kube-proxy
+  - nginx-proxy
+  - kube-multus
+deployments:
+  helm_dirs:
+  - name: cnf-nat
+    helm_directory: nat-cnf

example-cnfs/vpp-3c2n-csp-use-case/cnf-testsuite.yml

@@ -1,4 +1,13 @@
 ---
-helm_directory: csp
-release_name: ip-forwarder-csp
-allowlist_helm_chart_container_names: [nginx, calico-node, kube-proxy, nginx-proxy, node-cache]
+config_version: v2
+common:
+  white_list_container_names:
+  - nginx
+  - calico-node
+  - kube-proxy
+  - nginx-proxy
+  - node-cache
+deployments:
+  helm_dirs:
+  - name: ip-forwarder-csp
+    helm_directory: csp

sample-cnfs/k8s-multiple-deployments/cnf-testsuite.yml

@@ -1,6 +1,6 @@
 ---
-helm_directory: chart
-release_name: sidecar-container-demo
-helm_repository:
-  name: stable 
-  repo_url: https://cncf.gitlab.io/stable
+config_version: v2
+deployments:
+  helm_dirs:
+  - name: sidecar-container-demo
+    helm_directory: chart

sample-cnfs/k8s-multiple-processes/cnf-testsuite.yml

@@ -1,7 +1,6 @@
 ---
-helm_directory: chart
-release_name: sidecar-container-demo
-helm_repository:
-  name: stable 
-  repo_url: https://cncf.gitlab.io/stable
-rolling_update_test_tag: 1.6.7
+config_version: v2
+deployments:
+  helm_dirs:
+  - name: sidecar-container-demo
+    helm_directory: chart

sample-cnfs/k8s-non-helm-no-image-policy/cnf-testsuite.yml

@@ -1,6 +1,6 @@
 ---
-manifest_directory: manifests 
-release_name: nginx-webapp
-helm_repository:
-  name:
-  repo_url:
+config_version: v2
+deployments:
+  manifests:
+  - name: nginx-webapp
+    manifest_directory: manifests

sample-cnfs/k8s-non-helm/cnf-testsuite.yml

@@ -1,6 +1,6 @@
 ---
-manifest_directory: manifests 
-release_name: nginx-webapp
-helm_repository:
-  name:
-  repo_url:
+config_version: v2
+deployments:
+  manifests:
+  - name: nginx-webapp
+    manifest_directory: manifests

sample-cnfs/k8s-sidecar-container-pattern/cnf-testsuite.yml

@@ -1,9 +1,6 @@
 ---
-helm_directory: chart
-git_clone_url: 
-install_script: 
-release_name: sidecar-container-demo
-helm_repository:
-  name: stable 
-  repo_url: https://cncf.gitlab.io/stable
-rolling_update_test_tag: 1.6.7
+config_version: v2
+deployments:
+  helm_dirs:
+  - name: sidecar-container-demo
+    helm_directory: chart

sample-cnfs/multi_helm_directories/cnf-testsuite.yml

@@ -1,6 +1,6 @@
 ---
-helm_directory: multiple/directory/chart
-release_name: coredns
-helm_repository:
-  name: stable 
-  repo_url: https://cncf.gitlab.io/stable
+config_version: v2
+deployments:
+  helm_dirs:
+  - name: coredns
+    helm_directory: multiple/directory/chart

sample-cnfs/ndn-immutable-configmap/cnf-testsuite.yml

@@ -1,15 +1,13 @@
 ---
-git_clone_url: 
-install_script: 
-manifest_directory: manifests
-release_name: nginx
-docker_repository: 
-helm_repository:
-  name: 
-  repo_url:
-container_names: 
+config_version: v2
+common:
+  container_names:
   - name: nginx
-    rolling_update_test_tag: "latest"
+    rollback_from_tag: latest
+    rolling_update_test_tag: latest
     rolling_downgrade_test_tag: latest
     rolling_version_change_test_tag: latest
-    rollback_from_tag: latest
+deployments:
+  manifests:
+  - name: nginx
+    manifest_directory: manifests

sample-cnfs/ndn-multi-db-connections-fail/cnf-testsuite.yml

@@ -1,4 +1,7 @@
 ---
-helm_directory: wordpress 
-helm_install_namespace: wordpress
-release_name: test 
+config_version: v2
+deployments:
+  helm_dirs:
+  - name: test
+    helm_directory: wordpress
+    namespace: wordpress

sample-cnfs/ndn-mutable-configmap/cnf-testsuite.yml

@@ -1,15 +1,13 @@
 ---
-git_clone_url: 
-install_script: 
-manifest_directory: manifests
-release_name: nginx
-docker_repository: 
-helm_repository:
-  name: 
-  repo_url:
-container_names: 
+config_version: v2
+common:
+  container_names:
   - name: nginx
-    rolling_update_test_tag: "latest"
+    rollback_from_tag: latest
+    rolling_update_test_tag: latest
     rolling_downgrade_test_tag: latest
     rolling_version_change_test_tag: latest
-    rollback_from_tag: latest
+deployments:
+  manifests:
+  - name: nginx
+    manifest_directory: manifests

sample-cnfs/ndn-non-root-user/cnf-testsuite.yml

@@ -1,6 +1,6 @@
 ---
-manifest_directory: manifests
-release_name: nginx
-helm_repository:
-  name: 
-  repo_url:
+config_version: v2
+deployments:
+  manifests:
+  - name: nginx
+    manifest_directory: manifests

sample-cnfs/ndn-reasonable-image-size/cnf-testsuite.yml

@@ -1,3 +1,6 @@
 ---
-helm_directory: gateway-helm
-release_name: envoy-gateway
+config_version: v2
+deployments:
+  helm_dirs:
+  - name: envoy-gateway
+    helm_directory: gateway-helm

sample-cnfs/sample-alpha-apis/cnf-testsuite.yml

@@ -1,6 +1,6 @@
 ---
-manifest_directory: manifests
-release_name: nginx
-helm_repository:
-  name: 
-  repo_url:
+config_version: v2
+deployments:
+  manifests:
+  - name: nginx
+    manifest_directory: manifests

sample-cnfs/sample-appliciation-credentials/cnf-testsuite.yml

@@ -1,6 +1,6 @@
 ---
-helm_directory: chart
-release_name: coredns
-helm_repository:
-  name: stable 
-  repo_url: https://cncf.gitlab.io/stable
+config_version: v2
+deployments:
+  helm_dirs:
+  - name: coredns
+    helm_directory: chart

sample-cnfs/sample-bad-helm-repo/cnf-testsuite.yml

@@ -1,6 +1,8 @@
 ---
-release_name: coredns
-helm_repository:
-  name: badrepo
-  repo_url: https://bad-helm-repo.googleapis.com
-helm_chart: badrepo/coredns
+config_version: v2
+deployments:
+  helm_charts:
+  - name: coredns
+    helm_chart_name: badrepo/coredns
+    helm_repo_name: badrepo
+    helm_repo_url: https://bad-helm-repo.googleapis.com

sample-cnfs/sample-bad-zombie/cnf-testsuite.yml

@@ -1,6 +1,8 @@
 ---
-release_name: coredns
-helm_repository:
-  name: stable 
-  repo_url: https://cncf.gitlab.io/stable
-helm_chart: stable/coredns
+config_version: v2
+deployments:
+  helm_charts:
+  - name: coredns
+    helm_chart_name: stable/coredns
+    helm_repo_name: stable
+    helm_repo_url: https://cncf.gitlab.io/stable

sample-cnfs/sample-bad_helm_coredns-cnf/cnf-testsuite.yml

@@ -1,3 +1,6 @@
 ---
-helm_directory: chart
-release_name: bad-helm-coredns-coredns
+config_version: v2
+deployments:
+  helm_dirs:
+  - name: bad-helm-coredns-coredns
+    helm_directory: chart

sample-cnfs/sample-coredns-cnf-bad-chart/cnf-testsuite.yml

@@ -1,6 +1,8 @@
 ---
-release_name: coredns
-helm_repository:
-  name: stable 
-  repo_url: https://cncf.gitlab.io/stable
-helm_chart: stable/corsdsdsdedns
+config_version: v2
+deployments:
+  helm_charts:
+  - name: coredns
+    helm_chart_name: stable/corsdsdsdedns
+    helm_repo_name: stable
+    helm_repo_url: https://cncf.gitlab.io/stable