Merge https://github.com/kubernetes/cloud-provider-vsphere:master (55e3183) into main#118
Conversation
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.27.3 to 2.28.1. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.27.3...v2.28.1) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-version: 2.28.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.49.0 to 0.51.0. - [Commits](golang/net@v0.49.0...v0.51.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.51.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/vmware/govmomi](https://github.com/vmware/govmomi) from 0.52.0 to 0.53.0. - [Release notes](https://github.com/vmware/govmomi/releases) - [Changelog](https://github.com/vmware/govmomi/blob/main/CHANGELOG.md) - [Commits](vmware/govmomi@v0.52.0...v0.53.0) --- updated-dependencies: - dependency-name: github.com/vmware/govmomi dependency-version: 0.53.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…les/master/golang.org/x/net-0.51.0 🌱 (chore): Bump golang.org/x/net from 0.49.0 to 0.51.0
…les/test/e2e/master/github.com/vmware/govmomi-0.53.0 🌱 (chore): Bump github.com/vmware/govmomi from 0.52.0 to 0.53.0 in /test/e2e
…les/hack/tools/master/github.com/onsi/ginkgo/v2-2.28.1 🌱 (chore): Bump github.com/onsi/ginkgo/v2 from 2.27.3 to 2.28.1 in /hack/tools
Signed-off-by: Gong Zhang <gongz@vmware.com>
Fix CVE from go.opentelemetry.io/otel/metric 1.36.0
Signed-off-by: Gong Zhang <gongz@vmware.com>
Update security scan actions
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.51.0 to 0.52.0. - [Commits](golang/net@v0.51.0...v0.52.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.52.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…les/master/golang.org/x/net-0.52.0 🌱 (chore): Bump golang.org/x/net from 0.51.0 to 0.52.0
Signed-off-by: Gong Zhang <gongz@vmware.com>
fix go version in security scan
Signed-off-by: Gong Zhang <gongz@vmware.com>
pin go version to 1.25.8
Signed-off-by: Gong Zhang <gongz@vmware.com>
Bump trivy and go version for security scan and fix
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.47.0 to 0.49.0. - [Commits](golang/crypto@v0.47.0...v0.49.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.49.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…les/test/e2e/master/golang.org/x/crypto-0.49.0 🌱 (chore): Bump golang.org/x/crypto from 0.47.0 to 0.49.0 in /test/e2e
Update vm-operator to a version compatible with the required controller-runtime. This is required to satisfy the HasSyncedChecker interface introduced in client-go v0.36.0-beta.0. vm-operator version is aligned with CAPV. Signed-off-by: Gong Zhang <gongz@vmware.com>
Bump k8s group to v0.36.0-beta.0
Dependabot automatically bumped k8s.io dependencies from v0.35.0-rc.0 to v0.36.0-alpha.0 on master before the release-1.35 branch was cut, causing the release branch to inherit wrong dependency versions. Add ignore rules for k8s.io/* to prevent this: - On master: block semver-minor and semver-major auto-bumps. Patch bumps (e.g. 0.35.1 -> 0.35.1) are still allowed. - On release branches (1.35, 1.34, 1.33): fully ignore k8s.io/* including patch updates. As a Kubernetes core component, cloud-provider-vsphere release branches follow the Kubernetes patch release schedule and k8s dependencies are updated manually.
Bumps the all-github-actions group with 1 update: [azure/setup-helm](https://github.com/azure/setup-helm). Updates `azure/setup-helm` from 4 to 5 - [Release notes](https://github.com/azure/setup-helm/releases) - [Changelog](https://github.com/Azure/setup-helm/blob/main/CHANGELOG.md) - [Commits](Azure/setup-helm@v4...v5) --- updated-dependencies: - dependency-name: azure/setup-helm dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-github-actions ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps the onsi group in /test/e2e with 2 updates: [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) and [github.com/onsi/gomega](https://github.com/onsi/gomega). Updates `github.com/onsi/ginkgo/v2` from 2.27.3 to 2.28.1 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.27.3...v2.28.1) Updates `github.com/onsi/gomega` from 1.38.3 to 1.39.0 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.38.3...v1.39.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-version: 2.28.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: onsi - dependency-name: github.com/onsi/gomega dependency-version: 1.39.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: onsi ... Signed-off-by: dependabot[bot] <support@github.com>
This commit bumps below dependencies: - k8s.io/* to v0.36.0-rc.0 - go.etcd.io/etcd/client/v3 to v3.6.10
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
WalkthroughIntroduce a version-agnostic VM Operator adapter/factory and hub types; refactor CPI components (instances, loadbalancer, zones, vmservice) to use the adapter; add adapters (v1alpha2, v1alpha5, v1alpha6) with fakes/tests; remove legacy vmoperator client code; plus CI, tooling, chart, manifest, and module/version bumps. ChangesVM Operator adapter + CPI wiring (single DAG)
sequenceDiagram
participant CPI as CloudProvider (Initialize)
participant Factory as vmoperator.Factory
participant Adapter as vmoperator.Adapter (v1alpha*)
participant Dyn as dynamic API server
participant VMService as VMService / LoadBalancer
CPI->>Factory: NewAdapter(apiVersion, rest.Config)
Factory->>Adapter: construct adapter instance
Adapter->>Dyn: CRUD / Get / List VirtualMachine(s) and VirtualMachineService(s)
Dyn-->>Adapter: unstructured typed objects
Adapter-->>CPI: hub types (VirtualMachineInfo / VirtualMachineServiceInfo)
CPI->>VMService: NewLoadBalancer/NewInstances/NewZones(vmop.Interface)
VMService->>Adapter: Get/Create/Update VMService using hub types
Adapter->>Dyn: Update/Create unstructured VMService (including dual-stack)
Dyn-->>Adapter: updated object / errors
Adapter-->>VMService: result (hub types) / errors
CI, tooling, and build updates (independent DAG)
Helm, charts, manifests, and release artifacts (independent DAG)
Tests & supporting changes (scattered, same DAG as adapters)
Estimated code review effort🎯 5 (Critical) | ⏱️ ~120 minutes ✨ Finishing Touches🧪 Generate unit tests (beta)
|
|
Hi @cloud-team-rebase-bot[bot]. Thanks for your PR. I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with Regular contributors should join the org to skip this step. Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions 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. |
9cfc1f8 to
a4f88d0
Compare
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.51.0 to 0.52.0. - [Commits](golang/crypto@v0.51.0...v0.52.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.52.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…les/test/e2e/master/golang.org/x/crypto-0.52.0 🌱 (chore): Bump golang.org/x/crypto from 0.51.0 to 0.52.0 in /test/e2e
Update OWNERS according Openshift project needs. Remove upstream OWNERS_ALIASES file, we do not use it at the moment. # Conflicts: # OWNERS_ALIASES # Conflicts: # OWNERS_ALIASES # Conflicts: # OWNERS_ALIASES # Conflicts: # OWNERS_ALIASES # Conflicts: # OWNERS_ALIASES
Added Openshift specific builds scripts, linter/tests/etc runners. Extended makefile with OCP specific targets. Upstream version of lint, and fmt pollutes go.mod and go.sum files, so, own versions of such scripts was introduced.
…ents OCP build system does expect *.assembly.stream.json and build system specific Dockerfile files to be copied into the build container. Remove respective entries from the .dockerignore to satisfy this requirement.
# Conflicts: # .github/workflows/release.yml # Conflicts: # .github/workflows/auto-release-helm-chart.yml # Conflicts: # .github/workflows/auto-release-helm-chart.yml # Conflicts: # .github/workflows/auto-release-helm-chart.yml # Conflicts: # .github/workflows/auto-release-helm-chart.yml # Conflicts: # .github/workflows/auto-release-helm-chart.yml # Conflicts: # .github/workflows/auto-release-helm-chart.yml
…ainer image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-vsphere-cloud-controller-manager.yml
…ainer image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-vsphere-cloud-controller-manager.yml
This change converts the script to not download goimports in favor of using the available binary from the path. This is being implemented to avoid situations where the latest version of goimports clashes with the go language version specified in the go.mod.
…ainer image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/2ea3e6158c93ca104b9d59fd58a71536fa01fb2d/images/ose-vsphere-cloud-controller-manager.yml
…ainer image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-vsphere-cloud-controller-manager.yml
…ainer image to be consistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/3f07d84a47b15417f7743cfc35510788f4bd1ff9/images/ose-vsphere-cloud-controller-manager.yml
…ainer image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-vsphere-cloud-controller-manager.yml
…ainer image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/992b0dc3f0e12d86e7466dadf1eb51b2584a9a83/images/ose-vsphere-cloud-controller-manager.yml
a4f88d0 to
ebd9257
Compare
Summary by CodeRabbit
Chores
New Features
Tests