Skip to content

Fix e2e tests to work with CAPZ#607

Merged
k8s-ci-robot merged 5 commits into
kubernetes-sigs:masterfrom
CecileRobertMichon:fix-e2e-tests
May 4, 2021
Merged

Fix e2e tests to work with CAPZ#607
k8s-ci-robot merged 5 commits into
kubernetes-sigs:masterfrom
CecileRobertMichon:fix-e2e-tests

Conversation

@CecileRobertMichon
Copy link
Copy Markdown
Contributor

@CecileRobertMichon CecileRobertMichon commented Apr 26, 2021 •
edited
Loading

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it: Made some changes to get the CCM test suite to pass with a CAPZ built clusters. Tested using the pull-cloud-provider-azure-e2e-ccm-capz job.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Release note:

NONE

@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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 26, 2021
@k8s-ci-robot k8s-ci-robot requested review from feiskyer and nilo19 April 26, 2021 21:45
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 26, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 27, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

5 similar comments
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 27, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 27, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 27, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 27, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 27, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 28, 2021

/retest

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 28, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

3 similar comments
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 28, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 28, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 29, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon CecileRobertMichon mentioned this pull request Apr 29, 2021
Merged
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 29, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

1 similar comment
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 30, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Apr 30, 2021

/retest

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented May 1, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented May 1, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

@CecileRobertMichon CecileRobertMichon changed the title [WIP] Fix e2e tests to work with CAPZ Fix e2e tests to work with CAPZ May 3, 2021
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed 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. labels May 3, 2021
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented May 3, 2021

@feiskyer @nilo19 @chewong this is ready for review

@CecileRobertMichon CecileRobertMichon mentioned this pull request May 3, 2021
Merged
3 tasks
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented May 3, 2021

/test pull-cloud-provider-azure-e2e-ccm-capz

success 2/2

@nilo19
Copy link
Copy Markdown
Contributor

nilo19 commented May 4, 2021

/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 4, 2021
feiskyer
feiskyer reviewed May 4, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

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

Thanks for making it works now.

/lgtm
/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented May 4, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon, feiskyer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 4, 2021
@k8s-ci-robot k8s-ci-robot merged commit bd4c2f7 into kubernetes-sigs:master May 4, 2021
@ialidzhikov ialidzhikov mentioned this pull request Sep 21, 2021
Merged
@lzhecheng lzhecheng mentioned this pull request Jan 10, 2022
Merged
k8s-ci-robot added a commit that referenced this pull request Jan 10, 2022
@k8s-ci-robot
Merge pull request #982 from lzhecheng/0.7-fix-capz-tests
7c38771 
Cherry-pick #607, #627 and #841 to branch release-0.7
@MartinForReal
Copy link
Copy Markdown
Contributor

MartinForReal commented Apr 1, 2022

/cherrypick release-1.0

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Apr 1, 2022

@MartinForReal: #607 failed to apply on top of branch "release-1.0":

Applying: Rename isMasterNode to isControlPlaneNode and allow node-role.kubernetes.io labels
Using index info to reconstruct a base tree...
M	pkg/consts/consts.go
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_vmss.go
M	tests/e2e/network/service_annotations.go
M	tests/e2e/utils/node_utils.go
M	tests/e2e/utils/utils.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/utils/utils.go
Auto-merging tests/e2e/utils/node_utils.go
Auto-merging tests/e2e/network/service_annotations.go
Auto-merging pkg/provider/azure_vmss.go
Auto-merging pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_standard.go
Auto-merging pkg/consts/consts.go
CONFLICT (content): Merge conflict in pkg/consts/consts.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 Rename isMasterNode to isControlPlaneNode and allow node-role.kubernetes.io labels
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".
Details

In response to this:

/cherrypick release-1.0

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.

@MartinForReal
Copy link
Copy Markdown
Contributor

MartinForReal commented Apr 6, 2022

/cherrypick release-0.7

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Apr 6, 2022

@MartinForReal: #607 failed to apply on top of branch "release-0.7":

Applying: Rename isMasterNode to isControlPlaneNode and allow node-role.kubernetes.io labels
Using index info to reconstruct a base tree...
M	pkg/consts/consts.go
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_vmss.go
M	tests/e2e/network/service_annotations.go
M	tests/e2e/utils/node_utils.go
M	tests/e2e/utils/utils.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/utils/utils.go
Auto-merging tests/e2e/utils/node_utils.go
Auto-merging tests/e2e/network/service_annotations.go
Auto-merging pkg/provider/azure_vmss.go
Auto-merging pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_standard.go
Auto-merging pkg/consts/consts.go
CONFLICT (content): Merge conflict in pkg/consts/consts.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 Rename isMasterNode to isControlPlaneNode and allow node-role.kubernetes.io labels
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".
Details

In response to this:

/cherrypick release-0.7

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.

JoelSpeed pushed a commit to JoelSpeed/cloud-provider-azure that referenced this pull request Feb 18, 2025
@k8s-ci-robot
Merge pull request kubernetes-sigs#607 from joelanford/k8s-1.22
9724ec3 
⚠ bump to kubernetes 1.22.1, remove support for legacy v1beta1 CRDs and webhooks
JoelSpeed pushed a commit to JoelSpeed/cloud-provider-azure that referenced this pull request Feb 18, 2025
@AlexanderYastrebov
✨ crd: allow specifying spec.preserveUnknownFields (kubernetes-sigs#912)
e159968 
* crd: allow specifying spec.preserveUnknownFields

Reinstate crd:preserveUnknownFields option removed by kubernetes-sigs#607
to allow specifying the value of deprecated spec.preserveUnknownFields
CRD field.

This is useful for updating CRDs that were automatically converted from
v1beta1 version which had true as a default value and resulted in:
```
$ kubectl get crd foo.bar -o yaml | grep preserveUnknownFields
  preserveUnknownFields: true
    message: 'spec.preserveUnknownFields: Invalid value: true: must be false'
```

For kubernetes-sigs#476

* crd: rename marker to DeprecatedV1beta1CompatibilityPreserveUnknownFields
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@feiskyer feiskyer feiskyer left review comments

@nilo19 nilo19 Awaiting requested review from nilo19

Assignees

@feiskyer feiskyer

@nilo19 nilo19

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. 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@CecileRobertMichon @nilo19 @k8s-ci-robot @MartinForReal @k8s-infra-cherrypick-robot @feiskyer