Skip to content

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

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
Closed
wants to merge 11 commits into from
Closed

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

wants to merge 11 commits into from

Conversation

@harche
Copy link

@harche harche commented Oct 10, 2025 •
edited
Loading

This PR syncs the downstream OpenShift fork with the latest changes from upstream containers/kubernetes-mcp-server.

Upstream changes included:

dependabot bot and others added 9 commits October 7, 2025 10:45
@dependabot
build(deps): bump sigs.k8s.io/controller-runtime from 0.22.1 to 0.22.2 (
028c6b0 
containers#361)

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.22.1 to 0.22.2.
- [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.1...v0.22.2)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-version: 0.22.2
  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
chore(docs): added missing tools to README.md (make update-readme-too…
61eaecc 
…ls) (containers#358)

Signed-off-by: Marc Nuri <[email protected]>
@Cali0707
feat(config): add "disabled" mutli cluster strategy (containers#360)
a056981 
* feat: add 'disabled' ClusterProviderStrategy

Signed-off-by: Calum Murray <[email protected]>

* feat: add --disable-multi-cluster flag

Signed-off-by: Calum Murray <[email protected]>

* test: check that --disable-multi-cluster flag changes config

Signed-off-by: Calum Murray <[email protected]>

* refactor: move flag names to constants

Signed-off-by: Calum Murray <[email protected]>

* fix(test): correct subtest name

Signed-off-by: Calum Murray <[email protected]>

* fix: explicit clusterproviderstrategy is now recommended, instead of advisable

Signed-off-by: Calum Murray <[email protected]>

---------

Signed-off-by: Calum Murray <[email protected]>
@dependabot
build(deps): bump golang.org/x/net from 0.44.0 to 0.45.0 (containers#362
99e9543 
)

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

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.45.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>
@Cali0707
refactor(kubernetes): move provider initialization into factory (cont…
31e90fb 
…ainers#365)

Signed-off-by: Calum Murray <[email protected]>
@dependabot
build(deps): bump golang.org/x/oauth2 from 0.31.0 to 0.32.0 (containe…
3d5fba8 
…rs#366)

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

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-version: 0.32.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/net from 0.45.0 to 0.46.0 (containers#367
3d3eb64 
)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.45.0 to 0.46.0.
- [Commits](golang/net@v0.45.0...v0.46.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.46.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>
@harche
feat(kubernetes): expose AccessControlClientset to enable its usage i…
65cc304 
…n toolsets (containers#364)

Signed-off-by: Harshal Patil <[email protected]>
@harche
Merge remote-tracking branch 'upstream/main' into sync-downstream
bd8d17b
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 10, 2025
@openshift-ci-robot
Copy link

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

In response to this:

This PR syncs the downstream OpenShift fork with the latest changes from upstream containers/kubernetes-mcp-server.

Upstream changes included:

Downstream commits:

  • upstream: Downstream
  • upstream: go mod tidy/vendor

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 bot requested review from ardaguclu and matzew October 10, 2025 08:54
@openshift-ci
Copy link

openshift-ci bot commented Oct 10, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: harche
Once this PR has been reviewed and has the lgtm label, please assign ardaguclu for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@ardaguclu
Copy link
Member

sync PRs must contain the OCP specific changes like in here d94d72d

harche added 2 commits October 14, 2025 15:06
@harche
upstream<carry>: Downstream
264eebd 
OCP-specific files maintained from downstream:
- .ci-operator.yaml
- .snyk
- .tekton/openshift-mcp-server-pull-request.yaml
- .tekton/openshift-mcp-server-push.yaml
- Dockerfile.ci
- Dockerfile.ocp
- Makefile-ocp.mk
- OWNERS
- mcp_config.toml
- renovate.json
@harche
upstream<drop>: go mod tidy/vendor
ec975a0
@openshift-ci
Copy link

openshift-ci bot commented Oct 14, 2025

@harche: 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.

@harche
Copy link
Author

harche commented Oct 14, 2025

sync PRs must contain the OCP specific changes like in here d94d72d

@ardaguclu does this look okay now?

@ardaguclu
Copy link
Member

This #54 supersedes this one
/close

@openshift-ci
Copy link

openshift-ci bot commented Oct 15, 2025

@ardaguclu: Closed this PR.

In response to this:

This #54 supersedes this one
/close

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 bot closed this Oct 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ardaguclu ardaguclu Awaiting requested review from ardaguclu

@matzew matzew Awaiting requested review from matzew

Assignees

No one assigned

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@harche @openshift-ci-robot @ardaguclu @manusa @Cali0707