OCPCLOUD-2745: Merge https://github.com/kubernetes-sigs/cluster-api-provider-azure:v1.17.1 (32cd4c7) into master #320
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![cloud-team-rebase-bot[bot]](https://avatars.githubusercontent.com/u/74064623?s=60&v=4){kind=small}
…gated-role ✨ Add aggregated role support
…-vmss-vm fix: delete Machine instead of AzureMachinePoolMachine if VMSS VM is failed
allow managed clusters for ci-entrypoint
…kubeadm 🌱 Decouple MachinePool reconciler from Kubeadm
Bumps the all-github-actions group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [tj-actions/changed-files](https://github.com/tj-actions/changed-files). Updates `github/codeql-action` from 3.25.10 to 3.25.11 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@23acc5c...b611370) Updates `tj-actions/changed-files` from 44.5.4 to 44.5.5 - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](tj-actions/changed-files@cc3bbb0...cc73385) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-github-actions - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-github-actions ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/github_actions/all-github-actions-ddf03facc1 dependabot(deps): bump the all-github-actions group with 2 updates
fix RBAC upgrade
feat: support OSDisk.DiffDiskPlacement
Use Standard tier SKU for AKS e2e tests
Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.18.0 to 0.19.0. - [Commits](golang/mod@v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: golang.org/x/mod dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps the all-github-actions group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/upload-artifact` from 4.3.3 to 4.3.4 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@6546280...0b2256b) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-github-actions ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/golang.org/x/mod-0.19.0 dependabot(deps): bump golang.org/x/mod from 0.18.0 to 0.19.0
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.24.0 to 0.25.0. - [Commits](golang/crypto@v0.24.0...v0.25.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/github_actions/all-github-actions-a80722a195 dependabot(deps): bump actions/upload-artifact from 4.3.3 to 4.3.4 in the all-github-actions group
…ot/go_modules/golang.org/x/crypto-0.25.0 dependabot(deps): bump golang.org/x/crypto from 0.24.0 to 0.25.0
…ge-fixes Don't reuse windows cnm image if it has os.version set
bump AKS preview API version to 2023-11-02-preview
- use AZURE_FEDERATED_TOKEN_FILE while logging in via wi - overload Azure client ID with Azure workload ID for WI based auth - use auth mode for azure storage commands when using federated identity - SC2086 use unquoted expansion with alt value
- use auth mode for azure storage commands when using federated identity - SC2086 use unquoted expansion with alt value Signed-off-by: James Sturtevant <[email protected]>
… update Scale up/down with MachinePool always updates the VM image model to use. This change sets the VirtualMachineProfile to nil when no change is necessary and ensures therefore less churn on scale up/downs leading to model updates which may require manual fixing Fixes some linting errors related to unnecessary params, too.
…ot/cherry-pick-5164-to-release-1.17 [release-1.17] fix(machinepool): clear VirtualMachineProfile if no model/custom data update
# Conflicts: # .github/workflows/cover.yaml # .github/workflows/release.yaml # Conflicts: # .github/workflows/cover.yaml # .github/workflows/lint-docs.yaml # .github/workflows/release.yaml # OWNERS_ALIASES # Conflicts: # .github/ISSUE_TEMPLATE/bug_report.md # .github/workflows/cover.yaml # .github/workflows/lint-docs.yaml # .github/workflows/release.yaml # OWNERS_ALIASES
This change adds a file to configure the automated snyk security scans.
We currently cannot deploy ASO because it causes a conflict with cluster-capi-operator. Both controllers want to modify CRDs. ASO to the upstream variant and CCAPI to the customized versions with openshift labels.
…er image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/e46de374519839b88099381271ffd16cd1547a34/images/ose-azure-cluster-api-controllers.yml
…er image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-azure-cluster-api-controllers.yml
cloud-team-rebase-bot
bot
changed the title
cloud-team-bot
bot
force-pushed
the
rebase-bot-master
branch
from
fc8b5db to
5dc1a4d
Compare
|
@cloud-team-rebase-bot[bot]: The following test failed, say
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. |
JoelSpeed
changed the title
|
@cloud-team-rebase-bot[bot]: This pull request references OCPCLOUD-2745 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.18.0" version, but no target version was set. In response to this: 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-robot
added
the
jira/valid-reference
|
/hold until #322 merges |
|
/close |
|
PR needs rebase. 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-merge-robot
added
the
needs-rebase
|
@RadekManak: Closed this PR. In response to this:
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. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.