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.

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

Update capi nightly build to 20210526 #1389

Merged
merged 8 commits into from
May 28, 2021
Merged

Update capi nightly build to 20210526 #1389

merged 8 commits into from
May 28, 2021

Conversation

CecileRobertMichon
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon commented May 25, 2021 •
edited
Loading

What type of PR is this?

What this PR does / why we need it: Updates the CAPI nightly build used throughout the codebase to 20210526. Makes required changes, namely:

  • support externally managed infra
  • collect MachinePool logs in e2e log collector
  • rename AzureMachinePool api group to infrastructure.x-k8s.io
  • rename AzureMachineTemplate type to AzureMachinePoolMachineTemplate (to distinguish from CRD AzureMachineTemplate in the same group apiversion
  • rename AzureManagedControlPlane api group to infrastructure.x-k8s.io
  • rename AzureManagedMachinePool api group to infrastructure.x-k8s.io
  • rename AzureManagedCluster api group to infrastructure.x-k8s.io
  • update templates with KCP to use machineTemplate instead of infrastructureTemplate
  • fixes conformance tests with k8s main branch

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1352

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Added support for externally managed infrastructure
Renamed AzureMachinePool, AzureManagedControlPlane,  AzureManagedMachinePool, AzureManagedCluster api group to `infrastructure.x-k8s.io`
action required: The API group for AzureMachinePool, AzureManagedControlPlane,  AzureManagedMachinePool, and AzureManagedCluster was renamed from `exp.infrastructure.x-k8s.io` to `infrastructure.x-k8s.io`. Previously created AzureMachinePool, AzureManagedControlPlane,  AzureManagedMachinePool, AzureManagedCluster objects under the `exp.infrastructure.x-k8s.io` group are no longer supported and will not reconcile. In order to migrate your existing clusters using the experimental MachinePool and AKS features, it is recommended to either create a new cluster and migrate workloads, or migrate your existing MachinePool and ManagedCluster objects using a tool like [Kubernetes CustomResourceDefinition Migration Tool](https://github.com/vmware/crd-migration-tool).

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 25, 2021
@k8s-ci-robot k8s-ci-robot added area/provider/azure Issues or PRs related to azure provider sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 25, 2021
@CecileRobertMichon
Copy link
Contributor Author

working on absorbing other new changes in e2e framework and MachinePool group naming

@k8s-ci-robot k8s-ci-robot added release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 25, 2021
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 25, 2021
@jsturtevant jsturtevant mentioned this pull request May 25, 2021
Merged
3 tasks
@CecileRobertMichon CecileRobertMichon force-pushed the update-capi-nightly branch 3 times, most recently from ceb3a5d to 7dc8867 Compare May 26, 2021 21:48
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 26, 2021
@CecileRobertMichon
Copy link
Contributor Author

/retest

@CecileRobertMichon CecileRobertMichon force-pushed the update-capi-nightly branch 2 times, most recently from 9b8044b to c9440b6 Compare May 27, 2021 16:35
@CecileRobertMichon
Copy link
Contributor Author

/test ls

@k8s-ci-robot
Copy link
Contributor

@CecileRobertMichon: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

  • /test pull-cluster-api-provider-azure-test
  • /test pull-cluster-api-provider-azure-build
  • /test pull-cluster-api-provider-azure-e2e
  • /test pull-cluster-api-provider-azure-e2e-full
  • /test pull-cluster-api-provider-azure-e2e-windows
  • /test pull-cluster-api-provider-azure-capi-e2e
  • /test pull-cluster-api-provider-azure-verify
  • /test pull-cluster-api-provider-azure-conformance-v1alpha4
  • /test pull-cluster-api-provider-azure-upstream-v1alpha4-windows
  • /test pull-cluster-api-provider-azure-conformance-with-ci-artifacts
  • /test pull-cluster-api-provider-azure-apidiff
  • /test pull-cluster-api-provider-azure-coverage

Use /test all to run the following jobs:

  • pull-cluster-api-provider-azure-test
  • pull-cluster-api-provider-azure-build
  • pull-cluster-api-provider-azure-e2e
  • pull-cluster-api-provider-azure-e2e-windows
  • pull-cluster-api-provider-azure-verify
  • pull-cluster-api-provider-azure-apidiff
  • pull-cluster-api-provider-azure-coverage

In response to this:

/test ls

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.

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-conformance-with-ci-artifacts

@CecileRobertMichon CecileRobertMichon changed the title [WIP] Update capi nightly build to 20210524 [WIP] Update capi nightly build to 20210526 May 27, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 28, 2021
nader-ziada
nader-ziada reviewed May 28, 2021
View reviewed changes
Copy link
Contributor

@nader-ziada nader-ziada left a comment

Choose a reason for hiding this comment

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

feels much cleaner without the exp in the api

azure/scope/machinepool.go Outdated Show resolved Hide resolved
test/e2e/capi_test.go Outdated Show resolved Hide resolved
@CecileRobertMichon CecileRobertMichon force-pushed the update-capi-nightly branch 2 times, most recently from a64b513 to ce6fe03 Compare May 28, 2021 16:30
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-conformance-v1alpha4
/test pull-cluster-api-provider-azure-upstream-v1alpha4-windows
/test pull-cluster-api-provider-azure-conformance-with-ci-artifacts

jsturtevant
jsturtevant reviewed May 28, 2021
View reviewed changes
Copy link
Contributor

@jsturtevant jsturtevant left a comment

Choose a reason for hiding this comment

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

Nice work. lots of little changes to keep track of here

templates/cluster-template-machinepool.yaml Show resolved Hide resolved
test/e2e/azure_logcollector.go Show resolved Hide resolved
test/e2e/azure_logcollector.go Outdated Show resolved Hide resolved
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-conformance-v1alpha4
/test pull-cluster-api-provider-azure-upstream-v1alpha4-windows
/test pull-cluster-api-provider-azure-conformance-with-ci-artifacts

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 28, 2021 •
edited
Loading

@CecileRobertMichon: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-cluster-api-provider-azure-apidiff 23039e8 link /test pull-cluster-api-provider-azure-apidiff

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@CecileRobertMichon
Copy link
Contributor Author

@nader-ziada @jsturtevant @devigned any other feedback? I'd love to get this in before the weekend to restore the k8s-main conformance signal

@nader-ziada
Copy link
Contributor

lgtm for me, will wait a bit to see if the folks have other comments, we can merge in by end of day if nobody has issues

devigned
devigned approved these changes May 28, 2021
View reviewed changes
Copy link
Contributor

@devigned devigned left a comment

Choose a reason for hiding this comment

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

Nothing jumped out at me, lgtm. Thank you, @CecileRobertMichon!

@nader-ziada
Copy link
Contributor

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nader-ziada

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 28, 2021
@k8s-ci-robot k8s-ci-robot merged commit 43d4424 into kubernetes-sigs:master May 28, 2021
@k8s-ci-robot k8s-ci-robot added this to the v0.5.0 milestone May 28, 2021
@nader-ziada nader-ziada mentioned this pull request May 31, 2021
Closed
@CecileRobertMichon CecileRobertMichon mentioned this pull request Jun 10, 2021
Closed
@CecileRobertMichon CecileRobertMichon mentioned this pull request Sep 7, 2021
Merged
@CecileRobertMichon CecileRobertMichon deleted the update-capi-nightly branch February 17, 2023 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nader-ziada nader-ziada nader-ziada left review comments

@jsturtevant jsturtevant jsturtevant left review comments

@devigned devigned devigned approved these changes

@alexeldeib alexeldeib Awaiting requested review from alexeldeib

Assignees

@devigned devigned

@jsturtevant jsturtevant

@nader-ziada nader-ziada

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/azure Issues or PRs related to azure provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v0.5.0
Development

Successfully merging this pull request may close these issues.

e2e tests for machinepool clusters are not collecting logs
5 participants
@CecileRobertMichon @k8s-ci-robot @nader-ziada @devigned @jsturtevant