Skip to content
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.

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

Update to compute API 2021-11-01 #2288

Merged
merged 2 commits into from
May 9, 2022
Merged

Update to compute API 2021-11-01 #2288

merged 2 commits into from
May 9, 2022

Conversation

invidian
Copy link
Member

@invidian invidian commented May 9, 2022

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Extracting changes which should be easier to merge from #2277.

Release note:

NONE

To allow access to CommunityGalleryImageID field in ImageReference.

Refs #2267

Signed-off-by: Mateusz Gozdek <[email protected]>
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 9, 2022
@jackfrancis
Copy link
Contributor

/test pull-cluster-api-provider-azure-e2e-optional

Copy link
Contributor

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 9, 2022
@CecileRobertMichon
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 9, 2022
@k8s-ci-robot k8s-ci-robot merged commit 4a8e1ae into kubernetes-sigs:main May 9, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone May 9, 2022
@invidian invidian deleted the invidian/update-compute-api-and-fix-typo branch May 9, 2022 21:04
@mboersma
Copy link
Contributor

mboersma commented Jun 7, 2022

/cherry-pick release-1.3

@k8s-infra-cherrypick-robot

@mboersma: new pull request created: #2361

In response to this:

/cherry-pick release-1.3

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/test-infra repository.

@mboersma
Copy link
Contributor

mboersma commented Jun 13, 2022

/cherry-pick release-1.2

According to the proposal at #2295, CAPZ should try to backport fixes to the last two releases. This is a prerequisite to cherry-picking #2357.

Update: Oh well, we tried.

@k8s-infra-cherrypick-robot

@mboersma: #2288 failed to apply on top of branch "release-1.2":

Applying: Update to compute API 2021-11-01
Using index info to reconstruct a base tree...
M	azure/scope/machine.go
M	azure/services/availabilitysets/availabilitysets.go
M	azure/services/roleassignments/roleassignments.go
M	azure/services/roleassignments/roleassignments_test.go
M	azure/services/scalesets/client.go
M	azure/services/scalesets/scalesets.go
M	azure/services/scalesets/scalesets_test.go
A	azure/services/scalesets/vmssextension_spec.go
M	azure/services/scalesetvms/client.go
M	azure/services/virtualmachines/client.go
M	azure/services/virtualmachines/virtualmachines.go
M	azure/services/vmextensions/client.go
A	azure/services/vmextensions/spec.go
M	controllers/azurecluster_reconciler_test.go
A	controllers/azuremachine_reconciler_test.go
A	exp/controllers/azuremachinepool_reconciler_test.go
M	go.mod
M	go.sum
M	test/e2e/azure_logcollector.go
M	test/e2e/azure_privatecluster.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/azure_privatecluster.go
Auto-merging test/e2e/azure_logcollector.go
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (modify/delete): exp/controllers/azuremachinepool_reconciler_test.go deleted in HEAD and modified in Update to compute API 2021-11-01. Version Update to compute API 2021-11-01 of exp/controllers/azuremachinepool_reconciler_test.go left in tree.
CONFLICT (modify/delete): controllers/azuremachine_reconciler_test.go deleted in HEAD and modified in Update to compute API 2021-11-01. Version Update to compute API 2021-11-01 of controllers/azuremachine_reconciler_test.go left in tree.
Auto-merging controllers/azurecluster_reconciler_test.go
CONFLICT (modify/delete): azure/services/vmextensions/spec.go deleted in HEAD and modified in Update to compute API 2021-11-01. Version Update to compute API 2021-11-01 of azure/services/vmextensions/spec.go left in tree.
Auto-merging azure/services/vmextensions/client.go
Auto-merging azure/services/virtualmachines/virtualmachines.go
Auto-merging azure/services/virtualmachines/client.go
Auto-merging azure/services/scalesetvms/client.go
CONFLICT (modify/delete): azure/services/scalesets/vmssextension_spec.go deleted in HEAD and modified in Update to compute API 2021-11-01. Version Update to compute API 2021-11-01 of azure/services/scalesets/vmssextension_spec.go left in tree.
Auto-merging azure/services/scalesets/scalesets_test.go
Auto-merging azure/services/scalesets/scalesets.go
Auto-merging azure/services/scalesets/client.go
Auto-merging azure/services/roleassignments/roleassignments_test.go
CONFLICT (content): Merge conflict in azure/services/roleassignments/roleassignments_test.go
Auto-merging azure/services/roleassignments/roleassignments.go
CONFLICT (content): Merge conflict in azure/services/roleassignments/roleassignments.go
Auto-merging azure/services/availabilitysets/availabilitysets.go
Auto-merging azure/scope/machine.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update to compute API 2021-11-01
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.2

According to the proposal at #2295, CAPZ should try to backport fixes to the last two releases. This is a prerequisite to cherry-picking #2357.

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants