Skip to content

NO-JIRA: Sync downstream with the latest changes in upstream #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 40 commits into from
Sep 25, 2025
Merged

NO-JIRA: Sync downstream with the latest changes in upstream #34

merged 40 commits into from
Sep 25, 2025

Conversation

ardaguclu
Copy link
Member

This PR carries the latest changes in upstream into downstream.

dependabot bot and others added 30 commits September 3, 2025 14:55
@dependabot
build(deps): bump github.com/spf13/cobra from 1.9.1 to 1.10.1 (contai…
406279c 
…ners#299)

Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.9.1 to 1.10.1.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](spf13/cobra@v1.9.1...v1.10.1)

---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
  dependency-version: 1.10.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/mark3labs/mcp-go from 0.38.0 to 0.39.1 (c…
a8b3f54 
…ontainers#300)

Bumps [github.com/mark3labs/mcp-go](https://github.com/mark3labs/mcp-go) from 0.38.0 to 0.39.1.
- [Release notes](https://github.com/mark3labs/mcp-go/releases)
- [Commits](mark3labs/mcp-go@v0.38.0...v0.39.1)

---
updated-dependencies:
- dependency-name: github.com/mark3labs/mcp-go
  dependency-version: 0.39.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/spf13/pflag from 1.0.7 to 1.0.10 (contai…
f2a6b90 
…ners#301)

Bumps [github.com/spf13/pflag](https://github.com/spf13/pflag) from 1.0.7 to 1.0.10.
- [Release notes](https://github.com/spf13/pflag/releases)
- [Commits](spf13/pflag@v1.0.7...v1.0.10)

---
updated-dependencies:
- dependency-name: github.com/spf13/pflag
  dependency-version: 1.0.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump golang.org/x/sync from 0.16.0 to 0.17.0 (containers…
18005a3 
…#303)

Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.16.0 to 0.17.0.
- [Commits](golang/sync@v0.16.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-version: 0.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump golang.org/x/oauth2 from 0.30.0 to 0.31.0 (containe…
6bfa127 
…rs#302)

Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.30.0 to 0.31.0.
- [Commits](golang/oauth2@v0.30.0...v0.31.0)

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-version: 0.31.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump sigs.k8s.io/controller-runtime from 0.22.0 to 0.22.1 (
a690499 
containers#306)

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.22.0 to 0.22.1.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.22.0...v0.22.1)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-version: 0.22.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/spf13/afero from 1.14.0 to 1.15.0 (conta…
36bb0b9 
…iners#307)

Bumps [github.com/spf13/afero](https://github.com/spf13/afero) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/spf13/afero/releases)
- [Commits](spf13/afero@v1.14.0...v1.15.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/afero
  dependency-version: 1.15.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump k8s.io/api from 0.34.0 to 0.34.1 (containers#311)
2503353 
Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.34.0 to 0.34.1.
- [Commits](kubernetes/api@v0.34.0...v0.34.1)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump k8s.io/metrics from 0.34.0 to 0.34.1 (containers#312)
193ac1f 
Bumps [k8s.io/metrics](https://github.com/kubernetes/metrics) from 0.34.0 to 0.34.1.
- [Commits](kubernetes/metrics@v0.34.0...v0.34.1)

---
updated-dependencies:
- dependency-name: k8s.io/metrics
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump k8s.io/cli-runtime from 0.34.0 to 0.34.1 (container…
a8b6041 
…s#314)

Bumps [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) from 0.34.0 to 0.34.1.
- [Commits](kubernetes/cli-runtime@v0.34.0...v0.34.1)

---
updated-dependencies:
- dependency-name: k8s.io/cli-runtime
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump k8s.io/apiextensions-apiserver from 0.34.0 to 0.34.1 (
467e7e6 
containers#317)

Bumps [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) from 0.34.0 to 0.34.1.
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.34.0...v0.34.1)

---
updated-dependencies:
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@manusa
refactor(toolsets): renamed Profile to Toolset (containers#309)
10c82f7 
As a prior step to providing support for toolsets
this change repurposes the current work in profiles
which partially aligns with the toolsets expected features

Signed-off-by: Marc Nuri <[email protected]>
@samuelmasuy
feat(kubernetes): add support for previousPod container logs (contain…
6c573f3 
…ers#256)

Add 'previous' parameter to pods_log tool to retrieve logs from terminated containers, equivalent to kubectl logs --previous functionality.
This enables debugging of containers that have restarted due to crashes or updates.

Signed-off-by: Samuel Masuy <[email protected]>
Co-authored-by: opencode <[email protected]>
@manusa
test(mcp): toolset metadata assertion (containers#318)
ea641e6 
This test ensures that any tool definition refactoring
preserves the current behavior.

Signed-off-by: Marc Nuri <[email protected]>
@dependabot
build(deps): bump github.com/stretchr/testify from 1.10.0 to 1.11.1 (c…
4361a9e 
…ontainers#320)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.10.0 to 1.11.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.10.0...v1.11.1)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-version: 1.11.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@manusa
refactor(mcp): toolset Tools definition is agnostic of MCP impl (cont…
2b6c886 
…ainers#319)

Initial PR to make the toolsets agnostic of the usd MCP implementation (migration to go-sdk).
The decoupling will also be needed to move the different toolsets to separate nested packages (toolsets).

Signed-off-by: Marc Nuri <[email protected]>
@manusa
feat(mcp): toolset definitions completely agnostic from underlying MC…
209e843 
…P impl (containers#322)

Signed-off-by: Marc Nuri <[email protected]>
@dependabot
build(deps): bump github.com/google/jsonschema-go from 0.2.2 to 0.2.3 (…
3fc4fa4 
…containers#324)

Bumps [github.com/google/jsonschema-go](https://github.com/google/jsonschema-go) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/google/jsonschema-go/releases)
- [Commits](google/jsonschema-go@v0.2.2...v0.2.3)

---
updated-dependencies:
- dependency-name: github.com/google/jsonschema-go
  dependency-version: 0.2.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@manusa
feat(toolsets): add support for multiple toolsets in configuration (c…
48cf204 
…ontainers#323)

Users can now enable or disable different toolsets either by providing
a command-line flag or by setting the toolsets array field in the TOML
configuration.

Downstream Kubernetes API developers can declare toolsets for their
APIs by creating a new nested package in pkg/toolsets and registering
it in pkg/mcp/modules.go

Signed-off-by: Marc Nuri <[email protected]>
@manusa
test(toolsets): toolset specific metadata tests (containers#326)
d9d35b9 
- Refactor tests to use testify (more clarity+composability for complex tests)
- Tests for default toolsets
- Tests for configured, granular toolsets

Signed-off-by: Marc Nuri <[email protected]>
@manusa
test(mcp): refactor configuration toolset tests (containers#327)
f496c64 
Signed-off-by: Marc Nuri <[email protected]>
@manusa
test(mcp): refactor events toolset tests (containers#328)
d6936f4 
Signed-off-by: Marc Nuri <[email protected]>
@manusa
test(mcp): remove side-effects from toolsets tests (containers#329)
2bf6c54 
Signed-off-by: Marc Nuri <[email protected]>
@manusa
test(mcp): refactor core toolset tests (namespaces) (containers#330)
e16114d 
Signed-off-by: Marc Nuri <[email protected]>
@manusa
fix(cmd): disable klog in STDIO mode (containers#331)
94baad6 
Prevents protocol issues with some clients.

Kubernetes tooling uses klog to log messages.
Some of these messages end up logged in the stderr or stdout which breaks some of the clients that expect jsonrpc messages.

Signed-off-by: Marc Nuri <[email protected]>
@dependabot
build(deps): bump golang.org/x/net from 0.42.0 to 0.44.0 (containers#332
97236a7 
)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.42.0 to 0.44.0.
- [Commits](golang/net@v0.42.0...v0.44.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.44.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @manusa
build(deps): bump k8s.io/kubectl from 0.33.4 to 0.34.1
22de31d 
Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.33.4 to 0.34.1.
- [Commits](kubernetes/kubectl@v0.33.4...v0.34.1)

---
updated-dependencies:
- dependency-name: k8s.io/kubectl
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@manusa
feat(pods): update metrics to comply with new API
6e29a2a 
Signed-off-by: Marc Nuri <[email protected]>
@dependabot
build(deps): bump helm.sh/helm/v3 from 3.18.6 to 3.19.0 (containers#321)
76e2232 
Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.18.6 to 3.19.0.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.18.6...v3.19.0)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-version: 3.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@manusa
test(mcp): refactor helm toolset tests (containers#333)
8af889b 
Refactor tests to new approach before adding more functionality.

Signed-off-by: Marc Nuri <[email protected]>
manusa and others added 9 commits September 18, 2025 17:11
@manusa
chore(doc): fix cursor link (containers#334)
5b33e1a 
Signed-off-by: Marc Nuri <[email protected]>
@dependabot
build(deps): bump github.com/mark3labs/mcp-go from 0.39.1 to 0.40.0 (c…
2b72f5f 
…ontainers#337)

Bumps [github.com/mark3labs/mcp-go](https://github.com/mark3labs/mcp-go) from 0.39.1 to 0.40.0.
- [Release notes](https://github.com/mark3labs/mcp-go/releases)
- [Commits](mark3labs/mcp-go@v0.39.1...v0.40.0)

---
updated-dependencies:
- dependency-name: github.com/mark3labs/mcp-go
  dependency-version: 0.40.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@sabre1041
feat(container): added non-privileged image user (containers#336)
4c5bce1 
Signed-off-by: Andrew Block <[email protected]>
@dependabot
build(deps): bump github.com/google/jsonschema-go from 0.2.3 to 0.3.0 (…
8e666d4 
…containers#338)

Bumps [github.com/google/jsonschema-go](https://github.com/google/jsonschema-go) from 0.2.3 to 0.3.0.
- [Release notes](https://github.com/google/jsonschema-go/releases)
- [Commits](google/jsonschema-go@v0.2.3...v0.3.0)

---
updated-dependencies:
- dependency-name: github.com/google/jsonschema-go
  dependency-version: 0.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@iamsudip @manusa
feat(pods): add optional tail parameter to pod logs retrieval (contai…
053fb2e 
…ners#335)

* feat(pods): add tailLines parameter to pod logs retrieval with default 256 lines

Signed-off-by: iamsudip <[email protected]>

* address review comments

Signed-off-by: iamsudip <[email protected]>

* test(pods): add tailLines parameter to pod logs retrieval with default 256 lines

Signed-off-by: Marc Nuri <[email protected]>

---------

Signed-off-by: iamsudip <[email protected]>
Signed-off-by: Marc Nuri <[email protected]>
Co-authored-by: Marc Nuri <[email protected]>
@manusa
fix(mcp): InputSchema schema with empty properties for no-arg tools (c…
c69e90c 
…ontainers#341)

Signed-off-by: Marc Nuri <[email protected]>
@ardaguclu
Merge remote-tracking branch 'downstream/main' into sync-downstream
da152bc
@ardaguclu
Upstream<carry>: Add OCP specific configurations
4596773
@ardaguclu
Upstream<drop>: Run go mod vendor
a9608d2
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 25, 2025
@openshift-ci-robot
Copy link

@ardaguclu: This pull request explicitly references no jira issue.

In response to this:

This PR carries the latest changes in upstream into downstream.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 25, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ardaguclu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 25, 2025
@onmete
Copy link

onmete commented Sep 25, 2025

/lgtm

@ardaguclu
Copy link
Member Author

@manusa lint and security failures look real and I think, we need to fix them on upstream. But in order to unblock OLS team, I'll override those jobs for now.
/override ci/prow/lint
/override ci/prow/security

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 25, 2025

@ardaguclu: Overrode contexts on behalf of ardaguclu: ci/prow/lint, ci/prow/security

In response to this:

@manusa lint and security failures look real and I think, we need to fix them on upstream. But in order to unblock OLS team, I'll override those jobs for now.
/override ci/prow/lint
/override ci/prow/security

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 25, 2025

@ardaguclu: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@syedriko
Copy link

/lgtm

@openshift-merge-bot openshift-merge-bot bot merged commit 0959b36 into openshift:main Sep 25, 2025
8 checks passed
@ardaguclu ardaguclu deleted the sync-downstream branch September 25, 2025 14:04
@manusa
Copy link

manusa commented Sep 26, 2025

@manusa lint and security failures look real and I think, we need to fix them on upstream. But in order to unblock OLS team, I'll override those jobs for now. /override ci/prow/lint /override ci/prow/security

I created fixes for both (You already saw)

I forgot to do the follow-up to add linting to the build targets 🤦
We should now be safe upstream by checking the linting in CI.

For the Snyk issues, I'm not 100% sure this should fix the issue since locally I can't make it pass.
AFAIU the security issue is fixed, but there's a false positive.
In case it's still reported, we need to add an ignore rule for the file.
Note that this is an internal script, so it's not something externally distributed (in case there are any concerns about security and the MCP server).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@onmete onmete

@syedriko syedriko

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@ardaguclu @openshift-ci-robot @onmete @syedriko @manusa @samuelmasuy @sabre1041 @iamsudip