Update

Rework Makefile
Apply kind configuration

Signed-off-by: Toni Finger <[email protected]>

Author: tonifinger

.gitignore

@@ -4,4 +4,5 @@
 .DS_Store
 node_modules
 Tests/kaas/results/
+Tests/kaas/kaas-sonobuoy-tests/results/
 *.tar.gz

Tests/kaas/kaas-sonobuoy-tests/Makefile

@@ -1,32 +1,28 @@
 # Makefile
 # This makefile is for development purpose
 
+###############################################################################
+## Setup:  							                                                     ##
+###############################################################################
 SHELL = /bin/bash
-#SED ?= sed
 
 DOCKERFILE="Dockerfile"
 IMAGE_REGISTRY="ghcr.io/sovereigncloudstack/standards"
-IMAGE_NAME="scsconformance"
-#IMAGE_VERSION_TAG ="v0.1.2"
+IMAGE_NAME="scs-kaas-conformance"
 
 KIND_CLUSTER ="testcluster"
 
-#PLUGIN_NAME="k8s-default-storage-class-plugin-go"
-PLUGIN_NAME="plugin"
+PLUGIN_NAME="scs-conformance-sonobuoy-plugin"
 PLUGIN_FILE="${PLUGIN_NAME}.yaml"
+KIND_CONFIG_FILE="kind_config.yaml"
 
-#~ SONO_WAIT    = 1
-#~ SONO_TIMEOUT = 60
-
-KUBERNETES_SERVICE_HOST=127.0.0.1
-KUBERNETES_SERVICE_PORT=34743
-
+SONO_WAIT= 30
 
 ###############################################################################
 ## Helpers:  							                                                   ##
 ###############################################################################
 
-ifeq ($(IMAGE_VERSION_TAG),)
+ifndef IMAGE_VERSION_TAG:
 	export TAG=dev
 else
 	export TAG=${IMAGE_VERSION_TAG}
@@ -46,70 +42,75 @@ kind-init:
 	@echo "[KindCluster]   ${KIND_CLUSTER}"
 	@echo ""
 
-
 ###############################################################################
 ## For develpoment usage:                                                    ##
 ###############################################################################
 
 dev-prerequests:
-	@echo "[check-test-setup]"
 	@kind version
-	@docker version
+	@docker version -f json | jq '.Client.Version'
 	@sonobuoy version --short
+	@yq --version
+	@jq --version
 	@go version
 	@docker buildx version
 
 
 dev-setup: kind-init
-	kind create cluster --name ${KIND_CLUSTER}
+	kind create cluster --config ${KIND_CONFIG_FILE} --name ${KIND_CLUSTER}
 
 
 dev-build: container-init
-	@echo "[build]"
+	@echo "[Building image...]"
 	DOCKER_BUILDKIT=1 docker build . -f ${DOCKERFILE} -t ${SONOBUOY_IMAGE}
 	kind load docker-image --name ${KIND_CLUSTER} ${SONOBUOY_IMAGE}
 
 
-dev-go:
-	@echo "[go]"
-	@echo "[KubernetesService]   ${KUBERNETES_SERVICE_HOST}:${KUBERNETES_SERVICE_PORT}"
-	@rm -rf ./build || true
-	@mkdir ./build
-	go test -c -o ./build ./...
-#	go test -c -o ./build ./... --args --skip-labels="type=pod-list"
-#	go tool test2json ./build -test.v
+dev-run:
+	@echo "[Running sonobuoy...]"
+	@sonobuoy run -p ${PLUGIN_FILE} --wait=${SONO_WAIT}
+	@sonobuoy status
 
 
-dev-run:
-	@echo "[run-test]"
-	@echo "sonobuoy run --plugin ${PLUGIN_FILE} --wait=${SONO_WAIT} --timeout=${SONO_TIMEOUT}"
-#~ 	@sonobuoy run --plugin ${PLUGIN_FILE} --wait=${SONO_WAIT} --timeout=${SONO_TIMEOUT}
-	@sonobuoy run --plugin ${PLUGIN_FILE} 
+dev-run-background:
+	@echo "[Running sonobuoy in background...]"
+	@sonobuoy run -p ${PLUGIN_FILE}
 	@sonobuoy status
 
 
-dev-result:
-	@echo "[result]"
-	#outfile=$(sonobuoy retrieve) && mkdir results && tar -xf ${outfile} -C results
+dev-result: dev-clean-result
+	@echo "[Retrieve results...]"
 	sonobuoy retrieve
-	sonobuoy results *.tar.gz
+	@echo "[Extracting results...]"
 	mkdir results
 	tar -xf *.tar.gz -C results
+	cat results/plugins/scs-kaas-conformance/sonobuoy_results.yaml | yq
+	cat results/plugins/scs-kaas-conformance/results/global/out.json | jq
+	@echo "[Displaying results...]"
+	sonobuoy results *.tar.gz
 
 
-dev-clean:
-	@echo "[clean]"
-	@sonobuoy delete --all --wait || true
-	@sonobuoy status || true
+dev-rerun: dev-clean-sonobuoy dev-build dev-run dev-result
+
+
+dev-clean-result:
 	@rm -rf *.tar.gz || true
 	@rm -rf results || true
 
 
+dev-clean-sonobuoy: dev-clean-result
+	@echo "[Cleanup sonobuoy environment from cluster...]"
+	@sonobuoy delete --all --wait || true
+	@sonobuoy status || true
 
-dev-purge: kind-init dev-clean
-	@echo "[purge]"
+
+dev-purge: kind-init clean-sonobuoy
+	@echo "[Purge everthing...]"
+	@echo "[Deleting kind cluster...]"
 	kind delete cluster --name ${KIND_CLUSTER} || true
+	@echo "[Removing docker image...]"
 	docker rmi ${SONOBUOY_IMAGE} || true
+	@rm -rf ./build || true
 
+PHONY: dev-prerequests dev-build dev-run dev-result dev-clean-sonobuoy dev-clean-result dev-purge dev-rerun dev-run-background
 
-PHONY: dev-prerequests dev-build dev-run dev-result dev-clean dev-clean dev-purge

Tests/kaas/kaas-sonobuoy-tests/README.md

@@ -34,21 +34,20 @@ For test development with Sonobuoy, [KinD](https://kind.sigs.k8s.io/) is used as
     make dev-setup
     ```
 
-1. Set environment variables
+* (Optional): Set env
 
     ```bash
-    export IMAGE_VERSION_TAG="dev"
-    export K8S_HOST=<kind-cluster-ip>
-    export K8S_PORT=<kind-cluster-port>
+    export TEST_STANDARD=<standard number code>
     ```
 
-2. Build the image and upload it to the KinD cluster
+
+1. Build the image and upload it to the KinD cluster
 
     ```bash
     make dev-build
     ```
 
-3. Execute the Sonobuoy plugin
+2. Execute the Sonobuoy plugin
 
     ```bash
     make dev-run
@@ -61,26 +60,30 @@ For test development with Sonobuoy, [KinD](https://kind.sigs.k8s.io/) is used as
     sonobuoy status
     ```
 
-4. Retrieve the Results
+3. Retrieve the Results
 
    Once Sonobuoy is done running the plugin you can retrieve the results as following:
 
     ```bash
     make dev-result
     ```
 
-5. Clean the Sonobuoy testcase from the KinD cluster
+4. Clean the Sonobuoy testcase from the KinD cluster
 
    Cleaning up all Kubernetes resources which were placed on the KinD cluster by sonobuoy
 
     ```bash
     make dev-clean
     ```
 
-6. Purge everything
+These steps can also be carried out in short form using the following command:
 
-   Deleting the KinD cluster
+```bash
+make dev-rerun
+```
 
-    ```bash
-    make dev-purge
-    ```
+Finnaly to remove the kind cluster simply use:
+
+```bash
+make dev-purge
+```

Tests/kaas/kaas-sonobuoy-tests/kind_config.yaml

@@ -0,0 +1,10 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  apiServerAddress: 127.0.0.1
+  apiServerPort: 6443
+nodes:
+- role: control-plane
+- role: worker
+- role: worker
+- role: worker

Tests/kaas/kaas-sonobuoy-tests/plugin.yaml renamed to Tests/kaas/kaas-sonobuoy-tests/scs-conformance-sonobuoy-plugin.yaml

@@ -1,13 +1,13 @@
 sonobuoy-config:
   driver: Job
-  plugin-name: scs-conformance
+  plugin-name: scs-kaas-conformance
   result-format: gojson
-  description: An easy to start from project for making K8s aware tests.
+  description: A testsuite for testing the scs conformance of k8s clusters.
 spec:
   command:
   - bash
   args: ["-c","go tool test2json ./custom.test -test.v | tee ${SONOBUOY_RESULTS_DIR}/out.json ; echo ${SONOBUOY_RESULTS_DIR}/out.json > ${SONOBUOY_RESULTS_DIR}/done"]
-  image: ghcr.io/sovereigncloudstack/standards/scsconformance:dev
+  image: ghcr.io/sovereigncloudstack/standards/scs-kaas-conformance:dev
   env:
   - name: NS_PREFIX
     value: custom