Cleanup smoketest and move k8s to deployment/ (#658)

* Remove run-gunicorn-v2.sh and smoketest2.py

Signed-off-by: Mihai Criveti <[email protected]>

* Move test files to tests/

Signed-off-by: Mihai Criveti <[email protected]>

* Add mcpgateway.sbom.xml to FILES_TO_CLEAN

Signed-off-by: Mihai Criveti <[email protected]>

* Move k8s to deployment/

Signed-off-by: Mihai Criveti <[email protected]>

* Move smoketest.py back for now

Signed-off-by: Mihai Criveti <[email protected]>

---------

Signed-off-by: Mihai Criveti <[email protected]>

Author: crivetimihai

.dockerignore

@@ -13,7 +13,7 @@ agent_runtimes/
 charts/
 deployment/
 docs/
-k8s/
+deployment/k8s/
 mcp-servers/
 tests/
 test/

Makefile

@@ -41,7 +41,8 @@ FILES_TO_CLEAN := .coverage coverage.xml mcp.prof mcp.pstats \
 	*.db *.sqlite *.sqlite3 mcp.db-journal *.py,cover \
 	.depsorter_cache.json .depupdate.* \
 	grype-results.sarif devskim-results.sarif \
-	*.tar.gz *.tar.bz2 *.tar.xz *.zip *.deb
+	*.tar.gz *.tar.bz2 *.tar.xz *.zip *.deb \
+	*.log mcpgateway.sbom.xml
 
 COVERAGE_DIR ?= $(DOCS_DIR)/docs/coverage
 LICENSES_MD  ?= $(DOCS_DIR)/docs/test/licenses.md
@@ -2035,7 +2036,7 @@ IMAGE            ?= $(IMG):$(TAG)  # or IMAGE=ghcr.io/ibm/mcp-context-forge:$(TA
 # help: minikube-port-forward   - Run kubectl port-forward -n mcp-private svc/mcp-stack-mcpgateway 8080:80
 # help: minikube-dashboard      - Print & (best-effort) open the Kubernetes dashboard URL
 # help: minikube-image-load     - Load $(IMAGE) into Minikube container runtime
-# help: minikube-k8s-apply      - Apply manifests from k8s/ - access with `kubectl port-forward svc/mcp-context-forge 8080:80`
+# help: minikube-k8s-apply      - Apply manifests from deployment/k8s/ - access with `kubectl port-forward svc/mcp-context-forge 8080:80`
 # help: minikube-status         - Cluster + addon health overview
 # help: minikube-context        - Switch kubectl context to Minikube
 # help: minikube-ssh            - SSH into the Minikube VM
@@ -2126,7 +2127,7 @@ minikube-image-load:
 
 minikube-k8s-apply:
 	@echo "🧩 Applying k8s manifests in ./k8s ..."
-	@kubectl apply -f k8s/ --recursive
+	@kubectl apply -f deployment/k8s/ --recursive
 
 # -----------------------------------------------------------------------------
 # 🔍  Utility: print the current registry URL (host-port) - works after cluster

README.md

@@ -1998,7 +1998,7 @@ minikube-start        - Start local Minikube cluster with Ingress + DNS + metric
 minikube-stop         - Stop the Minikube cluster
 minikube-delete       - Delete the Minikube cluster
 minikube-image-load   - Build and load ghcr.io/ibm/mcp-context-forge:latest into Minikube
-minikube-k8s-apply    - Apply Kubernetes manifests from k8s/
+minikube-k8s-apply    - Apply Kubernetes manifests from deployment/k8s/
 minikube-status       - Show status of Minikube and ingress pods
 🛠️ HELM CHART TASKS
 helm-lint            - Lint the Helm chart (static analysis)

deployment/ansible/ibm-cloud/roles/ibm_cloud/tasks/main.yml

@@ -62,7 +62,7 @@
     redis_conn: "{{ redis_key.resource.connection[0].rediss.composed[0] }}"
 
 # 6️⃣  Fetch kubeconfig (CLI) - simplest universal path
-- name: Grab kubeconfig for subsequent k8s/helm modules
+- name: Grab kubeconfig for subsequent deployment/k8s/helm modules
   command: ibmcloud ks cluster config --cluster {{ cluster.resource.id }} --export --json
   register: kube_json
   changed_when: false