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

feat: add DiskEncryptionType in CreateDisk #1646

Merged
merged 1 commit into from May 5, 2022
Merged

feat: add DiskEncryptionType in CreateDisk #1646

merged 1 commit into from May 5, 2022

Conversation

andyzhangx
Copy link
Member

What type of PR is this?

/kind feature

What this PR does / why we need it:

feat: add DiskEncryptionType in CreateDisk

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

feat: add DiskEncryptionType in CreateDisk

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

feat: add DiskEncryptionType in CreateDisk

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 4, 2022
@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, 2022
@andyzhangx
Copy link
Member Author

chart config is broken, not related to this PR:
https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cloud-provider-azure/1646/pull-cloud-provider-azure-check/1521844201916993536

+ tar -xf hack/../helm/repo/cloud-provider-azure-1.23.10.tgz -C chart_verify
+ diff -r hack/../chart_verify/cloud-provider-azure/ hack/../helm/cloud-provider-azure/ --exclude README.md
diff -r --exclude README.md hack/../chart_verify/cloud-provider-azure/Chart.yaml hack/../helm/cloud-provider-azure/Chart.yaml
16c16
< version: 1.23.10
---
> version: 1.23.11
diff -r --exclude README.md hack/../chart_verify/cloud-provider-azure/values.yaml hack/../helm/cloud-provider-azure/values.yaml
17c17
<   # imageTag: "canary"
---
>   imageTag: "v1.23.11"
45c45
<   # imageTag: "canary"
---
>   imageTag: "v1.23.11"
+ exit 1
make: *** [Makefile:334: test-helm] Error 1
+ EXIT_VALUE=2
+ set +o xtrace

@coveralls
Copy link

coveralls commented May 4, 2022 •
edited

Coverage Status

Coverage increased (+0.009%) to 80.475% when pulling cbb5d08 on andyzhangx:DiskEncryptionType into 5ddb989 on kubernetes-sigs:master.

@jackfrancis
Copy link
Contributor

@andyzhangx I can't repro the non-zero exit code when running hack/verify-helm-repo.sh locally.

$ git status
On branch DiskEncryptionType
Your branch is up to date with 'andyzhangx/DiskEncryptionType'.

nothing to commit, working tree clean
$ hack/verify-helm-repo.sh 
++ dirname hack/verify-helm-repo.sh
+ REPO_ROOT=hack/..
+ for chart in '"cloud-provider-azure"'
++ ls -t hack/../helm/repo/cloud-provider-azure-1.23.10.tgz hack/../helm/repo/cloud-provider-azure-1.23.11.tgz hack/../helm/repo/cloud-provider-azure-1.23.8.tgz
++ head -n 1
+ LATEST_CHART=hack/../helm/repo/cloud-provider-azure-1.23.11.tgz
++ echo hack/../helm/repo/cloud-provider-azure-1.23.11.tgz
++ grep -Eoq '[0-9]+.[0-9]+.[0-9]+'
+ LATEST_VERSION=
+ MATCH_STRING='version: '
+ grep -q 'version: ' hack/../helm/cloud-provider-azure/Chart.yaml
+ rm -Rf hack/../chart_verify
+ mkdir hack/../chart_verify
+ tar -xf hack/../helm/repo/cloud-provider-azure-1.23.11.tgz -C chart_verify
+ diff -r hack/../chart_verify/cloud-provider-azure/ hack/../helm/cloud-provider-azure/ --exclude README.md
+ rm -Rf hack/../chart_verify
+ exit 0

@andyzhangx
Copy link
Member Author

/retest

@MartinForReal
Copy link
Contributor

please rebase this pr after #1640 is merged. Thanks!

ZeroMagic
ZeroMagic approved these changes May 5, 2022
View reviewed changes
Copy link
Member

@ZeroMagic ZeroMagic 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 5, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, ZeroMagic

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

@andyzhangx
Copy link
Member Author

/retest

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

New changes are detected. LGTM label has been removed.

@andyzhangx
Copy link
Member Author

/retest

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 5, 2022 •
edited

@andyzhangx: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cloud-provider-azure-e2e-ccm-vmss-basic-lb 0c5eb100e1b61709e2d8775590c3ada0f40d8846 link true /test pull-cloud-provider-azure-e2e-ccm-vmss-basic-lb

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.

@MartinForReal
Copy link
Contributor

/override pull-cloud-provider-azure-check

@k8s-ci-robot
Copy link
Contributor

@MartinForReal: Overrode contexts on behalf of MartinForReal: pull-cloud-provider-azure-check

In response to this:

/override pull-cloud-provider-azure-check

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.

@andyzhangx andyzhangx merged commit 0b76f09 into kubernetes-sigs:master May 5, 2022
@MartinForReal
Copy link
Contributor

/cherrypick release-1.23

@MartinForReal
Copy link
Contributor

/cherrypick release-1.1

@MartinForReal
Copy link
Contributor

/cherrypick release-1.0

@k8s-infra-cherrypick-robot
Copy link

@MartinForReal: #1646 failed to apply on top of branch "release-1.23":

Applying: feat: add DiskEncryptionType in CreateDisk
Using index info to reconstruct a base tree...
M	pkg/provider/azure_managedDiskController.go
M	pkg/provider/azure_managedDiskController_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provider/azure_managedDiskController_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_managedDiskController_test.go
Auto-merging pkg/provider/azure_managedDiskController.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 feat: add DiskEncryptionType in CreateDisk
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:

/cherrypick release-1.23

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.

@k8s-infra-cherrypick-robot
Copy link

@MartinForReal: #1646 failed to apply on top of branch "release-1.1":

Applying: feat: add DiskEncryptionType in CreateDisk
Using index info to reconstruct a base tree...
M	pkg/provider/azure_managedDiskController.go
M	pkg/provider/azure_managedDiskController_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provider/azure_managedDiskController_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_managedDiskController_test.go
Auto-merging pkg/provider/azure_managedDiskController.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 feat: add DiskEncryptionType in CreateDisk
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:

/cherrypick release-1.1

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.

@k8s-infra-cherrypick-robot
Copy link

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

Applying: feat: add DiskEncryptionType in CreateDisk
Using index info to reconstruct a base tree...
M	pkg/provider/azure_managedDiskController.go
M	pkg/provider/azure_managedDiskController_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provider/azure_managedDiskController_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_managedDiskController_test.go
Auto-merging pkg/provider/azure_managedDiskController.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 feat: add DiskEncryptionType in CreateDisk
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:

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

seung-moon added a commit to seung-moon/cloud-provider-azure that referenced this pull request May 15, 2022
@seung-moon
Revert "Merge pull request kubernetes-sigs#1646 from andyzhangx/DiskE…
5a3a705 
…ncryptionType"

This reverts commit 0b76f09, reversing
changes made to 5ddb989.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZeroMagic ZeroMagic ZeroMagic approved these changes

@lzhecheng lzhecheng Awaiting requested review from lzhecheng

@MartinForReal MartinForReal Awaiting requested review from MartinForReal

Assignees

@ZeroMagic ZeroMagic

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/feature Categorizes issue or PR as related to a new feature. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@andyzhangx @coveralls @jackfrancis @MartinForReal @k8s-ci-robot @k8s-infra-cherrypick-robot @ZeroMagic