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

Alicloud: fix comparison failures for SecurityGroupRule and SSHKey #8028

Merged
merged 2 commits into from
Dec 1, 2019
Merged

Alicloud: fix comparison failures for SecurityGroupRule and SSHKey #8028

merged 2 commits into from
Dec 1, 2019

Conversation

bittopaz
Copy link
Contributor

This is part of #4127.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 28, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @bittopaz. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 28, 2019
bittopaz
bittopaz commented Nov 28, 2019
View reviewed changes
upup/pkg/fi/cloudup/alitasks/sshkey.go
@@ -68,13 +70,40 @@ func (s *SSHKey) Find(c *fi.Context) (*SSHKey, error) {
Name: fi.String(k.KeyPairName),
KeyPairFingerPrint: fi.String(k.KeyPairFingerPrint),
}

// Avoid spurious changes
if fi.StringValue(actual.KeyPairFingerPrint) == compactKeyFingerprint(fi.StringValue(s.KeyPairFingerPrint)) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Usually a KeyFingerprint looks like: "a7:b1:3e:3d:84:24:a2:5a:91:5f:6f:e9:cf:dd:2b:6a".
For unknown reason, when creating new ssh key, it returns key print without ":", eg: "a7b13e3d8424a25a915f6fe9cfdd2b6a".

But in describe sshkey method, it returns normal KeyFingerprint. So I made this compactKeyFingerprint function to do comparison.

@bittopaz bittopaz changed the title Alicloud: fix diff failures for SecurityGroupRule and SSHKey Alicloud: fix comparison failures for SecurityGroupRule and SSHKey Nov 28, 2019
@zetaab
Copy link
Member

zetaab commented Nov 28, 2019

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 28, 2019
@bittopaz
Copy link
Contributor Author

/retest

zetaab
zetaab approved these changes Dec 1, 2019
View reviewed changes
Copy link
Member

@zetaab zetaab left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bittopaz, zetaab

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 Dec 1, 2019
@k8s-ci-robot k8s-ci-robot merged commit 32cf01f into kubernetes:master Dec 1, 2019
@bittopaz
Copy link
Contributor Author

bittopaz commented Dec 1, 2019

@zetaab Thank you!

@bittopaz bittopaz deleted the ali-patch-10 branch December 1, 2019 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zetaab zetaab zetaab approved these changes

@chrisz100 chrisz100 Awaiting requested review from chrisz100

@rdrgmnzs rdrgmnzs Awaiting requested review from rdrgmnzs

Assignees

@zetaab zetaab

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bittopaz @k8s-ci-robot @zetaab