From 1de322f21de7d3d56a60ba5e9cc37bf873281754 Mon Sep 17 00:00:00 2001 From: "michal.gubricky" Date: Thu, 3 Oct 2024 09:54:58 +0200 Subject: [PATCH] Rebase after current sonobuoy golang framework was restructured Signed-off-by: michal.gubricky --- .../kind-config.yaml | 15 --------------- Tests/kaas/kaas-sonobuoy-tests/kind_config.yaml | 9 +++++++++ .../scs_0217_cluster_hardening_test.go | 0 3 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 Tests/kaas/kaas-sonobuoy-go-example-e2e-framework/kind-config.yaml rename Tests/kaas/{kaas-sonobuoy-go-example-e2e-framework/scs_k8s_tests => kaas-sonobuoy-tests/scs_k8s_conformance_tests}/scs_0217_cluster_hardening_test.go (100%) diff --git a/Tests/kaas/kaas-sonobuoy-go-example-e2e-framework/kind-config.yaml b/Tests/kaas/kaas-sonobuoy-go-example-e2e-framework/kind-config.yaml deleted file mode 100644 index d094372b4..000000000 --- a/Tests/kaas/kaas-sonobuoy-go-example-e2e-framework/kind-config.yaml +++ /dev/null @@ -1,15 +0,0 @@ -kind: Cluster -apiVersion: kind.x-k8s.io/v1alpha4 -kubeadmConfigPatches: - - | - apiVersion: kubeadm.k8s.io/v1beta3 - kind: ClusterConfiguration - metadata: - name: config - apiServer: - extraArgs: - enable-admission-plugins: "NodeRestriction,PodSecurity" -nodes: - - role: control-plane - - role: worker - - role: worker diff --git a/Tests/kaas/kaas-sonobuoy-tests/kind_config.yaml b/Tests/kaas/kaas-sonobuoy-tests/kind_config.yaml index 947a9fa8a..878587cae 100644 --- a/Tests/kaas/kaas-sonobuoy-tests/kind_config.yaml +++ b/Tests/kaas/kaas-sonobuoy-tests/kind_config.yaml @@ -3,6 +3,15 @@ apiVersion: kind.x-k8s.io/v1alpha4 networking: apiServerAddress: 127.0.0.1 apiServerPort: 6443 +kubeadmConfigPatches: + - | + apiVersion: kubeadm.k8s.io/v1beta3 + kind: ClusterConfiguration + metadata: + name: config + apiServer: + extraArgs: + enable-admission-plugins: "NodeRestriction,PodSecurity" nodes: - role: control-plane - role: worker diff --git a/Tests/kaas/kaas-sonobuoy-go-example-e2e-framework/scs_k8s_tests/scs_0217_cluster_hardening_test.go b/Tests/kaas/kaas-sonobuoy-tests/scs_k8s_conformance_tests/scs_0217_cluster_hardening_test.go similarity index 100% rename from Tests/kaas/kaas-sonobuoy-go-example-e2e-framework/scs_k8s_tests/scs_0217_cluster_hardening_test.go rename to Tests/kaas/kaas-sonobuoy-tests/scs_k8s_conformance_tests/scs_0217_cluster_hardening_test.go