Merge branch 'main' into chore/aws-creds-errors

feat: improved AWS creds errors
Signed-off-by: AlexsJones <alexsimonjones@gmail.com>
2026-03-19 03:23:47 +00:00 · 2025-06-20 16:10:33 +01:00 · 2025-06-20 16:09:55 +01:00 · 2025-06-20 15:58:42 +01:00
46 changed files with 321 additions and 2733 deletions
--- a/.github/workflows/build_container.yaml
+++ b/.github/workflows/build_container.yaml
@@ -36,7 +36,7 @@ jobs:

    steps:
      - name: Check out code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

      - name: Extract branch name
        id: extract_branch
@@ -68,7 +68,7 @@ jobs:

    steps:
      - name: Check out code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

      - name: Docker meta
        id: meta
@@ -83,7 +83,7 @@ jobs:
            type=raw,value=dev-${{ env.DATETIME }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -93,7 +93,7 @@ jobs:
        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3

      - name: Build and push multi-arch image
        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
--- a/.github/workflows/golangci_lint.yaml
+++ b/.github/workflows/golangci_lint.yaml
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code into the Go module directory
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

      - name: golangci-lint
        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -23,7 +23,7 @@ jobs:
    # Release-please creates a PR that tracks all changes
    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
     
      - uses: google-github-actions/release-please-action@e4dc86ba9405554aeba3c6bb2d169500e7d3b4ee # v4.1.1
        id: release
@@ -55,7 +55,7 @@ jobs:
          docker-images: true
          swap-storage: true
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
        with:
          fetch-depth: 0
      - name: Set up Go
@@ -65,7 +65,7 @@ jobs:
      - name: Download Syft
        uses: anchore/sbom-action/download-syft@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6
+        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6
        with:
          # either 'goreleaser' (default) or 'goreleaser-pro'
          distribution: goreleaser
@@ -91,16 +91,16 @@ jobs:
      IMAGE_NAME: k8sgpt
    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
        with:
          submodules: recursive

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
        with:
          registry: "ghcr.io"
          username: ${{ github.actor }}
--- a/.github/workflows/semantic_pr.yaml
+++ b/.github/workflows/semantic_pr.yaml
@@ -16,7 +16,7 @@ jobs:
      pull-requests: read # Needed for reading prs
    steps:
      - name: Validate Pull Request
-        uses: amannn/action-semantic-pull-request@fdd4d3ddf614fbcd8c29e4b106d3bbe0cb2c605d # v6.0.1
+        uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -15,7 +15,7 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

      - name: Set up Go
        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1 +1 @@
-{".":"0.4.26"}
+{".":"0.4.19"}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,93 +1,5 @@
 # Changelog

-## [0.4.26](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.25...v0.4.26) (2025-10-16)
-
-
-### Other
-
-* missing filter arg on serve ([#1583](https://github.com/k8sgpt-ai/k8sgpt/issues/1583)) ([f1d2e30](https://github.com/k8sgpt-ai/k8sgpt/commit/f1d2e306f32eb1e01a2788174084be29a7fa1282))
-
-## [0.4.25](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.24...v0.4.25) (2025-09-03)
-
-
-### Features
-
-* fix to broken inference ([#1575](https://github.com/k8sgpt-ai/k8sgpt/issues/1575)) ([291e42d](https://github.com/k8sgpt-ai/k8sgpt/commit/291e42dc4b81ffb0672c21fbb325ddebc5d531a3))
-
-## [0.4.24](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.23...v0.4.24) (2025-08-18)
-
-
-### Features
-
-* add ClusterServiceVersion, Subscription, InstallPlan, OperatorGroup, and CatalogSource analyzers ([#1564](https://github.com/k8sgpt-ai/k8sgpt/issues/1564)) ([0cf4cae](https://github.com/k8sgpt-ai/k8sgpt/commit/0cf4cae07e32a0025246abcf2d1a5a91f82d093a))
-* reintroduced inference code ([#1548](https://github.com/k8sgpt-ai/k8sgpt/issues/1548)) ([7e33276](https://github.com/k8sgpt-ai/k8sgpt/commit/7e332761d89d953989b4f33509208dd4db4d4b91))
-* update helm charts with mcp support and fix Google ADA issue  ([#1568](https://github.com/k8sgpt-ai/k8sgpt/issues/1568)) ([5334589](https://github.com/k8sgpt-ai/k8sgpt/commit/53345895deec4c74cac00ee3fd5e230f6a92cf4a))
-
-
-### Bug Fixes
-
-* migrated to more actively maintained mcp golang lib and added AI explain  ([#1557](https://github.com/k8sgpt-ai/k8sgpt/issues/1557)) ([c47ae59](https://github.com/k8sgpt-ai/k8sgpt/commit/c47ae595fb9fc5bf22afef3bc6764b3e87e4553d))
-
-
-### Other
-
-* **deps:** update actions/checkout action to v5 ([#1562](https://github.com/k8sgpt-ai/k8sgpt/issues/1562)) ([e385e77](https://github.com/k8sgpt-ai/k8sgpt/commit/e385e77da93a65fe52a152bf1f8f1415552698d5))
-* **deps:** update amannn/action-semantic-pull-request action to v6 ([#1565](https://github.com/k8sgpt-ai/k8sgpt/issues/1565)) ([c5c9135](https://github.com/k8sgpt-ai/k8sgpt/commit/c5c9135900ec6f95b63dac47df751269e7420e87))
-* **deps:** update docker/login-action digest to 184bdaa ([#1559](https://github.com/k8sgpt-ai/k8sgpt/issues/1559)) ([0239b2f](https://github.com/k8sgpt-ai/k8sgpt/commit/0239b2fe6e7105bbcf3256c559c30ec7065b25f3))
-* **deps:** update goreleaser/goreleaser-action digest to e435ccd ([#1569](https://github.com/k8sgpt-ai/k8sgpt/issues/1569)) ([5e86f49](https://github.com/k8sgpt-ai/k8sgpt/commit/5e86f4925c4209b0eb2959227229c2994cfc5b6f))
-
-## [0.4.23](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.22...v0.4.23) (2025-08-08)
-
-
-### Features
-
-* add ClusterCatalog and ClusterExtension analyzers ([#1555](https://github.com/k8sgpt-ai/k8sgpt/issues/1555)) ([a821814](https://github.com/k8sgpt-ai/k8sgpt/commit/a821814125e25c062ff2faebf9df1b880414c22c))
-* oci genai chat models ([#1337](https://github.com/k8sgpt-ai/k8sgpt/issues/1337)) ([290a4be](https://github.com/k8sgpt-ai/k8sgpt/commit/290a4be210fbb508214070c31218138781d96142))
-
-
-### Bug Fixes
-
-* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1537](https://github.com/k8sgpt-ai/k8sgpt/issues/1537)) ([50d5d78](https://github.com/k8sgpt-ai/k8sgpt/commit/50d5d78c06e42d75a2448989528e5e6be12ea825))
-* **deps:** update module helm.sh/helm/v3 to v3.17.4 [security] ([#1541](https://github.com/k8sgpt-ai/k8sgpt/issues/1541)) ([5b42249](https://github.com/k8sgpt-ai/k8sgpt/commit/5b4224951e7348e9d78292dadc9b9786957117f1))
-
-## [0.4.22](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.21...v0.4.22) (2025-07-18)
-
-
-### Features
-
-* add APAC region Claude models support for Amazon Bedrock ([#1543](https://github.com/k8sgpt-ai/k8sgpt/issues/1543)) ([1819e6f](https://github.com/k8sgpt-ai/k8sgpt/commit/1819e6f410d078fce2bda8bbdb22054dfb4fc092))
-* add streamable-http support for MCP server ([#1546](https://github.com/k8sgpt-ai/k8sgpt/issues/1546)) ([3a1187a](https://github.com/k8sgpt-ai/k8sgpt/commit/3a1187ad5a190713b9216cf6d9d52d54cdb3e4da))
-
-## [0.4.21](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.20...v0.4.21) (2025-06-27)
-
-
-### Features
-
-* add latest and legacy stable models ([#1539](https://github.com/k8sgpt-ai/k8sgpt/issues/1539)) ([00c0799](https://github.com/k8sgpt-ai/k8sgpt/commit/00c07999e2290e70a6ecb95b255b4924f55ecd5f))
-* support for claude4 && model names listed ([#1540](https://github.com/k8sgpt-ai/k8sgpt/issues/1540)) ([8002d94](https://github.com/k8sgpt-ai/k8sgpt/commit/8002d943453aac8c3675d7072b25dfdc3aec1c1d))
-
-
-### Bug Fixes
-
-* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1511](https://github.com/k8sgpt-ai/k8sgpt/issues/1511)) ([08f2855](https://github.com/k8sgpt-ai/k8sgpt/commit/08f2855a4d7e61f3422cb68b0966272a85f617a5))
-
-
-### Other
-
-* **deps:** update docker/setup-buildx-action digest to e468171 ([#1527](https://github.com/k8sgpt-ai/k8sgpt/issues/1527)) ([0c917fc](https://github.com/k8sgpt-ai/k8sgpt/commit/0c917fc60115ef0dc775e858a55964382b20c5e1))
-
-## [0.4.20](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.19...v0.4.20) (2025-06-20)
-
-
-### Features
-
-* added cache purge ([#1532](https://github.com/k8sgpt-ai/k8sgpt/issues/1532)) ([74fbde0](https://github.com/k8sgpt-ai/k8sgpt/commit/74fbde00537e627c408b317ff9098227be11e2ad))
-
-
-### Other
-
-* model name ([#1535](https://github.com/k8sgpt-ai/k8sgpt/issues/1535)) ([0f700f0](https://github.com/k8sgpt-ai/k8sgpt/commit/0f700f0cd39bf5881d6c05240b842f4df7a6c016))
-
 ## [0.4.19](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.18...v0.4.19) (2025-06-20)


--- a/6
+++ b/6
@@ -85,12 +85,6 @@ docker-build:
 	@echo "===========> Building docker image"
 	docker buildx build --build-arg=VERSION="$$(git describe --tags --abbrev=0)" --build-arg=COMMIT="$$(git rev-parse --short HEAD)" --build-arg DATE="$$(date +%FT%TZ)" --platform="linux/amd64,linux/arm64" -t ${IMG} -f container/Dockerfile . --push

-## docker-build-local: Build docker image for local testing
-.PHONY: docker-build-local
-docker-build-local:
-	@echo "===========> Building docker image for local testing"
-	docker build --build-arg=VERSION="$$(git describe --tags --abbrev=0)" --build-arg=COMMIT="$$(git rev-parse --short HEAD)" --build-arg DATE="$$(date +%FT%TZ)" -t k8sgpt:local -f container/Dockerfile .
-
 ## fmt: Run go fmt against code.
 .PHONY: fmt
 fmt:
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ brew install k8sgpt
  <!---x-release-please-start-version-->

  ```
-  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.26/k8sgpt_386.rpm
+  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.19/k8sgpt_386.rpm
  ```
  <!---x-release-please-end-->

@@ -70,7 +70,7 @@ brew install k8sgpt

  <!---x-release-please-start-version-->
  ```
-  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.26/k8sgpt_amd64.rpm
+  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.19/k8sgpt_amd64.rpm
  ```
  <!---x-release-please-end-->
 </details>
@@ -83,7 +83,7 @@ brew install k8sgpt
  <!---x-release-please-start-version-->

 ```
-curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.26/k8sgpt_386.deb
+curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.19/k8sgpt_386.deb
 sudo dpkg -i k8sgpt_386.deb
 ```

@@ -94,7 +94,7 @@ sudo dpkg -i k8sgpt_386.deb
  <!---x-release-please-start-version-->

 ```
-curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.26/k8sgpt_amd64.deb
+curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.19/k8sgpt_amd64.deb
 sudo dpkg -i k8sgpt_amd64.deb
 ```

@@ -109,7 +109,7 @@ sudo dpkg -i k8sgpt_amd64.deb

  <!---x-release-please-start-version-->
  ```
-  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.26/k8sgpt_386.apk
+  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.19/k8sgpt_386.apk
  apk add --allow-untrusted k8sgpt_386.apk
  ```
  <!---x-release-please-end-->
@@ -118,7 +118,7 @@ sudo dpkg -i k8sgpt_amd64.deb

  <!---x-release-please-start-version-->
  ```
-  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.26/k8sgpt_amd64.apk
+  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.19/k8sgpt_amd64.apk
  apk add --allow-untrusted k8sgpt_amd64.apk
  ```
  <!---x-release-please-end-->
@@ -197,7 +197,7 @@ K8sGPT can be integrated with Claude Desktop to provide AI-powered Kubernetes cl
   - The MCP server will be automatically detected

 3. Configure Claude Desktop with the following JSON:
-
+   
  ```json
  {
    "mcpServers": {
@@ -270,14 +270,6 @@ you will be able to write your own analyzers.
 - [x] logAnalyzer
 - [x] storageAnalyzer
 - [x] securityAnalyzer
- [x] CatalogSource
- [x] ClusterCatalog
- [x] ClusterExtension
- [x] ClusterService
- [x] ClusterServiceVersion
- [x] OperatorGroup
- [x] InstallPlan
- [x] Subscription

 ## Examples

@@ -399,26 +391,6 @@ _Serve mode_
 k8sgpt serve
 ```

-_Serve mode with MCP (Model Context Protocol)_
-
-```
-# Enable MCP server on default port 8089
-k8sgpt serve --mcp --mcp-http
-
-# Enable MCP server on custom port
-k8sgpt serve --mcp --mcp-http --mcp-port 8089
-
-# Full serve mode with MCP
-k8sgpt serve --mcp --mcp-http --port 8080 --metrics-port 8081 --mcp-port 8089
-```
-
-The MCP server enables integration with tools like Claude Desktop and other MCP-compatible clients. It runs on port 8089 by default and provides:
- Kubernetes cluster analysis via MCP protocol
- Resource information and health status
- AI-powered issue explanations and recommendations
-
-For Helm chart deployment with MCP support, see the `charts/k8sgpt/values-mcp-example.yaml` file.
-
 _Analysis with serve mode_

 ```
--- a/SUPPORTED_MODELS.md
+++ b/SUPPORTED_MODELS.md
@@ -1,80 +0,0 @@
-# Supported AI Providers and Models in K8sGPT
-
-K8sGPT supports a variety of AI/LLM providers (backends). Some providers have a fixed set of supported models, while others allow you to specify any model supported by the provider.
-
---
-
-## Providers and Supported Models
-
-### OpenAI
- **Model:** User-configurable (any model supported by OpenAI, e.g., `gpt-3.5-turbo`, `gpt-4`, etc.)
-
-### Azure OpenAI
- **Model:** User-configurable (any model deployed in your Azure OpenAI resource)
-
-### LocalAI
- **Model:** User-configurable (default: `llama3`)
-
-### Ollama
- **Model:** User-configurable (default: `llama3`, others can be specified)
-
-### NoOpAI
- **Model:** N/A (no real model, used for testing)
-
-### Cohere
- **Model:** User-configurable (any model supported by Cohere)
-
-### Amazon Bedrock
- **Supported Models:**
-  - anthropic.claude-sonnet-4-20250514-v1:0
-  - us.anthropic.claude-sonnet-4-20250514-v1:0
-  - eu.anthropic.claude-sonnet-4-20250514-v1:0
-  - apac.anthropic.claude-sonnet-4-20250514-v1:0
-  - us.anthropic.claude-3-7-sonnet-20250219-v1:0
-  - eu.anthropic.claude-3-7-sonnet-20250219-v1:0
-  - apac.anthropic.claude-3-7-sonnet-20250219-v1:0
-  - anthropic.claude-3-5-sonnet-20240620-v1:0
-  - us.anthropic.claude-3-5-sonnet-20241022-v2:0
-  - anthropic.claude-v2
-  - anthropic.claude-v1
-  - anthropic.claude-instant-v1
-  - ai21.j2-ultra-v1
-  - ai21.j2-jumbo-instruct
-  - amazon.titan-text-express-v1
-  - amazon.nova-pro-v1:0
-  - eu.amazon.nova-pro-v1:0
-  - us.amazon.nova-pro-v1:0
-  - amazon.nova-lite-v1:0
-  - eu.amazon.nova-lite-v1:0
-  - us.amazon.nova-lite-v1:0
-  - anthropic.claude-3-haiku-20240307-v1:0
-
-> **Note:**
-> If you use an AWS Bedrock inference profile ARN (e.g., `arn:aws:bedrock:us-east-1:<account>:application-inference-profile/<id>`) as the model, you must still provide a valid modelId (e.g., `anthropic.claude-3-sonnet-20240229-v1:0`). K8sGPT will automatically set the required `X-Amzn-Bedrock-Inference-Profile-ARN` header for you when making requests to Bedrock.
-
-### Amazon SageMaker
- **Model:** User-configurable (any model deployed in your SageMaker endpoint)
-
-### Google GenAI
- **Model:** User-configurable (any model supported by Google GenAI, e.g., `gemini-pro`)
-
-### Huggingface
- **Model:** User-configurable (any model supported by Huggingface Inference API)
-
-### Google VertexAI
- **Supported Models:**
-  - gemini-1.0-pro-001
-
-### OCI GenAI
- **Model:** User-configurable (any model supported by OCI GenAI)
-
-### Custom REST
- **Model:** User-configurable (any model your custom REST endpoint supports)
-
-### IBM Watsonx
- **Supported Models:**
-  - ibm/granite-13b-chat-v2
-
---
-
-For more details on configuring each provider and model, refer to the official K8sGPT documentation and the provider's own documentation. 
--- a/charts/k8sgpt/Chart.yaml
+++ b/charts/k8sgpt/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: v0.4.23 #x-release-please-version
+appVersion: v0.3.0 #x-release-please-version
 description: A Helm chart for K8SGPT
 name: k8sgpt
 type: application
--- a/charts/k8sgpt/templates/deployment.yaml
+++ b/charts/k8sgpt/templates/deployment.yaml
@@ -32,13 +32,7 @@ spec:
        image: {{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag | default .Chart.AppVersion }}
        ports:
        - containerPort: 8080
-        {{- if .Values.deployment.mcp.enabled }}
-        - containerPort: {{ .Values.deployment.mcp.port | int }}
-        {{- end }}
-        args: ["serve"
-        {{- if .Values.deployment.mcp.enabled }}, "--mcp", "-v","--mcp-http", "--mcp-port", {{ .Values.deployment.mcp.port | quote }}
-        {{- end }}
-        ]
+        args: ["serve"]
        {{- if .Values.deployment.resources }}
        resources:
        {{- toYaml .Values.deployment.resources | nindent 10 }}
--- a/charts/k8sgpt/templates/service.yaml
+++ b/charts/k8sgpt/templates/service.yaml
@@ -19,9 +19,4 @@ spec:
    - name: metrics
      port: 8081
      targetPort: 8081
-    {{- if .Values.deployment.mcp.enabled }}
-    - name: mcp
-      port: {{ .Values.deployment.mcp.port | int }}
-      targetPort: {{ .Values.deployment.mcp.port | int }}
-    {{- end }}
  type: {{ .Values.service.type }}
--- a/charts/k8sgpt/values-mcp-example.yaml
+++ b/charts/k8sgpt/values-mcp-example.yaml
@@ -1,39 +0,0 @@
-# Example values file to enable MCP (Model Context Protocol) service
-# Copy this file and modify as needed, then use: helm install -f values-mcp-example.yaml
-
-deployment:
-  # Enable MCP server
-  mcp:
-    enabled: true
-    port: "8089"  # Port for MCP server (default: 8089)
-    http: true    # Enable HTTP mode for MCP server
-  
-  # Other deployment settings remain the same
-  image:
-    repository: ghcr.io/k8sgpt-ai/k8sgpt
-    tag: "" # defaults to Chart.appVersion if unspecified
-  imagePullPolicy: Always
-  env:
-    model: "gpt-3.5-turbo"
-    backend: "openai"
-  resources:
-    limits:
-      cpu: "1"
-      memory: "512Mi"
-    requests:
-      cpu: "0.2"
-      memory: "156Mi"
-
-# Service configuration
-service:
-  type: ClusterIP
-  annotations: {}
-
-# Secret configuration for AI backend
-secret:
-  secretKey: "" # base64 encoded OpenAI token
-
-# ServiceMonitor for Prometheus metrics
-serviceMonitor:
-  enabled: false
-  additionalLabels: {}
--- a/charts/k8sgpt/values.yaml
+++ b/charts/k8sgpt/values.yaml
@@ -7,11 +7,6 @@ deployment:
  env:
    model: "gpt-3.5-turbo"
    backend: "openai" # one of: [ openai | llama ]
-  # MCP (Model Context Protocol) server configuration
-  mcp:
-    enabled: false # Enable MCP server
-    port: "8089" # Port for MCP server
-    http: true # Enable HTTP mode for MCP server
  resources:
    limits:
      cpu: "1"
--- a/cmd/serve/serve.go
+++ b/cmd/serve/serve.go
@@ -41,8 +41,6 @@ var (
 	enableMCP   bool
 	mcpPort     string
 	mcpHTTP     bool
-	// filters can be injected into the server (repeatable flag)
-	filters     []string
 )

 var ServeCmd = &cobra.Command{
@@ -210,7 +208,6 @@ var ServeCmd = &cobra.Command{
 			EnableHttp:  enableHttp,
 			Token:       aiProvider.Password,
 			Logger:      logger,
-			Filters:     filters,
 		}
 		go func() {
 			if err := server.ServeMetrics(); err != nil {
@@ -240,6 +237,4 @@ func init() {
 	ServeCmd.Flags().BoolVarP(&enableMCP, "mcp", "", false, "Enable Mission Control Protocol server")
 	ServeCmd.Flags().StringVarP(&mcpPort, "mcp-port", "", "8089", "Port to run the MCP server on")
 	ServeCmd.Flags().BoolVarP(&mcpHTTP, "mcp-http", "", false, "Enable HTTP mode for MCP server")
-	// allow injecting filters into the running server (repeatable)
-	ServeCmd.Flags().StringSliceVar(&filters, "filter", []string{}, "Filter to apply (can be specified multiple times)")
 }
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/term v0.30.0
-	helm.sh/helm/v3 v3.17.4
+	helm.sh/helm/v3 v3.17.3
 	k8s.io/api v0.32.2
 	k8s.io/apimachinery v0.32.2
 	k8s.io/client-go v0.32.2
@@ -47,7 +47,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1
 	github.com/hupe1980/go-huggingface v0.0.15
 	github.com/kyverno/policy-reporter-kyverno-plugin v1.6.4
-	github.com/mark3labs/mcp-go v0.36.0
+	github.com/metoro-io/mcp-golang v0.11.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/oracle/oci-go-sdk/v65 v65.79.0
 	github.com/prometheus/prometheus v0.302.1
@@ -122,7 +122,7 @@ require (
 	github.com/gookit/color v1.5.4 // indirect
 	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
-	github.com/invopop/jsonschema v0.13.0 // indirect
+	github.com/invopop/jsonschema v0.12.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
@@ -140,10 +140,13 @@ require (
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/tidwall/gjson v1.18.0 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/tidwall/sjson v1.2.5 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
@@ -252,7 +255,7 @@ require (
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.7.1 // indirect
+	github.com/spf13/cast v1.7.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
--- a/go.sum
+++ b/go.sum
@@ -1168,8 +1168,8 @@ github.com/imdario/mergo v1.0.1 h1:lFIgOs30GMaV/2+qQ+eEBLbUL6h1YosdohE3ODy4hTs=
 github.com/imdario/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E=
-github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
+github.com/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI=
+github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
 github.com/ionos-cloud/sdk-go/v6 v6.3.2 h1:2mUmrZZz6cPyT9IRX0T8fBLc/7XU/eTxP2Y5tS7/09k=
 github.com/ionos-cloud/sdk-go/v6 v6.3.2/go.mod h1:SXrO9OGyWjd2rZhAhEpdYN6VUAODzzqRdqA9BCviQtI=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -1244,8 +1244,6 @@ github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a
 github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mark3labs/mcp-go v0.36.0 h1:rIZaijrRYPeSbJG8/qNDe0hWlGrCJ7FWHNMz2SQpTis=
-github.com/mark3labs/mcp-go v0.36.0/go.mod h1:T7tUa2jO6MavG+3P25Oy/jR7iCeJPHImCZHRymCn39g=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
@@ -1260,6 +1258,8 @@ github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/metoro-io/mcp-golang v0.11.0 h1:1k+VSE9QaeMTLn0gJ3FgE/DcjsCBsLFnz5eSFbgXUiI=
+github.com/metoro-io/mcp-golang v0.11.0/go.mod h1:ifLP9ZzKpN1UqFWNTpAHOqSvNkMK6b7d1FSZ5Lu0lN0=
 github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
 github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
@@ -1433,8 +1433,8 @@ github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z
 github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
 github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
-github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
-github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
+github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
 github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
@@ -1463,6 +1463,16 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
+github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
+github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
 github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs=
 github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
@@ -1481,8 +1491,6 @@ github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
-github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
-github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -2218,8 +2226,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
 gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
-helm.sh/helm/v3 v3.17.4 h1:GK+vgn9gKCyoH44+f3B5zpA78iH3AK4ywIInDEmmn/g=
-helm.sh/helm/v3 v3.17.4/go.mod h1:+uJKMH/UiMzZQOALR3XUf3BLIoczI2RKKD6bMhPh4G8=
+helm.sh/helm/v3 v3.17.3 h1:3n5rW3D0ArjFl0p4/oWO8IbY/HKaNNwJtOQFdH2AZHg=
+helm.sh/helm/v3 v3.17.3/go.mod h1:+uJKMH/UiMzZQOALR3XUf3BLIoczI2RKKD6bMhPh4G8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/pkg/ai/amazonbedrock.go
+++ b/pkg/ai/amazonbedrock.go
@@ -14,8 +14,6 @@ import (
 	awsconfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/bedrock"
 	"github.com/aws/aws-sdk-go-v2/service/bedrockruntime"
-	"github.com/aws/smithy-go/middleware"
-	smithyhttp "github.com/aws/smithy-go/transport/http"
 )

 const amazonbedrockAIClientName = "amazonbedrock"
@@ -61,54 +59,6 @@ var BEDROCKER_SUPPORTED_REGION = []string{

 var defaultModels = []bedrock_support.BedrockModel{

-	{
-		Name:       "anthropic.claude-sonnet-4-20250514-v1:0",
-		Completion: &bedrock_support.CohereMessagesCompletion{},
-		Response:   &bedrock_support.CohereMessagesResponse{},
-		Config: bedrock_support.BedrockModelConfig{
-			// sensible defaults
-			MaxTokens:   100,
-			Temperature: 0.5,
-			TopP:        0.9,
-			ModelName:   "anthropic.claude-sonnet-4-20250514-v1:0",
-		},
-	},
-	{
-		Name:       "us.anthropic.claude-sonnet-4-20250514-v1:0",
-		Completion: &bedrock_support.CohereMessagesCompletion{},
-		Response:   &bedrock_support.CohereMessagesResponse{},
-		Config: bedrock_support.BedrockModelConfig{
-			// sensible defaults
-			MaxTokens:   100,
-			Temperature: 0.5,
-			TopP:        0.9,
-			ModelName:   "us.anthropic.claude-sonnet-4-20250514-v1:0",
-		},
-	},
-	{
-		Name:       "eu.anthropic.claude-sonnet-4-20250514-v1:0",
-		Completion: &bedrock_support.CohereMessagesCompletion{},
-		Response:   &bedrock_support.CohereMessagesResponse{},
-		Config: bedrock_support.BedrockModelConfig{
-			// sensible defaults
-			MaxTokens:   100,
-			Temperature: 0.5,
-			TopP:        0.9,
-			ModelName:   "eu.anthropic.claude-sonnet-4-20250514-v1:0",
-		},
-	},
-	{
-		Name:       "apac.anthropic.claude-sonnet-4-20250514-v1:0",
-		Completion: &bedrock_support.CohereMessagesCompletion{},
-		Response:   &bedrock_support.CohereMessagesResponse{},
-		Config: bedrock_support.BedrockModelConfig{
-			// sensible defaults
-			MaxTokens:   100,
-			Temperature: 0.5,
-			TopP:        0.9,
-			ModelName:   "apac.anthropic.claude-sonnet-4-20250514-v1:0",
-		},
-	},
 	{
 		Name:       "us.anthropic.claude-3-7-sonnet-20250219-v1:0",
 		Completion: &bedrock_support.CohereMessagesCompletion{},
@@ -133,18 +83,6 @@ var defaultModels = []bedrock_support.BedrockModel{
 			ModelName:   "eu.anthropic.claude-3-7-sonnet-20250219-v1:0",
 		},
 	},
-	{
-		Name:       "apac.anthropic.claude-3-7-sonnet-20250219-v1:0",
-		Completion: &bedrock_support.CohereMessagesCompletion{},
-		Response:   &bedrock_support.CohereMessagesResponse{},
-		Config: bedrock_support.BedrockModelConfig{
-			// sensible defaults
-			MaxTokens:   100,
-			Temperature: 0.5,
-			TopP:        0.9,
-			ModelName:   "apac.anthropic.claude-3-7-sonnet-20250219-v1:0",
-		},
-	},
 	{
 		Name:       "anthropic.claude-3-5-sonnet-20240620-v1:0",
 		Completion: &bedrock_support.CohereMessagesCompletion{},
@@ -458,25 +396,26 @@ func (a *AmazonBedRockClient) Configure(config IAIConfig) error {
 		// Get the inference profile details
 		profile, err := a.getInferenceProfile(context.Background(), modelInput)
 		if err != nil {
+			// Instead of using a fallback model, throw an error
 			return fmt.Errorf("failed to get inference profile: %v", err)
+		} else {
+			// Extract the model ID from the inference profile
+			modelID, err := a.extractModelFromInferenceProfile(profile)
+			if err != nil {
+				return fmt.Errorf("failed to extract model ID from inference profile: %v", err)
+			}
+
+			// Find the model configuration for the extracted model ID
+			foundModel, err := a.getModelFromString(modelID)
+			if err != nil {
+				// Instead of using a fallback model, throw an error
+				return fmt.Errorf("failed to find model configuration for %s: %v", modelID, err)
+			}
+			a.model = foundModel
+
+			// Use the inference profile ARN as the model ID for API calls
+			a.model.Config.ModelName = modelInput
 		}
-		// Extract the model ID from the inference profile
-		modelID, err := a.extractModelFromInferenceProfile(profile)
-		if err != nil {
-			return fmt.Errorf("failed to extract model ID from inference profile: %v", err)
-		}
-		// Find the model configuration for the extracted model ID
-		foundModel, err := a.getModelFromString(modelID)
-		if err != nil {
-			// Instead of failing, use a generic config for completion/response
-			// But still warn user
-			return fmt.Errorf("failed to find model configuration for %s: %v", modelID, err)
-		}
-		// Use the found model config for completion/response, but set ModelName to the profile ARN
-		a.model = foundModel
-		a.model.Config.ModelName = modelInput
-		// Mark that we're using an inference profile
-		// (could add a field if needed)
 	} else {
 		// Regular model ID provided
 		foundModel, err := a.getModelFromString(modelInput)
@@ -561,8 +500,7 @@ func (a *AmazonBedRockClient) GetCompletion(ctx context.Context, prompt string)
 		supportedModels[i] = m.Name
 	}

-	// Allow valid inference profile ARNs as supported models
-	if !bedrock_support.IsModelSupported(a.model.Config.ModelName, supportedModels) && !validateInferenceProfileArn(a.model.Config.ModelName) {
+	if !bedrock_support.IsModelSupported(a.model.Config.ModelName, supportedModels) {
 		return "", fmt.Errorf("model '%s' is not supported.\nSupported models:\n%s", a.model.Config.ModelName, func() string {
 			s := ""
 			for _, m := range supportedModels {
@@ -585,30 +523,8 @@ func (a *AmazonBedRockClient) GetCompletion(ctx context.Context, prompt string)
 		Accept:      aws.String("application/json"),
 	}

-	// Detect if the model name is an inference profile ARN and set the header if so
-	var optFns []func(*bedrockruntime.Options)
-	if validateInferenceProfileArn(a.model.Config.ModelName) {
-		inferenceProfileArn := a.model.Config.ModelName
-		optFns = append(optFns, func(options *bedrockruntime.Options) {
-			options.APIOptions = append(options.APIOptions, func(stack *middleware.Stack) error {
-				return stack.Initialize.Add(middleware.InitializeMiddlewareFunc("InferenceProfileHeader", func(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (out middleware.InitializeOutput, metadata middleware.Metadata, err error) {
-					req, ok := in.Parameters.(*smithyhttp.Request)
-					if ok {
-						req.Header.Set("X-Amzn-Bedrock-Inference-Profile-ARN", inferenceProfileArn)
-					}
-					return next.HandleInitialize(ctx, in)
-				}), middleware.Before)
-			})
-		})
-	}
-
 	// Invoke the model
-	var resp *bedrockruntime.InvokeModelOutput
-	if len(optFns) > 0 {
-		resp, err = a.client.InvokeModel(ctx, params, optFns...)
-	} else {
-		resp, err = a.client.InvokeModel(ctx, params)
-	}
+	resp, err := a.client.InvokeModel(ctx, params)
 	if err != nil {
 		if strings.Contains(err.Error(), "InvalidAccessKeyId") || strings.Contains(err.Error(), "SignatureDoesNotMatch") || strings.Contains(err.Error(), "NoCredentialProviders") {
 			return "", fmt.Errorf("AWS credentials are invalid or missing. Please check your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables or AWS config. Details: %v", err)
--- a/pkg/ai/bedrock_support/completions.go
+++ b/pkg/ai/bedrock_support/completions.go
@@ -88,8 +88,9 @@ func IsModelSupported(modelName string, supportedModels []string) bool {

 // Note: The caller should check model support before calling GetCompletion.
 func (a *AmazonCompletion) GetCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error) {
-	if a == nil || modelConfig.ModelName == "" {
-		return nil, fmt.Errorf("no model name provided to Bedrock completion")
+	// Defensive: if the model is not supported, return an error
+	if a == nil || modelConfig.ModelName == "unsupported-model" {
+		return nil, fmt.Errorf("model %s is not supported", modelConfig.ModelName)
 	}
 	if strings.Contains(modelConfig.ModelName, "nova") {
 		return a.GetNovaCompletion(ctx, prompt, modelConfig)
@@ -112,6 +113,7 @@ func (a *AmazonCompletion) GetDefaultCompletion(ctx context.Context, prompt stri
 		return []byte{}, err
 	}
 	return body, nil
+
 }

 func (a *AmazonCompletion) GetNovaCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error) {
--- a/pkg/ai/bedrock_support/completions_test.go
+++ b/pkg/ai/bedrock_support/completions_test.go
@@ -158,6 +158,21 @@ func TestAmazonCompletion_GetCompletion_Default(t *testing.T) {
 	assert.Equal(t, 0.7, textConfig["topP"])
 }

+func TestAmazonCompletion_GetCompletion_UnsupportedModel(t *testing.T) {
+	completion := &AmazonCompletion{}
+	modelConfig := BedrockModelConfig{
+		MaxTokens:   200,
+		Temperature: 0.5,
+		TopP:        0.7,
+		ModelName:   "unsupported-model",
+	}
+	prompt := "Test prompt"
+
+	_, err := completion.GetCompletion(context.Background(), prompt, modelConfig)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "model unsupported-model is not supported")
+}
+
 func TestAmazonCompletion_GetCompletion_Inference_Profile(t *testing.T) {
 	completion := &AmazonCompletion{}
 	modelConfig := BedrockModelConfig{
--- a/pkg/ai/googlevertexai.go
+++ b/pkg/ai/googlevertexai.go
@@ -61,22 +61,10 @@ var VERTEXAI_SUPPORTED_REGION = []string{
 }

 const (
-	ModelGeminiProV1       = "gemini-1.0-pro-001"    // Retired Model
-	ModelGeminiProV2_5     = "gemini-2.5-pro"        // Latest Stable Model
-	ModelGeminiFlashV2_5   = "gemini-2.5-flash"      // Latest Stable Model
-	ModelGeminiFlashV2     = "gemini-2.0-flash"      // Latest Stable Model
-	ModelGeminiFlashLiteV2 = "gemini-2.0-flash-lite" // Latest Stable Model
-	ModelGeminiProV1_5     = "gemini-1.5-pro-002*"   // Legacy Stable Model
-	ModelGeminiFlashV1_5   = "gemini-1.5-flash-002*" // Legacy Stable Model
+	ModelGeminiProV1 = "gemini-1.0-pro-001"
 )

 var VERTEXAI_MODELS = []string{
-	ModelGeminiProV2_5,
-	ModelGeminiFlashV2_5,
-	ModelGeminiFlashV2,
-	ModelGeminiFlashLiteV2,
-	ModelGeminiProV1_5,
-	ModelGeminiFlashV1_5,
 	ModelGeminiProV1,
 }

--- a/pkg/ai/ocigenai.go
+++ b/pkg/ai/ocigenai.go
@@ -16,32 +16,21 @@ package ai
 import (
 	"context"
 	"errors"
-	"fmt"
 	"github.com/oracle/oci-go-sdk/v65/common"
-	"github.com/oracle/oci-go-sdk/v65/generativeai"
 	"github.com/oracle/oci-go-sdk/v65/generativeaiinference"
-	"reflect"
+	"strings"
 )

 const ociClientName = "oci"

-type ociModelVendor string
-
-const (
-	vendorCohere = "cohere"
-	vendorMeta   = "meta"
-)
-
 type OCIGenAIClient struct {
 	nopCloser

 	client        *generativeaiinference.GenerativeAiInferenceClient
-	model         *generativeai.Model
-	modelID       string
+	model         string
 	compartmentId string
 	temperature   float32
 	topP          float32
-	topK          int32
 	maxTokens     int
 }

@@ -51,10 +40,9 @@ func (c *OCIGenAIClient) GetName() string {

 func (c *OCIGenAIClient) Configure(config IAIConfig) error {
 	config.GetEndpointName()
-	c.modelID = config.GetModel()
+	c.model = config.GetModel()
 	c.temperature = config.GetTemperature()
 	c.topP = config.GetTopP()
-	c.topK = config.GetTopK()
 	c.maxTokens = config.GetMaxTokens()
 	c.compartmentId = config.GetCompartmentId()
 	provider := common.DefaultConfigProvider()
@@ -63,123 +51,47 @@ func (c *OCIGenAIClient) Configure(config IAIConfig) error {
 		return err
 	}
 	c.client = &client
-	model, err := c.getModel(provider)
-	if err != nil {
-		return err
-	}
-	c.model = model
 	return nil
 }

 func (c *OCIGenAIClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-	request := c.newChatRequest(prompt)
-	response, err := c.client.Chat(ctx, request)
+	generateTextRequest := c.newGenerateTextRequest(prompt)
+	generateTextResponse, err := c.client.GenerateText(ctx, generateTextRequest)
 	if err != nil {
 		return "", err
 	}
-	if err != nil {
-		return "", err
-	}
-	return extractGeneratedText(response.ChatResponse)
+	return extractGeneratedText(generateTextResponse.InferenceResponse)
 }

-func (c *OCIGenAIClient) newChatRequest(prompt string) generativeaiinference.ChatRequest {
-	return generativeaiinference.ChatRequest{
-		ChatDetails: generativeaiinference.ChatDetails{
+func (c *OCIGenAIClient) newGenerateTextRequest(prompt string) generativeaiinference.GenerateTextRequest {
+	temperatureF64 := float64(c.temperature)
+	topPF64 := float64(c.topP)
+	return generativeaiinference.GenerateTextRequest{
+		GenerateTextDetails: generativeaiinference.GenerateTextDetails{
 			CompartmentId: &c.compartmentId,
-			ServingMode:   c.getServingMode(),
-			ChatRequest:   c.getChatModelRequest(prompt),
+			ServingMode: generativeaiinference.OnDemandServingMode{
+				ModelId: &c.model,
+			},
+			InferenceRequest: generativeaiinference.CohereLlmInferenceRequest{
+				Prompt:      &prompt,
+				MaxTokens:   &c.maxTokens,
+				Temperature: &temperatureF64,
+				TopP:        &topPF64,
+			},
 		},
 	}
 }

-func (c *OCIGenAIClient) getChatModelRequest(prompt string) generativeaiinference.BaseChatRequest {
-	temperatureF64 := float64(c.temperature)
-	topPF64 := float64(c.topP)
-	topK := int(c.topK)
-
-	switch c.getVendor() {
-	case vendorMeta:
-		messages := []generativeaiinference.Message{
-			generativeaiinference.UserMessage{
-				Content: []generativeaiinference.ChatContent{
-					generativeaiinference.TextContent{
-						Text: &prompt,
-					},
-				},
-			},
-		}
-		// 0 is invalid for Meta vendor type, instead use -1 to disable topK sampling.
-		if topK == 0 {
-			topK = -1
-		}
-		return generativeaiinference.GenericChatRequest{
-			Messages:    messages,
-			TopK:        &topK,
-			TopP:        &topPF64,
-			Temperature: &temperatureF64,
-			MaxTokens:   &c.maxTokens,
-		}
-	default: // Default to cohere
-		return generativeaiinference.CohereChatRequest{
-			Message:     &prompt,
-			MaxTokens:   &c.maxTokens,
-			Temperature: &temperatureF64,
-			TopK:        &topK,
-			TopP:        &topPF64,
-		}
-
+func extractGeneratedText(llmInferenceResponse generativeaiinference.LlmInferenceResponse) (string, error) {
+	response, ok := llmInferenceResponse.(generativeaiinference.CohereLlmInferenceResponse)
+	if !ok {
+		return "", errors.New("failed to extract generated text from backed response")
 	}
-}
-
-func extractGeneratedText(llmInferenceResponse generativeaiinference.BaseChatResponse) (string, error) {
-	switch response := llmInferenceResponse.(type) {
-	case generativeaiinference.GenericChatResponse:
-		if len(response.Choices) > 0 && len(response.Choices[0].Message.GetContent()) > 0 {
-			if content, ok := response.Choices[0].Message.GetContent()[0].(generativeaiinference.TextContent); ok {
-				return *content.Text, nil
-			}
-		}
-		return "", errors.New("no text found in oci response")
-	case generativeaiinference.CohereChatResponse:
-		return *response.Text, nil
-	default:
-		return "", fmt.Errorf("unknown oci response type: %s", reflect.TypeOf(llmInferenceResponse).Name())
-	}
-}
-
-func (c *OCIGenAIClient) getServingMode() generativeaiinference.ServingMode {
-	if c.isBaseModel() {
-		return generativeaiinference.OnDemandServingMode{
-			ModelId: &c.modelID,
+	sb := strings.Builder{}
+	for _, text := range response.GeneratedTexts {
+		if text.Text != nil {
+			sb.WriteString(*text.Text)
 		}
 	}
-	return generativeaiinference.DedicatedServingMode{
-		EndpointId: &c.modelID,
-	}
-}
-
-func (c *OCIGenAIClient) getModel(provider common.ConfigurationProvider) (*generativeai.Model, error) {
-	client, err := generativeai.NewGenerativeAiClientWithConfigurationProvider(provider)
-	if err != nil {
-		return nil, err
-	}
-	response, err := client.GetModel(context.Background(), generativeai.GetModelRequest{
-		ModelId: &c.modelID,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &response.Model, nil
-}
-
-func (c *OCIGenAIClient) isBaseModel() bool {
-	return c.model != nil && c.model.Type == generativeai.ModelTypeBase
-}
-
-func (c *OCIGenAIClient) getVendor() ociModelVendor {
-	if c.model == nil || c.model.Vendor == nil {
-		return ""
-	}
-	return ociModelVendor(*c.model.Vendor)
+	return sb.String(), nil
 }
--- a/pkg/analyzer/analyzer.go
+++ b/pkg/analyzer/analyzer.go
@@ -57,13 +57,6 @@ var additionalAnalyzerMap = map[string]common.IAnalyzer{
 	"HTTPRoute":               HTTPRouteAnalyzer{},
 	"Storage":                 StorageAnalyzer{},
 	"Security":                SecurityAnalyzer{},
-	"ClusterCatalog":          ClusterCatalogAnalyzer{},
-	"ClusterExtension":        ClusterExtensionAnalyzer{},
-	"ClusterServiceVersion":   ClusterServiceVersionAnalyzer{},
-	"Subscription":            SubscriptionAnalyzer{},
-	"InstallPlan":             InstallPlanAnalyzer{},
-	"CatalogSource":           CatalogSourceAnalyzer{},
-	"OperatorGroup":           OperatorGroupAnalyzer{},
 }

 func ListFilters() ([]string, []string, []string) {
--- a/pkg/analyzer/catalogsource.go
+++ b/pkg/analyzer/catalogsource.go
@@ -1,53 +0,0 @@
-package analyzer
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-type CatalogSourceAnalyzer struct{}
-
-var catSrcGVR = schema.GroupVersionResource{
-	Group:    "operators.coreos.com",
-	Version:  "v1alpha1",
-	Resource: "catalogsources",
-}
-
-func (CatalogSourceAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
-	kind := "CatalogSource"
-	if a.Client.GetDynamicClient() == nil {
-		return nil, fmt.Errorf("dynamic client is nil in %s analyzer", kind)
-	}
-
-	list, err := a.Client.GetDynamicClient().
-		Resource(catSrcGVR).Namespace(metav1.NamespaceAll).
-		List(a.Context, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-
-	var results []common.Result
-	for _, item := range list.Items {
-		ns, name := item.GetNamespace(), item.GetName()
-
-		state, _, _ := unstructured.NestedString(item.Object, "status", "connectionState", "lastObservedState")
-		addr, _, _ := unstructured.NestedString(item.Object, "status", "connectionState", "address")
-
-		// Only report if state is present and not READY
-		if state != "" && strings.ToUpper(state) != "READY" {
-			results = append(results, common.Result{
-				Kind: kind,
-				Name: ns + "/" + name,
-				Error: []common.Failure{{
-					Text: fmt.Sprintf("connectionState=%s (address=%s)", state, addr),
-				}},
-			})
-		}
-	}
-	return results, nil
-}
--- a/pkg/analyzer/catalogsource_test.go
+++ b/pkg/analyzer/catalogsource_test.go
@@ -1,107 +0,0 @@
-package analyzer
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	dynamicfake "k8s.io/client-go/dynamic/fake"
-)
-
-func TestCatalogSourceAnalyzer_UnhealthyState_ReturnsResult(t *testing.T) {
-	cs := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1alpha1",
-			"kind":       "CatalogSource",
-			"metadata": map[string]any{
-				"name":      "broken-operators-external",
-				"namespace": "openshift-marketplace",
-			},
-			"status": map[string]any{
-				"connectionState": map[string]any{
-					"lastObservedState": "TRANSIENT_FAILURE",
-					"address":           "not-a-real-host.invalid:50051",
-				},
-			},
-		},
-	}
-
-	listKinds := map[schema.GroupVersionResource]string{
-		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "catalogsources"}: "CatalogSourceList",
-	}
-	scheme := runtime.NewScheme()
-	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, cs)
-
-	a := common.Analyzer{
-		Context: context.TODO(),
-		Client:  &kubernetes.Client{DynamicClient: dc},
-	}
-
-	res, err := (CatalogSourceAnalyzer{}).Analyze(a)
-	if err != nil {
-		t.Fatalf("Analyze error: %v", err)
-	}
-	if len(res) != 1 {
-		t.Fatalf("expected 1 result, got %d", len(res))
-	}
-	if res[0].Kind != "CatalogSource" || !strings.Contains(res[0].Name, "openshift-marketplace/broken-operators-external") {
-		t.Fatalf("unexpected result: %#v", res[0])
-	}
-	if len(res[0].Error) == 0 || !strings.Contains(res[0].Error[0].Text, "TRANSIENT_FAILURE") {
-		t.Fatalf("expected TRANSIENT_FAILURE in message, got %#v", res[0].Error)
-	}
-}
-
-func TestCatalogSourceAnalyzer_HealthyOrNoState_Ignored(t *testing.T) {
-	// One READY (healthy), one with no status at all: both should be ignored.
-	ready := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1alpha1",
-			"kind":       "CatalogSource",
-			"metadata": map[string]any{
-				"name":      "ready-operators",
-				"namespace": "openshift-marketplace",
-			},
-			"status": map[string]any{
-				"connectionState": map[string]any{
-					"lastObservedState": "READY",
-					"address":           "somewhere",
-				},
-			},
-		},
-	}
-	nostate := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1alpha1",
-			"kind":       "CatalogSource",
-			"metadata": map[string]any{
-				"name":      "no-status-operators",
-				"namespace": "openshift-marketplace",
-			},
-		},
-	}
-
-	listKinds := map[schema.GroupVersionResource]string{
-		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "catalogsources"}: "CatalogSourceList",
-	}
-	scheme := runtime.NewScheme()
-	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, ready, nostate)
-
-	a := common.Analyzer{
-		Context: context.TODO(),
-		Client:  &kubernetes.Client{DynamicClient: dc},
-	}
-
-	res, err := (CatalogSourceAnalyzer{}).Analyze(a)
-	if err != nil {
-		t.Fatalf("Analyze error: %v", err)
-	}
-	if len(res) != 0 {
-		t.Fatalf("expected 0 results (healthy/nostate ignored), got %d", len(res))
-	}
-}
--- a/pkg/analyzer/clustercatalog.go
+++ b/pkg/analyzer/clustercatalog.go
@@ -1,161 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package analyzer
-
-import (
-	"fmt"
-	"regexp"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-type ClusterCatalogAnalyzer struct{}
-
-func (ClusterCatalogAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
-
-	kind := "ClusterCatalog"
-
-	AnalyzerErrorsMetric.DeletePartialMatch(map[string]string{
-		"analyzer_name": kind,
-	})
-
-	var clusterCatalogGVR = schema.GroupVersionResource{
-		Group:    "olm.operatorframework.io",
-		Version:  "v1",
-		Resource: "clustercatalogs",
-	}
-	if a.Client == nil {
-		return nil, fmt.Errorf("client is nil in ClusterCatalogAnalyzer")
-	}
-	if a.Client.GetDynamicClient() == nil {
-		return nil, fmt.Errorf("dynamic client is nil in ClusterCatalogAnalyzer")
-	}
-
-	list, err := a.Client.GetDynamicClient().Resource(clusterCatalogGVR).Namespace("").List(a.Context, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-
-	var preAnalysis = map[string]common.PreAnalysis{}
-
-	for _, item := range list.Items {
-		var failures []common.Failure
-		catalog, err := ConvertToClusterCatalog(&item)
-		if err != nil {
-			continue
-		}
-		fmt.Printf("ClusterCatalog: %s | Source: %s\n", catalog.Name, catalog.Spec.Source.Image.Ref)
-		failures, err = ValidateClusterCatalog(failures, catalog)
-		if err != nil {
-			continue
-		}
-
-		if len(failures) > 0 {
-			preAnalysis[catalog.Name] = common.PreAnalysis{
-				Catalog:        *catalog,
-				FailureDetails: failures,
-			}
-			AnalyzerErrorsMetric.WithLabelValues(kind, catalog.Name, "").Set(float64(len(failures)))
-		}
-	}
-
-	for key, value := range preAnalysis {
-		var currentAnalysis = common.Result{
-			Kind:  kind,
-			Name:  key,
-			Error: value.FailureDetails,
-		}
-
-		parent, found := util.GetParent(a.Client, value.Node.ObjectMeta)
-		if found {
-			currentAnalysis.ParentObject = parent
-		}
-		a.Results = append(a.Results, currentAnalysis)
-	}
-
-	return a.Results, err
-}
-
-func ConvertToClusterCatalog(u *unstructured.Unstructured) (*common.ClusterCatalog, error) {
-	var cc common.ClusterCatalog
-	err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, &cc)
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert to ClusterCatalog: %w", err)
-	}
-	return &cc, nil
-}
-
-func addCatalogConditionFailure(failures []common.Failure, catalogName string, catalogCondition metav1.Condition) []common.Failure {
-	failures = append(failures, common.Failure{
-		Text: fmt.Sprintf("OLMv1 ClusterCatalog: %s has condition of type %s, reason %s: %s", catalogName, catalogCondition.Type, catalogCondition.Reason, catalogCondition.Message),
-		Sensitive: []common.Sensitive{
-			{
-				Unmasked: catalogName,
-				Masked:   util.MaskString(catalogName),
-			},
-		},
-	})
-	return failures
-}
-
-func addCatalogFailure(failures []common.Failure, catalogName string, err error) []common.Failure {
-	failures = append(failures, common.Failure{
-		Text: fmt.Sprintf("%s has error: %s", catalogName, err.Error()),
-		Sensitive: []common.Sensitive{
-			{
-				Unmasked: catalogName,
-				Masked:   util.MaskString(catalogName),
-			},
-		},
-	})
-	return failures
-}
-
-func ValidateClusterCatalog(failures []common.Failure, catalog *common.ClusterCatalog) ([]common.Failure, error) {
-	if !isValidImageRef(catalog.Spec.Source.Image.Ref) {
-		failures = addCatalogFailure(failures, catalog.Name, fmt.Errorf("invalid image ref format in spec.source.image.ref: %s", catalog.Spec.Source.Image.Ref))
-	}
-
-	// Check status.resolvedSource.image.ref ends with @sha256:...
-	if catalog.Status.ResolvedSource != nil {
-		if catalog.Status.ResolvedSource.Image.Ref == "" {
-			failures = addCatalogFailure(failures, catalog.Name, fmt.Errorf("missing status.resolvedSource.image.ref"))
-		}
-		if !regexp.MustCompile(`@sha256:[a-f0-9]{64}$`).MatchString(catalog.Status.ResolvedSource.Image.Ref) {
-			failures = addCatalogFailure(failures, catalog.Name, fmt.Errorf("status.resolvedSource.image.ref must end with @sha256:<digest>"))
-		}
-	}
-
-	for _, condition := range catalog.Status.Conditions {
-		if condition.Status != "True" && condition.Type == "Serving" {
-			failures = addCatalogConditionFailure(failures, catalog.Name, condition)
-		}
-		if condition.Type == "Progressing" && condition.Reason != "Succeeded" {
-			failures = addCatalogConditionFailure(failures, catalog.Name, condition)
-		}
-	}
-
-	return failures, nil
-}
-
-// isValidImageRef does a simple regex check to validate image refs
-func isValidImageRef(ref string) bool {
-	pattern := `^([a-zA-Z0-9\-\.]+(?::[0-9]+)?/)?([a-z0-9]+(?:[._\-\/][a-z0-9]+)*)(:[\w][\w.-]{0,127})?(?:@sha256:[a-f0-9]{64})?$`
-	return regexp.MustCompile(pattern).MatchString(ref)
-}
--- a/pkg/analyzer/clustercatalog_test.go
+++ b/pkg/analyzer/clustercatalog_test.go
@@ -1,182 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package analyzer
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"github.com/stretchr/testify/require"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	dynamicfake "k8s.io/client-go/dynamic/fake"
-	"k8s.io/client-go/kubernetes/fake"
-)
-
-func TestClusterCatalogAnalyzer(t *testing.T) {
-	gvr := schema.GroupVersionResource{
-		Group:    "olm.operatorframework.io",
-		Version:  "v1",
-		Resource: "clustercatalogs",
-	}
-
-	scheme := runtime.NewScheme()
-
-	dynamicClient := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(
-		scheme,
-		map[schema.GroupVersionResource]string{
-			gvr: "ClusterCatalogList",
-		},
-		&unstructured.Unstructured{
-			Object: map[string]interface{}{
-				"apiVersion": "olm.operatorframework.io/v1",
-				"kind":       "ClusterCatalog",
-				"metadata": map[string]interface{}{
-					"name": "Valid ClusterCatalog",
-				},
-				"spec": map[string]interface{}{
-					"availabilityMode": "Available",
-					"source": map[string]interface{}{
-						"type": "Image",
-						"image": map[string]interface{}{
-							"ref":                 "registry.redhat.io/redhat/community-operator-index:v4.19",
-							"pollIntervalMinutes": float64(10),
-						},
-					},
-				},
-				"status": map[string]interface{}{
-					"conditions": []interface{}{
-						map[string]interface{}{
-							"type":   "Progressing",
-							"status": "True",
-							"reason": "Succeeded",
-						},
-						map[string]interface{}{
-							"type":   "Serving",
-							"status": "True",
-							"reason": "Available",
-						},
-					},
-				},
-			},
-		},
-		&unstructured.Unstructured{
-			Object: map[string]interface{}{
-				"apiVersion": "olm.operatorframework.io/v1",
-				"kind":       "ClusterCatalog",
-				"metadata": map[string]interface{}{
-					"name": "Invalid availabilityMode",
-				},
-				"spec": map[string]interface{}{
-					"availabilityMode": "test",
-					"source": map[string]interface{}{
-						"type": "Image",
-						"image": map[string]interface{}{
-							"ref":                 "registry.redhat.io/redhat/community-operator-index:v4.19",
-							"pollIntervalMinutes": float64(10),
-						},
-					},
-				},
-				"status": map[string]interface{}{
-					"conditions": []interface{}{
-						map[string]interface{}{
-							"type":   "Progressing",
-							"status": "True",
-							"reason": "Retrying",
-						},
-					},
-				},
-			},
-		},
-		&unstructured.Unstructured{
-			Object: map[string]interface{}{
-				"apiVersion": "olm.operatorframework.io/v1",
-				"kind":       "ClusterCatalog",
-				"metadata": map[string]interface{}{
-					"name": "Invalid pollIntervalMinutes",
-				},
-				"spec": map[string]interface{}{
-					"availabilityMode": "Available",
-					"source": map[string]interface{}{
-						"type": "Image",
-						"image": map[string]interface{}{
-							"ref":                 "registry.redhat.io/redhat/community-operator-index:v4.19",
-							"pollIntervalMinutes": float64(0),
-						},
-					},
-				},
-				"status": map[string]interface{}{
-					"conditions": []interface{}{
-						map[string]interface{}{
-							"type":   "Progressing",
-							"status": "True",
-							"reason": "Retrying",
-						},
-					},
-				},
-			},
-		},
-		&unstructured.Unstructured{
-			Object: map[string]interface{}{
-				"apiVersion": "olm.operatorframework.io/v1",
-				"kind":       "ClusterCatalog",
-				"metadata": map[string]interface{}{
-					"name": "Invalid image reference",
-				},
-				"spec": map[string]interface{}{
-					"availabilityMode": "Available",
-					"source": map[string]interface{}{
-						"type": "Image",
-						"image": map[string]interface{}{
-							"ref":                 "quay.io/test/community-operator-index:v4.19",
-							"pollIntervalMinutes": float64(10),
-						},
-					},
-				},
-				"status": map[string]interface{}{
-					"conditions": []interface{}{
-						map[string]interface{}{
-							"type":   "Progressing",
-							"status": "True",
-							"reason": "Retrying",
-						},
-					},
-				},
-			},
-		},
-	)
-	config := common.Analyzer{
-		Client: &kubernetes.Client{
-			Client:        fake.NewSimpleClientset(),
-			DynamicClient: dynamicClient,
-		},
-		Context:   context.Background(),
-		Namespace: "test",
-	}
-
-	ccAnalyzer := ClusterCatalogAnalyzer{}
-	results, err := ccAnalyzer.Analyze(config)
-	for _, res := range results {
-		fmt.Printf("Result: %s | Failures: %d\n", res.Name, len(res.Error))
-		for _, err := range res.Error {
-			fmt.Printf("  - %s\n", err)
-		}
-	}
-	require.NoError(t, err)
-	require.Equal(t, 3, len(results))
-}
--- a/pkg/analyzer/clusterextension.go
+++ b/pkg/analyzer/clusterextension.go
@@ -1,148 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package analyzer
-
-import (
-	"fmt"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-type ClusterExtensionAnalyzer struct{}
-
-func (ClusterExtensionAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
-
-	kind := "ClusterExtension"
-
-	AnalyzerErrorsMetric.DeletePartialMatch(map[string]string{
-		"analyzer_name": kind,
-	})
-
-	var clusterExtensionGVR = schema.GroupVersionResource{
-		Group:    "olm.operatorframework.io",
-		Version:  "v1",
-		Resource: "clusterextensions",
-	}
-	if a.Client == nil {
-		return nil, fmt.Errorf("client is nil in ClusterExtensionAnalyzer")
-	}
-	if a.Client.GetDynamicClient() == nil {
-		return nil, fmt.Errorf("dynamic client is nil in ClusterExtensionAnalyzer")
-	}
-
-	list, err := a.Client.GetDynamicClient().Resource(clusterExtensionGVR).Namespace("").List(a.Context, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-
-	var preAnalysis = map[string]common.PreAnalysis{}
-
-	for _, item := range list.Items {
-		var failures []common.Failure
-		extension, err := ConvertToClusterExtension(&item)
-		if err != nil {
-			continue
-		}
-		fmt.Printf("ClusterExtension: %s | Source: %s\n", extension.Name, extension.Spec.Source.Catalog.PackageName)
-		failures, err = ValidateClusterExtension(failures, extension)
-		if err != nil {
-			continue
-		}
-
-		if len(failures) > 0 {
-			preAnalysis[extension.Name] = common.PreAnalysis{
-				Extension:      *extension,
-				FailureDetails: failures,
-			}
-			AnalyzerErrorsMetric.WithLabelValues(kind, extension.Name, "").Set(float64(len(failures)))
-		}
-	}
-
-	for key, value := range preAnalysis {
-		var currentAnalysis = common.Result{
-			Kind:  kind,
-			Name:  key,
-			Error: value.FailureDetails,
-		}
-
-		parent, found := util.GetParent(a.Client, value.Node.ObjectMeta)
-		if found {
-			currentAnalysis.ParentObject = parent
-		}
-		a.Results = append(a.Results, currentAnalysis)
-	}
-
-	return a.Results, err
-}
-
-func ConvertToClusterExtension(u *unstructured.Unstructured) (*common.ClusterExtension, error) {
-	var ce common.ClusterExtension
-	err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, &ce)
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert to ClusterExtension: %w", err)
-	}
-	return &ce, nil
-}
-
-func addExtensionConditionFailure(failures []common.Failure, extensionName string, extensionCondition metav1.Condition) []common.Failure {
-	failures = append(failures, common.Failure{
-		Text: fmt.Sprintf("OLMv1 ClusterExtension: %s has condition of type %s, reason %s: %s", extensionName, extensionCondition.Type, extensionCondition.Reason, extensionCondition.Message),
-		Sensitive: []common.Sensitive{
-			{
-				Unmasked: extensionName,
-				Masked:   util.MaskString(extensionName),
-			},
-		},
-	})
-	return failures
-}
-
-func addExtensionFailure(failures []common.Failure, extensionName string, err error) []common.Failure {
-	failures = append(failures, common.Failure{
-		Text: fmt.Sprintf("%s has error: %s", extensionName, err.Error()),
-		Sensitive: []common.Sensitive{
-			{
-				Unmasked: extensionName,
-				Masked:   util.MaskString(extensionName),
-			},
-		},
-	})
-	return failures
-}
-
-func ValidateClusterExtension(failures []common.Failure, extension *common.ClusterExtension) ([]common.Failure, error) {
-	if extension.Spec.Source.Catalog != nil && extension.Spec.Source.Catalog.UpgradeConstraintPolicy != "CatalogProvided" && extension.Spec.Source.Catalog.UpgradeConstraintPolicy != "SelfCertified" {
-		failures = addExtensionFailure(failures, extension.Name, fmt.Errorf("invalid or missing extension.Spec.Source.Catalog.UpgradeConstraintPolicy (expecting 'SelfCertified' or 'CatalogProvided')"))
-	}
-
-	if extension.Spec.Source.SourceType != "Catalog" {
-		failures = addExtensionFailure(failures, extension.Name, fmt.Errorf("invalid or missing spec.source.sourceType (expecting 'Catalog')"))
-	}
-
-	for _, condition := range extension.Status.Conditions {
-		if condition.Status != "True" && condition.Type == "Installed" {
-			failures = addExtensionConditionFailure(failures, extension.Name, condition)
-		}
-		if condition.Type == "Progressing" && condition.Reason != "Succeeded" {
-			failures = addExtensionConditionFailure(failures, extension.Name, condition)
-		}
-	}
-
-	return failures, nil
-}
--- a/pkg/analyzer/clusterextension_test.go
+++ b/pkg/analyzer/clusterextension_test.go
@@ -1,179 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package analyzer
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"github.com/stretchr/testify/require"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	dynamicfake "k8s.io/client-go/dynamic/fake"
-	"k8s.io/client-go/kubernetes/fake"
-)
-
-func TestClusterExtensionAnalyzer(t *testing.T) {
-	gvr := schema.GroupVersionResource{
-		Group:    "olm.operatorframework.io",
-		Version:  "v1",
-		Resource: "clusterextensions",
-	}
-
-	scheme := runtime.NewScheme()
-
-	dynamicClient := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(
-		scheme,
-		map[schema.GroupVersionResource]string{
-			gvr: "ClusterExtensionList",
-		},
-		&unstructured.Unstructured{
-			Object: map[string]interface{}{
-				"apiVersion": "olm.operatorframework.io/v1",
-				"kind":       "ClusterExtension",
-				"metadata": map[string]interface{}{
-					"name": "Valid SelfCertified ClusterExtension",
-				},
-				"spec": map[string]interface{}{
-					"source": map[string]interface{}{
-						"sourceType": "Catalog",
-						"catalog": map[string]interface{}{
-							"upgradeConstraintPolicy": "SelfCertified",
-						},
-					},
-				},
-				"status": map[string]interface{}{
-					"conditions": []interface{}{
-						map[string]interface{}{
-							"type":   "Installed",
-							"status": "True",
-							"reason": "Succeeded",
-						},
-					},
-				},
-			},
-		},
-		&unstructured.Unstructured{
-			Object: map[string]interface{}{
-				"apiVersion": "olm.operatorframework.io/v1",
-				"kind":       "ClusterExtension",
-				"metadata": map[string]interface{}{
-					"name": "Valid CatalogProvided ClusterExtension",
-				},
-				"spec": map[string]interface{}{
-					"source": map[string]interface{}{
-						"sourceType": "Catalog",
-						"catalog": map[string]interface{}{
-							"upgradeConstraintPolicy": "CatalogProvided",
-						},
-					},
-				},
-				"status": map[string]interface{}{
-					"conditions": []interface{}{
-						map[string]interface{}{
-							"type":   "Installed",
-							"status": "True",
-							"reason": "Succeeded",
-						},
-					},
-				},
-			},
-		},
-		&unstructured.Unstructured{
-			Object: map[string]interface{}{
-				"apiVersion": "olm.operatorframework.io/v1",
-				"kind":       "ClusterExtension",
-				"metadata": map[string]interface{}{
-					"name": "Invalid UpgradeConstraintPolicy",
-				},
-				"spec": map[string]interface{}{
-					"source": map[string]interface{}{
-						"sourceType": "Catalog",
-						"catalog": map[string]interface{}{
-							"upgradeConstraintPolicy": "InvalidPolicy",
-						},
-					},
-				},
-				"status": map[string]interface{}{
-					"conditions": []interface{}{
-						map[string]interface{}{
-							"type":   "Progressing",
-							"status": "True",
-							"reason": "Retrying",
-						},
-						map[string]interface{}{
-							"type":   "Installed",
-							"status": "False",
-							"reason": "Failed",
-						},
-					},
-				},
-			},
-		},
-		&unstructured.Unstructured{
-			Object: map[string]interface{}{
-				"apiVersion": "olm.operatorframework.io/v1",
-				"kind":       "ClusterExtension",
-				"metadata": map[string]interface{}{
-					"name": "Invalid SourceType",
-				},
-				"spec": map[string]interface{}{
-					"source": map[string]interface{}{
-						"sourceType": "Git",
-						"catalog": map[string]interface{}{
-							"upgradeConstraintPolicy": "CatalogProvided",
-						},
-					},
-				},
-				"status": map[string]interface{}{
-					"conditions": []interface{}{
-						map[string]interface{}{
-							"type":   "Progressing",
-							"status": "True",
-							"reason": "Retrying",
-						},
-						map[string]interface{}{
-							"type":   "Installed",
-							"status": "False",
-							"reason": "Failed",
-						},
-					},
-				},
-			},
-		},
-	)
-	config := common.Analyzer{
-		Client: &kubernetes.Client{
-			Client:        fake.NewSimpleClientset(),
-			DynamicClient: dynamicClient,
-		},
-		Context:   context.Background(),
-		Namespace: "test",
-	}
-
-	ceAnalyzer := ClusterExtensionAnalyzer{}
-	results, err := ceAnalyzer.Analyze(config)
-	for _, res := range results {
-		fmt.Printf("Result: %s | Failures: %d\n", res.Name, len(res.Error))
-		for _, err := range res.Error {
-			fmt.Printf("  - %s\n", err)
-		}
-	}
-	require.NoError(t, err)
-	require.Equal(t, 2, len(results))
-}
--- a/pkg/analyzer/clusterserviceversion.go
+++ b/pkg/analyzer/clusterserviceversion.go
@@ -1,82 +0,0 @@
-package analyzer
-
-import (
-	"fmt"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-type ClusterServiceVersionAnalyzer struct{}
-
-var csvGVR = schema.GroupVersionResource{
-	Group: "operators.coreos.com", Version: "v1alpha1", Resource: "clusterserviceversions",
-}
-
-func (ClusterServiceVersionAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
-	kind := "ClusterServiceVersion"
-
-	if a.Client.GetDynamicClient() == nil {
-		return nil, fmt.Errorf("dynamic client is nil in %s analyzer", kind)
-	}
-
-	list, err := a.Client.GetDynamicClient().
-		Resource(csvGVR).Namespace(metav1.NamespaceAll).
-		List(a.Context, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-
-	var results []common.Result
-	for _, item := range list.Items {
-		ns := item.GetNamespace()
-		name := item.GetName()
-		phase, _, _ := unstructured.NestedString(item.Object, "status", "phase")
-
-		var failures []common.Failure
-		if phase != "" && phase != "Succeeded" {
-			// Superfície de condições para contexto
-			if conds, _, _ := unstructured.NestedSlice(item.Object, "status", "conditions"); len(conds) > 0 {
-				if msg := pickWorstCondition(conds); msg != "" {
-					failures = append(failures, common.Failure{Text: fmt.Sprintf("phase=%q: %s", phase, msg)})
-				}
-			} else {
-				failures = append(failures, common.Failure{Text: fmt.Sprintf("phase=%q (see status.conditions)", phase)})
-			}
-		}
-
-		if len(failures) > 0 {
-			results = append(results, common.Result{
-				Kind:  kind,
-				Name:  ns + "/" + name,
-				Error: failures,
-			})
-		}
-	}
-	return results, nil
-}
-
-// reaproveitamos o heurístico já usado em outros pontos
-func pickWorstCondition(conds []interface{}) string {
-	for _, c := range conds {
-		m, ok := c.(map[string]any)
-		if !ok {
-			continue
-		}
-		if s, _ := m["status"].(string); s == "True" {
-			continue
-		}
-		r, _ := m["reason"].(string)
-		msg, _ := m["message"].(string)
-		if r == "" && msg == "" {
-			continue
-		}
-		if r != "" && msg != "" {
-			return r + ": " + msg
-		}
-		return r + msg
-	}
-	return ""
-}
--- a/pkg/analyzer/clusterserviceversion_test.go
+++ b/pkg/analyzer/clusterserviceversion_test.go
@@ -1,78 +0,0 @@
-package analyzer
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	dynamicfake "k8s.io/client-go/dynamic/fake"
-)
-
-func TestClusterServiceVersionAnalyzer(t *testing.T) {
-	ok := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1alpha1",
-			"kind":       "ClusterServiceVersion",
-			"metadata": map[string]any{
-				"name":      "ok",
-				"namespace": "ns1",
-			},
-			"status": map[string]any{"phase": "Succeeded"},
-		},
-	}
-
-	bad := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1alpha1",
-			"kind":       "ClusterServiceVersion",
-			"metadata": map[string]any{
-				"name":      "bad",
-				"namespace": "ns1",
-			},
-			"status": map[string]any{
-				"phase": "Failed",
-				// IMPORTANT: conditions must be []interface{}, not []map[string]any
-				"conditions": []interface{}{
-					map[string]any{
-						"status":  "False",
-						"reason":  "ErrorResolving",
-						"message": "missing dep",
-					},
-				},
-			},
-		},
-	}
-
-	listKinds := map[schema.GroupVersionResource]string{
-		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "clusterserviceversions"}: "ClusterServiceVersionList",
-	}
-
-	// Use a non-nil scheme with dynamicfake
-	scheme := runtime.NewScheme()
-	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, ok, bad)
-
-	a := common.Analyzer{
-		Context: context.TODO(),
-		Client:  &kubernetes.Client{DynamicClient: dc},
-	}
-
-	res, err := (ClusterServiceVersionAnalyzer{}).Analyze(a)
-	if err != nil {
-		t.Fatalf("Analyze error: %v", err)
-	}
-
-	if len(res) != 1 {
-		t.Fatalf("expected 1 result, got %d", len(res))
-	}
-	if res[0].Kind != "ClusterServiceVersion" || !strings.Contains(res[0].Name, "ns1/bad") {
-		t.Fatalf("unexpected result: %#v", res[0])
-	}
-	if len(res[0].Error) == 0 || !strings.Contains(res[0].Error[0].Text, "missing dep") {
-		t.Fatalf("expected 'missing dep' in failure, got %#v", res[0].Error)
-	}
-}
--- a/pkg/analyzer/installplan_test.go
+++ b/pkg/analyzer/installplan_test.go
@@ -1,75 +0,0 @@
-package analyzer
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	dynamicfake "k8s.io/client-go/dynamic/fake"
-)
-
-func TestInstallPlanAnalyzer(t *testing.T) {
-	ok := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1alpha1",
-			"kind":       "InstallPlan",
-			"metadata": map[string]any{
-				"name":      "ip-ok",
-				"namespace": "ns1",
-			},
-			"status": map[string]any{"phase": "Complete"},
-		},
-	}
-
-	bad := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1alpha1",
-			"kind":       "InstallPlan",
-			"metadata": map[string]any{
-				"name":      "ip-bad",
-				"namespace": "ns1",
-			},
-			"status": map[string]any{
-				"phase": "Failed",
-				"conditions": []interface{}{
-					map[string]any{
-						"reason":  "ExecutionError",
-						"message": "something went wrong",
-					},
-				},
-			},
-		},
-	}
-
-	listKinds := map[schema.GroupVersionResource]string{
-		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "installplans"}: "InstallPlanList",
-	}
-
-	scheme := runtime.NewScheme()
-	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, ok, bad)
-
-	a := common.Analyzer{
-		Context: context.TODO(),
-		Client:  &kubernetes.Client{DynamicClient: dc},
-	}
-
-	res, err := (InstallPlanAnalyzer{}).Analyze(a)
-	if err != nil {
-		t.Fatalf("Analyze error: %v", err)
-	}
-
-	if len(res) != 1 {
-		t.Fatalf("expected 1 result, got %d", len(res))
-	}
-	if res[0].Kind != "InstallPlan" || !strings.Contains(res[0].Name, "ns1/ip-bad") {
-		t.Fatalf("unexpected result: %#v", res[0])
-	}
-	if len(res[0].Error) == 0 || !strings.Contains(res[0].Error[0].Text, "ExecutionError") {
-		t.Fatalf("expected 'ExecutionError' in failure, got %#v", res[0].Error)
-	}
-}
--- a/pkg/analyzer/instalplan.go
+++ b/pkg/analyzer/instalplan.go
@@ -1,72 +0,0 @@
-package analyzer
-
-import (
-	"fmt"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-type InstallPlanAnalyzer struct{}
-
-var ipGVR = schema.GroupVersionResource{
-	Group: "operators.coreos.com", Version: "v1alpha1", Resource: "installplans",
-}
-
-func (InstallPlanAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
-	kind := "InstallPlan"
-	if a.Client.GetDynamicClient() == nil {
-		return nil, fmt.Errorf("dynamic client is nil in %s analyzer", kind)
-	}
-
-	list, err := a.Client.GetDynamicClient().
-		Resource(ipGVR).Namespace(metav1.NamespaceAll).
-		List(a.Context, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-
-	var results []common.Result
-	for _, item := range list.Items {
-		ns, name := item.GetNamespace(), item.GetName()
-		phase, _, _ := unstructured.NestedString(item.Object, "status", "phase")
-
-		var failures []common.Failure
-		if phase != "" && phase != "Complete" {
-			reason := firstCondStr(&item, "reason")
-			msg := firstCondStr(&item, "message")
-			switch {
-			case reason != "" && msg != "":
-				failures = append(failures, common.Failure{Text: fmt.Sprintf("phase=%q: %s: %s", phase, reason, msg)})
-			case reason != "" || msg != "":
-				failures = append(failures, common.Failure{Text: fmt.Sprintf("phase=%q: %s%s", phase, reason, msg)})
-			default:
-				failures = append(failures, common.Failure{Text: fmt.Sprintf("phase=%q (approval/manual? check status.conditions)", phase)})
-			}
-		}
-
-		if len(failures) > 0 {
-			results = append(results, common.Result{
-				Kind:  kind,
-				Name:  ns + "/" + name,
-				Error: failures,
-			})
-		}
-	}
-	return results, nil
-}
-
-func firstCondStr(u *unstructured.Unstructured, field string) string {
-	conds, _, _ := unstructured.NestedSlice(u.Object, "status", "conditions")
-	if len(conds) == 0 {
-		return ""
-	}
-	m, _ := conds[0].(map[string]any)
-	if m == nil {
-		return ""
-	}
-	v, _ := m[field].(string)
-	return v
-}
--- a/pkg/analyzer/operatorgroup.go
+++ b/pkg/analyzer/operatorgroup.go
@@ -1,46 +0,0 @@
-package analyzer
-
-import (
-	"fmt"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-type OperatorGroupAnalyzer struct{}
-
-var ogGVR = schema.GroupVersionResource{
-	Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups",
-}
-
-func (OperatorGroupAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
-	kind := "OperatorGroup"
-	if a.Client.GetDynamicClient() == nil {
-		return nil, fmt.Errorf("dynamic client is nil in %s analyzer", kind)
-	}
-
-	list, err := a.Client.GetDynamicClient().
-		Resource(ogGVR).Namespace(metav1.NamespaceAll).
-		List(a.Context, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-
-	countByNS := map[string]int{}
-	for _, it := range list.Items {
-		countByNS[it.GetNamespace()]++
-	}
-
-	var results []common.Result
-	for ns, n := range countByNS {
-		if n > 1 {
-			results = append(results, common.Result{
-				Kind:  kind,
-				Name:  ns,
-				Error: []common.Failure{{Text: fmt.Sprintf("%d OperatorGroups in namespace; this can break CSV resolution", n)}},
-			})
-		}
-	}
-	return results, nil
-}
--- a/pkg/analyzer/operatorgroup_test.go
+++ b/pkg/analyzer/operatorgroup_test.go
@@ -1,70 +0,0 @@
-package analyzer
-
-import (
-	"context"
-	"testing"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	dynamicfake "k8s.io/client-go/dynamic/fake"
-)
-
-func TestOperatorGroupAnalyzer(t *testing.T) {
-	og1 := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1",
-			"kind":       "OperatorGroup",
-			"metadata": map[string]any{
-				"name":      "og-1",
-				"namespace": "ns-a",
-			},
-		},
-	}
-	og2 := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1",
-			"kind":       "OperatorGroup",
-			"metadata": map[string]any{
-				"name":      "og-2",
-				"namespace": "ns-a",
-			},
-		},
-	}
-	og3 := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1",
-			"kind":       "OperatorGroup",
-			"metadata": map[string]any{
-				"name":      "og-3",
-				"namespace": "ns-b",
-			},
-		},
-	}
-
-	listKinds := map[schema.GroupVersionResource]string{
-		{Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups"}: "OperatorGroupList",
-	}
-
-	scheme := runtime.NewScheme()
-	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, og1, og2, og3)
-
-	a := common.Analyzer{
-		Context: context.TODO(),
-		Client:  &kubernetes.Client{DynamicClient: dc},
-	}
-
-	res, err := (OperatorGroupAnalyzer{}).Analyze(a)
-	if err != nil {
-		t.Fatalf("Analyze error: %v", err)
-	}
-
-	if len(res) != 1 {
-		t.Fatalf("expected 1 result for ns-a overlap, got %d", len(res))
-	}
-	if res[0].Kind != "OperatorGroup" || res[0].Name != "ns-a" {
-		t.Fatalf("unexpected result: %#v", res[0])
-	}
-}
--- a/pkg/analyzer/subscription.go
+++ b/pkg/analyzer/subscription.go
@@ -1,55 +0,0 @@
-package analyzer
-
-import (
-	"fmt"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-type SubscriptionAnalyzer struct{}
-
-var subGVR = schema.GroupVersionResource{
-	Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions",
-}
-
-func (SubscriptionAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
-	kind := "Subscription"
-	if a.Client.GetDynamicClient() == nil {
-		return nil, fmt.Errorf("dynamic client is nil in %s analyzer", kind)
-	}
-
-	list, err := a.Client.GetDynamicClient().
-		Resource(subGVR).Namespace(metav1.NamespaceAll).
-		List(a.Context, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-
-	var results []common.Result
-	for _, item := range list.Items {
-		ns, name := item.GetNamespace(), item.GetName()
-		state, _, _ := unstructured.NestedString(item.Object, "status", "state")
-		conds, _, _ := unstructured.NestedSlice(item.Object, "status", "conditions")
-
-		var failures []common.Failure
-		if state == "" || state == "UpgradePending" || state == "UpgradeAvailable" {
-			msg := "subscription not at latest"
-			if c := pickWorstCondition(conds); c != "" {
-				msg += "; " + c
-			}
-			failures = append(failures, common.Failure{Text: fmt.Sprintf("state=%q: %s", state, msg)})
-		}
-
-		if len(failures) > 0 {
-			results = append(results, common.Result{
-				Kind:  kind,
-				Name:  ns + "/" + name,
-				Error: failures,
-			})
-		}
-	}
-	return results, nil
-}
--- a/pkg/analyzer/subscription_test.go
+++ b/pkg/analyzer/subscription_test.go
@@ -1,78 +0,0 @@
-package analyzer
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	dynamicfake "k8s.io/client-go/dynamic/fake"
-)
-
-func TestSubscriptionAnalyzer(t *testing.T) {
-	ok := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1alpha1",
-			"kind":       "Subscription",
-			"metadata": map[string]any{
-				"name":      "ok-sub",
-				"namespace": "ns1",
-			},
-			"status": map[string]any{
-				"state": "AtLatestKnown",
-			},
-		},
-	}
-
-	bad := &unstructured.Unstructured{
-		Object: map[string]any{
-			"apiVersion": "operators.coreos.com/v1alpha1",
-			"kind":       "Subscription",
-			"metadata": map[string]any{
-				"name":      "upgrade-sub",
-				"namespace": "ns1",
-			},
-			"status": map[string]any{
-				"state": "UpgradeAvailable",
-				"conditions": []interface{}{
-					map[string]any{
-						"status":  "False",
-						"reason":  "CatalogSourcesUnhealthy",
-						"message": "not reachable",
-					},
-				},
-			},
-		},
-	}
-
-	listKinds := map[schema.GroupVersionResource]string{
-		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions"}: "SubscriptionList",
-	}
-
-	scheme := runtime.NewScheme()
-	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, ok, bad)
-
-	a := common.Analyzer{
-		Context: context.TODO(),
-		Client:  &kubernetes.Client{DynamicClient: dc},
-	}
-
-	res, err := (SubscriptionAnalyzer{}).Analyze(a)
-	if err != nil {
-		t.Fatalf("Analyze error: %v", err)
-	}
-
-	if len(res) != 1 {
-		t.Fatalf("expected 1 result, got %d", len(res))
-	}
-	if res[0].Kind != "Subscription" || !strings.Contains(res[0].Name, "ns1/upgrade-sub") {
-		t.Fatalf("unexpected result: %#v", res[0])
-	}
-	if len(res[0].Error) == 0 || !strings.Contains(res[0].Error[0].Text, "CatalogSourcesUnhealthy") {
-		t.Fatalf("expected 'CatalogSourcesUnhealthy' in failure, got %#v", res[0].Error)
-	}
-}
--- a/pkg/cache/s3_based.go
+++ b/pkg/cache/s3_based.go
@@ -28,7 +28,7 @@ type S3CacheConfiguration struct {

 func (s *S3Cache) Configure(cacheInfo CacheProvider) error {
 	if cacheInfo.S3.BucketName == "" {
-		return errors.New("bucket name not configured")
+		return errors.New("Bucket name not configured")
 	}
 	s.bucketName = cacheInfo.S3.BucketName

@@ -39,7 +39,7 @@ func (s *S3Cache) Configure(cacheInfo CacheProvider) error {
 		},
 	})
 	if err != nil {
-		return errors.New("failed to create AWS session; please check your AWS credentials and configuration: " + err.Error())
+		return errors.New("Failed to create AWS session. Please check your AWS credentials and configuration: " + err.Error())
 	}
 	if cacheInfo.S3.Endpoint != "" {
 		sess.Config.Endpoint = &cacheInfo.S3.Endpoint
@@ -60,7 +60,7 @@ func (s *S3Cache) Configure(cacheInfo CacheProvider) error {
 	if err != nil {
 		// Check for AWS credentials error
 		if strings.Contains(err.Error(), "InvalidAccessKeyId") || strings.Contains(err.Error(), "SignatureDoesNotMatch") || strings.Contains(err.Error(), "NoCredentialProviders") {
-			return errors.New("aws credentials are invalid or missing; please check your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables or AWS config")
+			return errors.New("AWS credentials are invalid or missing. Please check your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables or AWS config.")
 		}
 		_, err = s3Client.CreateBucket(&s3.CreateBucketInput{
 			Bucket: aws.String(cacheInfo.S3.BucketName),
--- a/pkg/common/types.go
+++ b/pkg/common/types.go
@@ -28,7 +28,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	networkv1 "k8s.io/api/networking/v1"
 	policyv1 "k8s.io/api/policy/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	gtwapi "sigs.k8s.io/gateway-api/apis/v1"
 )

@@ -69,8 +68,6 @@ type PreAnalysis struct {
 	ScaledObject               keda.ScaledObject
 	KyvernoPolicyReport        kyverno.PolicyReport
 	KyvernoClusterPolicyReport kyverno.ClusterPolicyReport
-	Catalog                    ClusterCatalog
-	Extension                  ClusterExtension
 }

 type Result struct {
@@ -96,117 +93,3 @@ type Sensitive struct {
 	Unmasked string
 	Masked   string
 }
-
-type (
-	SourceType                  string
-	AvailabilityMode            string
-	UpgradeConstraintPolicy     string
-	CRDUpgradeSafetyEnforcement string
-)
-
-type ClusterCatalog struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata"`
-	Spec              ClusterCatalogSpec   `json:"spec"`
-	Status            ClusterCatalogStatus `json:"status,omitempty"`
-}
-type ClusterCatalogList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata"`
-	Items           []ClusterCatalog `json:"items"`
-}
-
-type ClusterCatalogSpec struct {
-	Source CatalogSource `json:"source"`
-
-	Priority int32 `json:"priority"`
-
-	AvailabilityMode AvailabilityMode `json:"availabilityMode,omitempty"`
-}
-
-type ClusterCatalogStatus struct {
-	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
-
-	ResolvedSource *ResolvedCatalogSource `json:"resolvedSource,omitempty"`
-
-	URLs         *ClusterCatalogURLs `json:"urls,omitempty"`
-	LastUnpacked *metav1.Time        `json:"lastUnpacked,omitempty"`
-}
-
-type ClusterCatalogURLs struct {
-	Base string `json:"base"`
-}
-type CatalogSource struct {
-	Type  SourceType   `json:"type"`
-	Image *ImageSource `json:"image,omitempty"`
-}
-type ResolvedCatalogSource struct {
-	Type  SourceType           `json:"type"`
-	Image *ResolvedImageSource `json:"image"`
-}
-type ResolvedImageSource struct {
-	Ref string `json:"ref"`
-}
-
-type ImageSource struct {
-	Ref                 string `json:"ref"`
-	PollIntervalMinutes *int   `json:"pollIntervalMinutes,omitempty"`
-}
-
-type ClusterExtension struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              ClusterExtensionSpec   `json:"spec,omitempty"`
-	Status            ClusterExtensionStatus `json:"status,omitempty"`
-}
-
-type ClusterExtensionSpec struct {
-	Namespace      string                         `json:"namespace"`
-	ServiceAccount ServiceAccountReference        `json:"serviceAccount"`
-	Source         SourceConfig                   `json:"source"`
-	Install        *ClusterExtensionInstallConfig `json:"install,omitempty"`
-}
-
-type ClusterExtensionInstallConfig struct {
-	Preflight *PreflightConfig `json:"preflight,omitempty"`
-}
-
-type PreflightConfig struct {
-	CRDUpgradeSafety *CRDUpgradeSafetyPreflightConfig `json:"crdUpgradeSafety"`
-}
-
-type CRDUpgradeSafetyPreflightConfig struct {
-	Enforcement CRDUpgradeSafetyEnforcement `json:"enforcement"`
-}
-
-type ServiceAccountReference struct {
-	Name string `json:"name"`
-}
-
-type SourceConfig struct {
-	SourceType string         `json:"sourceType"`
-	Catalog    *CatalogFilter `json:"catalog,omitempty"`
-}
-
-type CatalogFilter struct {
-	PackageName             string                  `json:"packageName"`
-	Version                 string                  `json:"version,omitempty"`
-	Channels                []string                `json:"channels,omitempty"`
-	Selector                *metav1.LabelSelector   `json:"selector,omitempty"`
-	UpgradeConstraintPolicy UpgradeConstraintPolicy `json:"upgradeConstraintPolicy,omitempty"`
-}
-
-type ClusterExtensionStatus struct {
-	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
-
-	Install *ClusterExtensionInstallStatus `json:"install,omitempty"`
-}
-
-type ClusterExtensionInstallStatus struct {
-	Bundle BundleMetadata `json:"bundle"`
-}
-
-type BundleMetadata struct {
-	Name    string `json:"name"`
-	Version string `json:"version"`
-}
--- a/pkg/kubernetes/kubernetes.go
+++ b/pkg/kubernetes/kubernetes.go
@@ -14,7 +14,6 @@ limitations under the License.
 package kubernetes

 import (
-	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
 	"k8s.io/client-go/rest"
@@ -34,10 +33,6 @@ func (c *Client) GetCtrlClient() ctrl.Client {
 	return c.CtrlClient
 }

-func (c *Client) GetDynamicClient() dynamic.Interface {
-	return c.DynamicClient
-}
-
 func NewClient(kubecontext string, kubeconfig string) (*Client, error) {
 	var config *rest.Config
 	config, err := rest.InClusterConfig()
@@ -74,16 +69,10 @@ func NewClient(kubecontext string, kubeconfig string) (*Client, error) {
 		return nil, err
 	}

-	dynamicClient, err := dynamic.NewForConfig(config)
-	if err != nil {
-		return nil, err
-	}
-
 	return &Client{
 		Client:        clientSet,
 		CtrlClient:    ctrlClient,
 		Config:        config,
 		ServerVersion: serverVersion,
-		DynamicClient: dynamicClient,
 	}, nil
 }
--- a/pkg/kubernetes/types.go
+++ b/pkg/kubernetes/types.go
@@ -4,7 +4,6 @@ import (
 	openapi_v2 "github.com/google/gnostic/openapiv2"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/version"
-	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -15,7 +14,6 @@ type Client struct {
 	CtrlClient    ctrl.Client
 	Config        *rest.Config
 	ServerVersion *version.Info
-	DynamicClient dynamic.Interface
 }

 type K8sApiReference struct {
--- a/pkg/server/client_example/main.go
+++ b/pkg/server/client_example/main.go
@@ -40,20 +40,12 @@ type AnalyzeRequest struct {
 	WithStats       bool     `json:"withStats,omitempty"`
 }

-// JSONRPCResponse represents the JSON-RPC response format
-type JSONRPCResponse struct {
-	JSONRPC string `json:"jsonrpc"`
-	ID      int    `json:"id"`
-	Result  struct {
-		Content []struct {
-			Text string `json:"text"`
-			Type string `json:"type"`
-		} `json:"content"`
-	} `json:"result,omitempty"`
-	Error *struct {
-		Code    int    `json:"code"`
-		Message string `json:"message"`
-	} `json:"error,omitempty"`
+// AnalyzeResponse represents the output of the analyze tool
+type AnalyzeResponse struct {
+	Content []struct {
+		Text string `json:"text"`
+		Type string `json:"type"`
+	} `json:"content"`
 }

 func main() {
@@ -73,89 +65,23 @@ func main() {
 		MaxConcurrency: 10,
 	}

-	// Note: req is now used directly in the JSON-RPC request
+	// Convert request to JSON
+	reqJSON, err := json.Marshal(req)
+	if err != nil {
+		log.Fatalf("Failed to marshal request: %v", err)
+	}

 	// Create HTTP client with timeout
 	client := &http.Client{
 		Timeout: 5 * time.Minute,
 	}

-	// First, initialize the session
-	initRequest := map[string]interface{}{
-		"jsonrpc": "2.0",
-		"id":      1,
-		"method":  "initialize",
-		"params": map[string]interface{}{
-			"protocolVersion": "2025-03-26",
-			"capabilities": map[string]interface{}{
-				"tools":     map[string]interface{}{},
-				"resources": map[string]interface{}{},
-				"prompts":   map[string]interface{}{},
-			},
-			"clientInfo": map[string]interface{}{
-				"name":    "k8sgpt-client",
-				"version": "1.0.0",
-			},
-		},
-	}
-
-	initData, err := json.Marshal(initRequest)
-	if err != nil {
-		log.Fatalf("Failed to marshal init request: %v", err)
-	}
-
-	// Send initialization request
-	initResp, err := client.Post(
-		fmt.Sprintf("http://localhost:%s/mcp", *serverPort),
-		"application/json",
-		bytes.NewBuffer(initData),
-	)
-	if err != nil {
-		log.Fatalf("Failed to send init request: %v", err)
-	}
-	defer func() {
-		if err := initResp.Body.Close(); err != nil {
-			log.Printf("Error closing init response body: %v", err)
-		}
-	}()
-
-	// Extract session ID from response headers
-	sessionID := initResp.Header.Get("Mcp-Session-Id")
-	if sessionID == "" {
-		log.Println("Warning: No session ID received from server")
-	}
-
-	// Create JSON-RPC request for analyze
-	jsonRPCRequest := map[string]interface{}{
-		"jsonrpc": "2.0",
-		"id":      2,
-		"method":  "tools/call",
-		"params": map[string]interface{}{
-			"name":      "analyze",
-			"arguments": req,
-		},
-	}
-
-	// Convert to JSON
-	jsonRPCData, err := json.Marshal(jsonRPCRequest)
-	if err != nil {
-		log.Fatalf("Failed to marshal JSON-RPC request: %v", err)
-	}
-
-	// Create request with session ID if available
-	httpReq, err := http.NewRequest("POST", fmt.Sprintf("http://localhost:%s/mcp", *serverPort), bytes.NewBuffer(jsonRPCData))
-	if err != nil {
-		log.Fatalf("Failed to create request: %v", err)
-	}
-
-	httpReq.Header.Set("Content-Type", "application/json")
-	httpReq.Header.Set("Accept", "application/json,text/event-stream")
-	if sessionID != "" {
-		httpReq.Header.Set("Mcp-Session-Id", sessionID)
-	}
-
 	// Send request to MCP server
-	resp, err := client.Do(httpReq)
+	resp, err := client.Post(
+		fmt.Sprintf("http://localhost:%s/mcp/analyze", *serverPort),
+		"application/json",
+		bytes.NewBuffer(reqJSON),
+	)
 	if err != nil {
 		log.Fatalf("Failed to send request: %v", err)
 	}
@@ -173,17 +99,15 @@ func main() {
 	fmt.Printf("Raw response: %s\n", string(body))

 	// Parse response
-	var jsonRPCResp JSONRPCResponse
-	if err := json.Unmarshal(body, &jsonRPCResp); err != nil {
+	var analyzeResp AnalyzeResponse
+	if err := json.Unmarshal(body, &analyzeResp); err != nil {
 		log.Fatalf("Failed to decode response: %v", err)
 	}

 	// Print results
 	fmt.Println("Analysis Results:")
-	if jsonRPCResp.Error != nil {
-		fmt.Printf("Error: %s (code: %d)\n", jsonRPCResp.Error.Message, jsonRPCResp.Error.Code)
-	} else if len(jsonRPCResp.Result.Content) > 0 {
-		fmt.Println(jsonRPCResp.Result.Content[0].Text)
+	if len(analyzeResp.Content) > 0 {
+		fmt.Println(analyzeResp.Content[0].Text)
 	} else {
 		fmt.Println("No results returned")
 	}
--- a/pkg/server/mcp.go
+++ b/pkg/server/mcp.go
@@ -17,208 +17,89 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"regexp"
+	"net/http"

 	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/analysis"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/server/config"
-	"github.com/mark3labs/mcp-go/mcp"
-	"github.com/mark3labs/mcp-go/server"
+	mcp_golang "github.com/metoro-io/mcp-golang"
+	"github.com/metoro-io/mcp-golang/transport/stdio"
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 )

-// K8sGptMCPServer represents an MCP server for k8sgpt
-type K8sGptMCPServer struct {
-	server      *server.MCPServer
-	port        string
-	aiProvider  *ai.AIProvider
-	useHTTP     bool
-	logger      *zap.Logger
-	httpServer  *server.StreamableHTTPServer
-	stdioServer *server.StdioServer
+// MCPServer represents an MCP server for k8sgpt
+type MCPServer struct {
+	server     *mcp_golang.Server
+	port       string
+	aiProvider *ai.AIProvider
+	useHTTP    bool
+	logger     *zap.Logger
 }

-func NewMCPServer(port string, aiProvider *ai.AIProvider, useHTTP bool, logger *zap.Logger) (*K8sGptMCPServer, error) {
-	opts := []server.ServerOption{
-		server.WithToolCapabilities(true),
-		server.WithResourceCapabilities(true, false),
-		server.WithPromptCapabilities(false),
-	}
+// NewMCPServer creates a new MCP server
+func NewMCPServer(port string, aiProvider *ai.AIProvider, useHTTP bool, logger *zap.Logger) (*MCPServer, error) {
+	// Create MCP server with stdio transport
+	transport := stdio.NewStdioServerTransport()

-	// Create the MCP server
-	mcpServer := server.NewMCPServer("k8sgpt", "1.0.0", opts...)
-	var k8sGptMCPServer = &K8sGptMCPServer{
-		server:     mcpServer,
+	server := mcp_golang.NewServer(transport)
+
+	return &MCPServer{
+		server:     server,
 		port:       port,
 		aiProvider: aiProvider,
 		useHTTP:    useHTTP,
 		logger:     logger,
-	}
-
-	// Register tools and resources immediately
-	if err := k8sGptMCPServer.registerToolsAndResources(); err != nil {
-		return nil, fmt.Errorf("failed to register tools and resources: %v", err)
-	}
-
-	if useHTTP {
-		// Create HTTP server with streamable transport
-		httpOpts := []server.StreamableHTTPOption{
-			server.WithLogger(&zapLoggerAdapter{logger: logger}),
-		}
-
-		httpServer := server.NewStreamableHTTPServer(mcpServer, httpOpts...)
-
-		// Launch the HTTP server directly
-		go func() {
-			logger.Info("Starting MCP HTTP server", zap.String("port", port))
-			if err := httpServer.Start(":" + port); err != nil {
-				logger.Fatal("MCP HTTP server failed", zap.Error(err))
-			}
-		}()
-
-		return &K8sGptMCPServer{
-			server:     mcpServer,
-			port:       port,
-			aiProvider: aiProvider,
-			useHTTP:    useHTTP,
-			logger:     logger,
-			httpServer: httpServer,
-		}, nil
-	} else {
-		// Create stdio server
-		stdioServer := server.NewStdioServer(mcpServer)
-
-		return &K8sGptMCPServer{
-			server:      mcpServer,
-			port:        port,
-			aiProvider:  aiProvider,
-			useHTTP:     useHTTP,
-			logger:      logger,
-			stdioServer: stdioServer,
-		}, nil
-	}
+	}, nil
 }

 // Start starts the MCP server
-func (s *K8sGptMCPServer) Start() error {
+func (s *MCPServer) Start() error {
 	if s.server == nil {
 		return fmt.Errorf("server not initialized")
 	}
-	// Register prompts
-	if err := s.registerPrompts(); err != nil {
-		return fmt.Errorf("failed to register prompts: %v", err)
+
+	// Register analyze tool
+	if err := s.server.RegisterTool("analyze", "Analyze Kubernetes resources", s.handleAnalyze); err != nil {
+		return fmt.Errorf("failed to register analyze tool: %v", err)
 	}
+
+	// Register cluster info tool
+	if err := s.server.RegisterTool("cluster-info", "Get Kubernetes cluster information", s.handleClusterInfo); err != nil {
+		return fmt.Errorf("failed to register cluster-info tool: %v", err)
+	}
+
+	// Register config tool
+	if err := s.server.RegisterTool("config", "Configure K8sGPT settings", s.handleConfig); err != nil {
+		return fmt.Errorf("failed to register config tool: %v", err)
+	}
+
 	// Register resources
 	if err := s.registerResources(); err != nil {
 		return fmt.Errorf("failed to register resources: %v", err)
 	}

-	// Start the server based on transport type
-	if s.useHTTP {
-		// HTTP server is already running in a goroutine
-		return nil
-	} else {
-		// Start stdio server (this will block)
-		return server.ServeStdio(s.server)
+	// Register prompts
+	if err := s.registerPrompts(); err != nil {
+		return fmt.Errorf("failed to register prompts: %v", err)
 	}
-}

-func (s *K8sGptMCPServer) registerToolsAndResources() error {
-	// Register analyze tool with proper JSON schema
-	analyzeTool := mcp.NewTool("analyze",
-		mcp.WithDescription("Analyze Kubernetes resources for issues and problems"),
-		mcp.WithString("namespace",
-			mcp.Description("Kubernetes namespace to analyze (empty for all namespaces)"),
-		),
-		mcp.WithString("backend",
-			mcp.Description("AI backend to use for analysis (e.g., openai, azure, localai)"),
-		),
-		mcp.WithBoolean("explain",
-			mcp.Description("Provide detailed explanations for issues"),
-		),
-		mcp.WithArray("filters",
-			mcp.Description("Provide filters to narrow down the analysis (e.g. ['Pods', 'Deployments'])"),
-			// without below line MCP server fails with Google Agent Development Kit (ADK), interestingly works fine with mcpinspector
-			mcp.WithStringItems(),
-		),
-	)
-	s.server.AddTool(analyzeTool, s.handleAnalyze)
+	if s.useHTTP {
+		// Start HTTP server
+		go func() {
+			http.HandleFunc("/mcp/analyze", s.handleAnalyzeHTTP)
+			http.HandleFunc("/mcp", s.handleSSE)
+			s.logger.Info("Starting MCP server on port", zap.String("port", s.port))
+			if err := http.ListenAndServe(fmt.Sprintf(":%s", s.port), nil); err != nil {
+				s.logger.Error("Error starting HTTP server", zap.Error(err))
+			}
+		}()
+	}

-	// Register cluster info tool (no parameters needed)
-	clusterInfoTool := mcp.NewTool("cluster-info",
-		mcp.WithDescription("Get Kubernetes cluster information and version"),
-	)
-	s.server.AddTool(clusterInfoTool, s.handleClusterInfo)
-
-	// Register config tool with proper JSON schema
-	configTool := mcp.NewTool("config",
-		mcp.WithDescription("Configure K8sGPT settings including custom analyzers and cache"),
-		mcp.WithObject("customAnalyzers",
-			mcp.Description("Custom analyzer configurations"),
-			mcp.Properties(map[string]any{
-				"name": map[string]any{
-					"type":        "string",
-					"description": "Name of the custom analyzer",
-				},
-				"connection": map[string]any{
-					"type": "object",
-					"properties": map[string]any{
-						"url": map[string]any{
-							"type":        "string",
-							"description": "URL of the custom analyzer service",
-						},
-						"port": map[string]any{
-							"type":        "integer",
-							"description": "Port of the custom analyzer service",
-						},
-					},
-				},
-			}),
-		),
-		mcp.WithObject("cache",
-			mcp.Description("Cache configuration"),
-			mcp.Properties(map[string]any{
-				"type": map[string]any{
-					"type":        "string",
-					"description": "Cache type (s3, azure, gcs)",
-					"enum":        []string{"s3", "azure", "gcs"},
-				},
-				"bucketName": map[string]any{
-					"type":        "string",
-					"description": "Bucket name for S3/GCS cache",
-				},
-				"region": map[string]any{
-					"type":        "string",
-					"description": "Region for S3/GCS cache",
-				},
-				"endpoint": map[string]any{
-					"type":        "string",
-					"description": "Custom endpoint for S3 cache",
-				},
-				"insecure": map[string]any{
-					"type":        "boolean",
-					"description": "Use insecure connection for cache",
-				},
-				"storageAccount": map[string]any{
-					"type":        "string",
-					"description": "Storage account for Azure cache",
-				},
-				"containerName": map[string]any{
-					"type":        "string",
-					"description": "Container name for Azure cache",
-				},
-				"projectId": map[string]any{
-					"type":        "string",
-					"description": "Project ID for GCS cache",
-				},
-			}),
-		),
-	)
-	s.server.AddTool(configTool, s.handleConfig)
-	return nil
+	// Start the server
+	return s.server.Serve()
 }

 // AnalyzeRequest represents the input parameters for the analyze tool
@@ -235,7 +116,6 @@ type AnalyzeRequest struct {
 	InteractiveMode bool     `json:"interactiveMode,omitempty"`
 	CustomHeaders   []string `json:"customHeaders,omitempty"`
 	WithStats       bool     `json:"withStats,omitempty"`
-	Anonymize       bool     `json:"anonymize,omitempty"`
 }

 // AnalyzeResponse represents the output of the analyze tool
@@ -283,74 +163,62 @@ type ConfigResponse struct {
 }

 // handleAnalyze handles the analyze tool
-func (s *K8sGptMCPServer) handleAnalyze(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-
-	var req AnalyzeRequest
-	if err := request.BindArguments(&req); err != nil {
-		return mcp.NewToolResultErrorf("Failed to parse request arguments: %v", err), nil
+func (s *MCPServer) handleAnalyze(ctx context.Context, request *AnalyzeRequest) (*mcp_golang.ToolResponse, error) {
+	// Get stored configuration
+	var configAI ai.AIConfiguration
+	if err := viper.UnmarshalKey("ai", &configAI); err != nil {
+		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("Failed to load AI configuration: %v", err))), nil
 	}
-
-	if req.Backend == "" {
-		if s.aiProvider.Name != "" {
-			req.Backend = s.aiProvider.Name
+	// Use stored configuration if not specified in request
+	if request.Backend == "" {
+		if configAI.DefaultProvider != "" {
+			request.Backend = configAI.DefaultProvider
+		} else if len(configAI.Providers) > 0 {
+			request.Backend = configAI.Providers[0].Name
 		} else {
-			req.Backend = "openai" // fallback default
+			request.Backend = "openai" // fallback default
 		}
 	}

+	request.Explain = true
 	// Get stored filters if not specified
-	if len(req.Filters) == 0 {
-		req.Filters = viper.GetStringSlice("active_filters")
+	if len(request.Filters) == 0 {
+		request.Filters = viper.GetStringSlice("active_filters")
 	}

 	// Validate MaxConcurrency to prevent excessive memory allocation
-	req.MaxConcurrency = validateMaxConcurrency(req.MaxConcurrency)
+	request.MaxConcurrency = validateMaxConcurrency(request.MaxConcurrency)

 	// Create a new analysis with the request parameters
 	analysis, err := analysis.NewAnalysis(
-		req.Backend,
-		req.Language,
-		req.Filters,
-		req.Namespace,
-		req.LabelSelector,
-		req.NoCache,
-		req.Explain,
-		req.MaxConcurrency,
-		req.WithDoc,
-		req.InteractiveMode,
-		req.CustomHeaders,
-		req.WithStats,
+		request.Backend,
+		request.Language,
+		request.Filters,
+		request.Namespace,
+		request.LabelSelector,
+		request.NoCache,
+		request.Explain,
+		request.MaxConcurrency,
+		request.WithDoc,
+		request.InteractiveMode,
+		request.CustomHeaders,
+		request.WithStats,
 	)
 	if err != nil {
-		return mcp.NewToolResultErrorf("Failed to create analysis: %v", err), nil
+		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("Failed to create analysis: %v", err))), nil
 	}
 	defer analysis.Close()

 	// Run the analysis
 	analysis.RunAnalysis()
-	if req.Explain {

-		var output string
-		err := analysis.GetAIResults(output, req.Anonymize)
-		if err != nil {
-			return mcp.NewToolResultErrorf("Failed to get results from AI: %v", err), nil
-		}
-
-		// Convert results to JSON string using PrintOutput
-		outputBytes, err := analysis.PrintOutput("text")
-		if err != nil {
-			return mcp.NewToolResultErrorf("Failed to convert results to string: %v", err), nil
-		}
-		plainText := stripANSI(string(outputBytes))
-		return mcp.NewToolResultText(plainText), nil
-	} else {
-		// Get the output
-		output, err := analysis.PrintOutput("json")
-		if err != nil {
-			return mcp.NewToolResultErrorf("Failed to print output: %v", err), nil
-		}
-		return mcp.NewToolResultText(string(output)), nil
+	// Get the output
+	output, err := analysis.PrintOutput("json")
+	if err != nil {
+		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("Failed to print output: %v", err))), nil
 	}
+
+	return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(string(output))), nil
 }

 // validateMaxConcurrency validates and bounds the MaxConcurrency parameter
@@ -365,31 +233,25 @@ func validateMaxConcurrency(maxConcurrency int) int {
 }

 // handleClusterInfo handles the cluster-info tool
-func (s *K8sGptMCPServer) handleClusterInfo(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func (s *MCPServer) handleClusterInfo(ctx context.Context, request *ClusterInfoRequest) (*mcp_golang.ToolResponse, error) {
 	// Create a new Kubernetes client
 	client, err := kubernetes.NewClient("", "")
 	if err != nil {
-		return mcp.NewToolResultErrorf("failed to create Kubernetes client: %v", err), nil
+		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("failed to create Kubernetes client: %v", err))), nil
 	}

 	// Get cluster info from the client
 	version, err := client.Client.Discovery().ServerVersion()
 	if err != nil {
-		return mcp.NewToolResultErrorf("failed to get cluster version: %v", err), nil
+		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("failed to get cluster version: %v", err))), nil
 	}

 	info := fmt.Sprintf("Kubernetes %s", version.GitVersion)
-	return mcp.NewToolResultText(info), nil
+	return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(info)), nil
 }

 // handleConfig handles the config tool
-func (s *K8sGptMCPServer) handleConfig(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	// Parse request arguments
-	var req ConfigRequest
-	if err := request.BindArguments(&req); err != nil {
-		return mcp.NewToolResultErrorf("Failed to parse request arguments: %v", err), nil
-	}
-
+func (s *MCPServer) handleConfig(ctx context.Context, request *ConfigRequest) (*mcp_golang.ToolResponse, error) {
 	// Create a new config handler
 	handler := &config.Handler{}

@@ -399,8 +261,8 @@ func (s *K8sGptMCPServer) handleConfig(ctx context.Context, request mcp.CallTool
 	}

 	// Add custom analyzers if present
-	if len(req.CustomAnalyzers) > 0 {
-		for _, ca := range req.CustomAnalyzers {
+	if len(request.CustomAnalyzers) > 0 {
+		for _, ca := range request.CustomAnalyzers {
 			addConfigReq.CustomAnalyzers = append(addConfigReq.CustomAnalyzers, &schemav1.CustomAnalyzer{
 				Name: ca.Name,
 				Connection: &schemav1.Connection{
@@ -412,31 +274,31 @@ func (s *K8sGptMCPServer) handleConfig(ctx context.Context, request mcp.CallTool
 	}

 	// Add cache configuration if present
-	if req.Cache.Type != "" {
+	if request.Cache.Type != "" {
 		cacheConfig := &schemav1.Cache{}
-		switch req.Cache.Type {
+		switch request.Cache.Type {
 		case "s3":
 			cacheConfig.CacheType = &schemav1.Cache_S3Cache{
 				S3Cache: &schemav1.S3Cache{
-					BucketName: req.Cache.BucketName,
-					Region:     req.Cache.Region,
-					Endpoint:   req.Cache.Endpoint,
-					Insecure:   req.Cache.Insecure,
+					BucketName: request.Cache.BucketName,
+					Region:     request.Cache.Region,
+					Endpoint:   request.Cache.Endpoint,
+					Insecure:   request.Cache.Insecure,
 				},
 			}
 		case "azure":
 			cacheConfig.CacheType = &schemav1.Cache_AzureCache{
 				AzureCache: &schemav1.AzureCache{
-					StorageAccount: req.Cache.StorageAccount,
-					ContainerName:  req.Cache.ContainerName,
+					StorageAccount: request.Cache.StorageAccount,
+					ContainerName:  request.Cache.ContainerName,
 				},
 			}
 		case "gcs":
 			cacheConfig.CacheType = &schemav1.Cache_GcsCache{
 				GcsCache: &schemav1.GCSCache{
-					BucketName: req.Cache.BucketName,
-					Region:     req.Cache.Region,
-					ProjectId:  req.Cache.ProjectId,
+					BucketName: request.Cache.BucketName,
+					Region:     request.Cache.Region,
+					ProjectId:  request.Cache.ProjectId,
 				},
 			}
 		}
@@ -445,30 +307,27 @@ func (s *K8sGptMCPServer) handleConfig(ctx context.Context, request mcp.CallTool

 	// Apply the configuration using the shared function
 	if err := handler.ApplyConfig(ctx, addConfigReq); err != nil {
-		return mcp.NewToolResultErrorf("Failed to add config: %v", err), nil
+		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("Failed to add config: %v", err))), nil
 	}

-	return mcp.NewToolResultText("Successfully added configuration"), nil
+	return mcp_golang.NewToolResponse(mcp_golang.NewTextContent("Successfully added configuration")), nil
 }

 // registerPrompts registers the prompts for the MCP server
-func (s *K8sGptMCPServer) registerPrompts() error {
+func (s *MCPServer) registerPrompts() error {
 	// Register any prompts needed for the MCP server
 	return nil
 }

 // registerResources registers the resources for the MCP server
-func (s *K8sGptMCPServer) registerResources() error {
-	clusterInfoResource := mcp.NewResource("cluster-info", "cluster-info",
-		mcp.WithResourceDescription("Get information about the Kubernetes cluster"),
-		mcp.WithMIMEType("application/json"),
-	)
-
-	s.server.AddResource(clusterInfoResource, s.getClusterInfo)
+func (s *MCPServer) registerResources() error {
+	if err := s.server.RegisterResource("cluster-info", "Get cluster information", "Get information about the Kubernetes cluster", "text", s.getClusterInfo); err != nil {
+		return fmt.Errorf("failed to register cluster-info resource: %v", err)
+	}
 	return nil
 }

-func (s *K8sGptMCPServer) getClusterInfo(ctx context.Context, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
+func (s *MCPServer) getClusterInfo(ctx context.Context) (interface{}, error) {
 	// Create a new Kubernetes client
 	client, err := kubernetes.NewClient("", "")
 	if err != nil {
@@ -481,50 +340,77 @@ func (s *K8sGptMCPServer) getClusterInfo(ctx context.Context, request mcp.ReadRe
 		return nil, fmt.Errorf("failed to get cluster version: %v", err)
 	}

-	data, err := json.Marshal(map[string]string{
+	return map[string]string{
 		"version":    version.String(),
 		"platform":   version.Platform,
 		"gitVersion": version.GitVersion,
-	})
-	if err != nil {
-		return []mcp.ResourceContents{
-			&mcp.TextResourceContents{
-				URI:      "cluster-info",
-				MIMEType: "text/plain",
-				Text:     "Failed to marshal cluster info",
-			},
-		}, nil
-	}
-
-	return []mcp.ResourceContents{
-		&mcp.TextResourceContents{
-			URI:      "cluster-info",
-			MIMEType: "application/json",
-			Text:     string(data),
-		},
 	}, nil
 }

+// handleSSE handles Server-Sent Events for MCP
+func (s *MCPServer) handleSSE(w http.ResponseWriter, r *http.Request) {
+	// Set headers for SSE
+	w.Header().Set("Content-Type", "text/event-stream")
+	w.Header().Set("Cache-Control", "no-cache")
+	w.Header().Set("Connection", "keep-alive")
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+
+	// Create a channel to receive messages
+	msgChan := make(chan string)
+	defer close(msgChan)
+
+	// Start a goroutine to handle the stdio transport
+	go func() {
+		// TODO: Implement message handling between HTTP and stdio transport
+		// This would require implementing a custom transport that bridges HTTP and stdio
+
+	}()
+
+	// Send messages to the client
+	for msg := range msgChan {
+		if _, err := fmt.Fprintf(w, "data: %s\n\n", msg); err != nil {
+			s.logger.Error("Failed to write SSE message", zap.Error(err))
+			return
+		}
+		w.(http.Flusher).Flush()
+	}
+}
+
+// handleAnalyzeHTTP handles HTTP requests for the analyze endpoint
+func (s *MCPServer) handleAnalyzeHTTP(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodPost {
+		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+		return
+	}
+
+	// Parse the request body
+	var req AnalyzeRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		http.Error(w, fmt.Sprintf("Failed to decode request: %v", err), http.StatusBadRequest)
+		return
+	}
+
+	// Validate MaxConcurrency to prevent excessive memory allocation
+	req.MaxConcurrency = validateMaxConcurrency(req.MaxConcurrency)
+
+	// Call the analyze handler
+	resp, err := s.handleAnalyze(r.Context(), &req)
+	if err != nil {
+		http.Error(w, fmt.Sprintf("Failed to analyze: %v", err), http.StatusInternalServerError)
+		return
+	}
+
+	// Set response headers
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+
+	// Write the response
+	if err := json.NewEncoder(w).Encode(resp); err != nil {
+		s.logger.Error("Failed to encode response", zap.Error(err))
+	}
+}
+
 // Close closes the MCP server and releases resources
-func (s *K8sGptMCPServer) Close() error {
+func (s *MCPServer) Close() error {
 	return nil
 }
-
-// zapLoggerAdapter adapts zap.Logger to the interface expected by mark3labs/mcp-go
-type zapLoggerAdapter struct {
-	logger *zap.Logger
-}
-
-func (z *zapLoggerAdapter) Infof(format string, v ...any) {
-	z.logger.Info(fmt.Sprintf(format, v...))
-}
-
-func (z *zapLoggerAdapter) Errorf(format string, v ...any) {
-	z.logger.Error(fmt.Sprintf(format, v...))
-}
-
-// stripANSI removes ANSI escape sequences from a string
-func stripANSI(input string) string {
-	re := regexp.MustCompile(`\x1b\[[0-9;]*m`)
-	return re.ReplaceAllString(input, "")
-}
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -54,8 +54,6 @@ type Config struct {
 	AnalyzeHandler *analyze.Handler
 	QueryHandler   *query.Handler
 	Logger         *zap.Logger
-	// Filters can be injected into the server to limit analysis to specific analyzers
-	Filters        []string
 	metricsServer  *http.Server
 	listener       net.Listener
 	EnableHttp     bool
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -1,15 +1,11 @@
 package server

 import (
-	"bytes"
 	"context"
-	"io"
 	"net"
-	"net/http"
 	"testing"
 	"time"

-	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
@@ -18,12 +14,7 @@ import (

 func TestServe(t *testing.T) {
 	logger, _ := zap.NewDevelopment()
-	defer func() {
-		err := logger.Sync()
-		if err != nil {
-			t.Logf("logger.Sync() error: %v", err)
-		}
-	}()
+	defer logger.Sync()

 	s := &Config{
 		Port:       "50059",
@@ -43,11 +34,7 @@ func TestServe(t *testing.T) {

 	conn, err := grpc.Dial("localhost:50059", grpc.WithInsecure())
 	assert.NoError(t, err, "Should be able to dial the server")
-	defer func() {
-		if err := conn.Close(); err != nil {
-			t.Logf("failed to close connection: %v", err)
-		}
-	}()
+	defer conn.Close()

 	// Test a simple gRPC reflection request
 	cli := grpc_reflection_v1alpha.NewServerReflectionClient(conn)
@@ -62,278 +49,12 @@ func TestServe(t *testing.T) {
 	assert.NoError(t, err, "Shutdown should not return an error")
 }

-// TestMCPServerCreation tests the creation of an MCP server
-func TestMCPServerCreation(t *testing.T) {
-	logger, _ := zap.NewDevelopment()
-	defer func() {
-		err := logger.Sync()
-		if err != nil {
-			t.Logf("logger.Sync() error: %v", err)
-		}
-	}()
-
-	aiProvider := &ai.AIProvider{
-		Name:     "test-provider",
-		Password: "test-password",
-		Model:    "test-model",
-	}
-
-	// Test HTTP mode
-	mcpServer, err := NewMCPServer("8088", aiProvider, true, logger)
-	assert.NoError(t, err, "Should be able to create MCP server with HTTP transport")
-	assert.NotNil(t, mcpServer, "MCP server should not be nil")
-	assert.True(t, mcpServer.useHTTP, "MCP server should be in HTTP mode")
-	assert.Equal(t, "8088", mcpServer.port, "Port should be set correctly")
-
-	// Test stdio mode
-	mcpServerStdio, err := NewMCPServer("8088", aiProvider, false, logger)
-	assert.NoError(t, err, "Should be able to create MCP server with stdio transport")
-	assert.NotNil(t, mcpServerStdio, "MCP server should not be nil")
-	assert.False(t, mcpServerStdio.useHTTP, "MCP server should be in stdio mode")
-}
-
-// TestMCPServerBasicHTTP tests basic HTTP connectivity to the MCP server
-func TestMCPServerBasicHTTP(t *testing.T) {
-	logger, _ := zap.NewDevelopment()
-	defer func() {
-		err := logger.Sync()
-		if err != nil {
-			t.Logf("logger.Sync() error: %v", err)
-		}
-	}()
-
-	aiProvider := &ai.AIProvider{
-		Name:     "test-provider",
-		Password: "test-password",
-		Model:    "test-model",
-	}
-
-	mcpServer, err := NewMCPServer("8091", aiProvider, true, logger)
-	assert.NoError(t, err, "Should be able to create MCP server")
-
-	// For HTTP mode, the server is already started in NewMCPServer
-	// No need to call Start() as it's already running in a goroutine
-
-	// Wait for the server to start
-	err = waitForPort("localhost:8091", 10*time.Second)
-	if err != nil {
-		t.Skipf("MCP server did not start within timeout: %v", err)
-	}
-
-	// First, initialize the session
-	initRequest := `{
-		"jsonrpc": "2.0",
-		"id": 1,
-		"method": "initialize",
-		"params": {
-			"protocolVersion": "2025-03-26",
-			"capabilities": {
-				"tools": {},
-				"resources": {},
-				"prompts": {}
-			},
-			"clientInfo": {
-				"name": "test-client",
-				"version": "1.0.0"
-			}
-		}
-	}`
-
-	initResp, err := http.Post("http://localhost:8091/mcp", "application/json", bytes.NewBufferString(initRequest))
-	if err != nil {
-		t.Logf("Initialize request failed: %v", err)
-		return
-	}
-	defer func() {
-		if err := initResp.Body.Close(); err != nil {
-			t.Logf("Error closing init response body: %v", err)
-		}
-	}()
-
-	// Read initialization response
-	initBody, err := io.ReadAll(initResp.Body)
-	if err != nil {
-		t.Logf("Failed to read init response body: %v", err)
-	} else {
-		t.Logf("Init response status: %d, body: %s", initResp.StatusCode, string(initBody))
-	}
-
-	// Extract session ID from response headers if present
-	sessionID := initResp.Header.Get("Mcp-Session-Id")
-	if sessionID == "" {
-		t.Logf("No session ID in response headers")
-	}
-
-	// Now test tools/list with session ID if available
-	headers := map[string]string{
-		"Content-Type": "application/json",
-		"Accept":       "application/json,text/event-stream",
-	}
-	if sessionID != "" {
-		headers["Mcp-Session-Id"] = sessionID
-	}
-
-	req, err := http.NewRequest("POST", "http://localhost:8091/mcp", bytes.NewBufferString(`{"jsonrpc":"2.0","id":2,"method":"tools/list","params":{}}`))
-	if err != nil {
-		t.Logf("Failed to create request: %v", err)
-		return
-	}
-
-	for key, value := range headers {
-		req.Header.Set(key, value)
-	}
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		t.Logf("MCP endpoint test skipped (server might not be fully ready): %v", err)
-		return
-	}
-	defer func() {
-		err := resp.Body.Close()
-		if err != nil {
-			t.Logf("resp.Body.Close() error: %v", err)
-		}
-	}()
-
-	// Read response body for debugging
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		t.Logf("Failed to read response body: %v", err)
-	} else {
-		t.Logf("Response status: %d, body: %s", resp.StatusCode, string(body))
-	}
-
-	// Accept both 200 and 404 as valid responses (404 means endpoint not implemented)
-	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound {
-		t.Errorf("MCP endpoint returned unexpected status: %d", resp.StatusCode)
-	}
-
-	// Cleanup
-	err = mcpServer.Close()
-	assert.NoError(t, err, "MCP server should close without error")
-}
-
-// TestMCPServerToolCall tests calling a specific tool (analyze) through the MCP server
-func TestMCPServerToolCall(t *testing.T) {
-	logger, _ := zap.NewDevelopment()
-	defer func() {
-		err := logger.Sync()
-		if err != nil {
-			t.Logf("logger.Sync() error: %v", err)
-		}
-	}()
-
-	aiProvider := &ai.AIProvider{
-		Name:     "test-provider",
-		Password: "test-password",
-		Model:    "test-model",
-	}
-
-	mcpServer, err := NewMCPServer("8090", aiProvider, true, logger)
-	assert.NoError(t, err, "Should be able to create MCP server")
-
-	// For HTTP mode, the server is already started in NewMCPServer
-	// No need to call Start() as it's already running in a goroutine
-
-	// Wait for the server to start
-	err = waitForPort("localhost:8090", 10*time.Second)
-	if err != nil {
-		t.Skipf("MCP server did not start within timeout: %v", err)
-	}
-
-	// First, initialize the session
-	initRequest := `{
-		"jsonrpc": "2.0",
-		"id": 1,
-		"method": "initialize",
-		"params": {
-			"protocolVersion": "2025-03-26",
-			"capabilities": {
-				"tools": {},
-				"resources": {},
-				"prompts": {}
-			},
-			"clientInfo": {
-				"name": "test-client",
-				"version": "1.0.0"
-			}
-		}
-	}`
-
-	initResp, err := http.Post("http://localhost:8090/mcp", "application/json", bytes.NewBufferString(initRequest))
-	if err != nil {
-		t.Logf("Initialize request failed: %v", err)
-		return
-	}
-	defer func() {
-		if err := initResp.Body.Close(); err != nil {
-			t.Logf("Error closing init response body: %v", err)
-		}
-	}()
-
-	// Extract session ID from response headers if present
-	sessionID := initResp.Header.Get("Mcp-Session-Id")
-
-	// Test calling the analyze tool with proper JSON-RPC format
-	analyzeRequest := `{
-		"jsonrpc": "2.0",
-		"id": 2,
-		"method": "tools/call",
-		"params": {
-			"name": "analyze",
-			"arguments": {
-				"namespace": "default",
-				"backend": "openai",
-				"language": "english",
-				"explain": true,
-				"maxConcurrency": 10
-			}
-		}
-	}`
-
-	// Create request with session ID if available
-	req, err := http.NewRequest("POST", "http://localhost:8090/mcp", bytes.NewBufferString(analyzeRequest))
-	if err != nil {
-		t.Logf("Failed to create request: %v", err)
-		return
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Accept", "application/json,text/event-stream")
-	if sessionID != "" {
-		req.Header.Set("Mcp-Session-Id", sessionID)
-	}
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		t.Logf("Analyze tool call test skipped (server might not be fully ready): %v", err)
-		return
-	}
-	defer func() {
-		err := resp.Body.Close()
-		if err != nil {
-			t.Logf("resp.Body.Close() error: %v", err)
-		}
-	}()
-
-	// Accept both 200 and 404 as valid responses
-	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound {
-		t.Errorf("Analyze tool call returned unexpected status: %d", resp.StatusCode)
-	}
-
-	// Cleanup
-	err = mcpServer.Close()
-	assert.NoError(t, err, "MCP server should close without error")
-}
-
 func waitForPort(address string, timeout time.Duration) error {
 	start := time.Now()
 	for {
 		conn, err := net.Dial("tcp", address)
 		if err == nil {
-			_ = conn.Close()
+			conn.Close()
 			return nil
 		}
 		if time.Since(start) > timeout {
Author	SHA1	Message	Date
Alex Jones	1bd7cd154a	Merge branch 'main' into chore/aws-creds-errors	2025-06-20 16:10:33 +01:00
AlexsJones	ff5084ba8f	feat: improved AWS creds errors Signed-off-by: AlexsJones <alexsimonjones@gmail.com>	2025-06-20 16:09:55 +01:00
AlexsJones	74a958aefa	feat: added cache purge Signed-off-by: AlexsJones <alexsimonjones@gmail.com>	2025-06-20 15:58:42 +01:00