Skip to content

Follow-up nits from etcd init script pull request #29489

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
Merged
merged 1 commit into from
Dec 1, 2023
Merged

Follow-up nits from etcd init script pull request #29489

merged 1 commit into from
Dec 1, 2023

Conversation

JamesLaverack
Copy link
Member

Please ensure your pull request adheres to the following guidelines:

  • For first time contributors, read Submitting a pull request
  • All code is covered by unit and/or runtime tests where feasible.
  • All commits contain a well written commit description including a title,
    description and a Fixes: #XXX line if the commit addresses a particular
    GitHub issue.
  • If your commit description contains a Fixes: <commit-id> tag, then
    please add the commit author[s] as reviewer[s] to this issue.
  • All commits are signed off. See the section Developer’s Certificate of Origin
  • Provide a title or release-note blurb suitable for the release notes.
  • Are you a user of Cilium? Please add yourself to the Users doc
  • Thanks for contributing!

This is a follow on from the review of #29109

@JamesLaverack JamesLaverack requested review from a team as code owners November 29, 2023 16:26
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Nov 29, 2023
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Nov 29, 2023
gandro
gandro approved these changes Nov 29, 2023
View reviewed changes
Copy link
Member

@gandro gandro left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Helm LGTM! Thanks!

@gandro gandro added area/clustermesh Relates to multi-cluster routing functionality in Cilium. release-note/misc This PR makes changes that have no direct user impact. labels Nov 29, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Nov 29, 2023
@gandro gandro added dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. and removed area/clustermesh Relates to multi-cluster routing functionality in Cilium. labels Nov 29, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Nov 29, 2023
@gandro gandro added the area/clustermesh Relates to multi-cluster routing functionality in Cilium. label Nov 29, 2023
@qmonnet
Copy link
Member

qmonnet commented Nov 29, 2023

/test

qmonnet
qmonnet requested changes Nov 29, 2023
View reviewed changes
Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

Changes look OK, but can you please motivate them in the commit description? Going all over the comments in #29109 to understand what's going on here doesn't make for a good review experience (or for understanding the change in the future, when looking at Git logs). 🙏

@JamesLaverack JamesLaverack force-pushed the etcd-single-image-fixups-and-nits branch from 9779b9c to a894f62 Compare November 29, 2023 22:10
@JamesLaverack
Copy link
Member Author

Changes look OK, but can you please motivate them in the commit description? Going all over the comments in #29109 to understand what's going on here doesn't make for a good review experience (or for understanding the change in the future, when looking at Git logs). 🙏

Good point. I've updated the commit message. It now reads:

    Follow-up nits from etcd init script pull request

    This is a follow on from the review of
    https://github.com/cilium/cilium/pull/29109, and is a collection of
    minor changes:
    - Remove unused variables in install/kubernetes Makefile values file
    - Remove etcd image from check-docker-images.sh script
    - Remove now-unused external dependencies block from
      check-docker-images.sh script
    - Clarify doc comment for ClusterMeshEtcdInit function, to correctly
      state the purpose of the hasConfig key
    - defer etcdClient.Close() after creating etcdClient
    - Use errors.Join to handle errors in defered cleanup code, where the
      main function may have also returned an error
    - Correct typo in comment: "it's" to "its"

    Signed-off-by: James Laverack <james@isovalent.com>

marseel
marseel approved these changes Nov 30, 2023
View reviewed changes
Copy link
Contributor

@marseel marseel left a comment

Choose a reason for hiding this comment

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

Looks good to me.

cc @giorio94 as it addresses his comments in other PR.

giorio94
giorio94 approved these changes Nov 30, 2023
View reviewed changes
Copy link
Member

@giorio94 giorio94 left a comment

Choose a reason for hiding this comment

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

Thanks!

@giorio94
Copy link
Member

/test

qmonnet
qmonnet approved these changes Nov 30, 2023
View reviewed changes
Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

Thanks a lot!

@giorio94
Copy link
Member

giorio94 commented Dec 1, 2023

Conformance K8s Upstream Network is #29523 (disabled by #29524)

@aanm aanm enabled auto-merge December 1, 2023 10:16
@JamesLaverack @giorio94
Follow-up nits from etcd init script pull request
eed94dd 
This is a follow on from the review of
cilium#29109, and is a collection of
minor changes:
- Remove unused variables in install/kubernetes Makefile values file
- Remove etcd image from check-docker-images.sh script
- Remove now-unused external dependencies block from
  check-docker-images.sh script
- Clarify doc comment for ClusterMeshEtcdInit function, to correctly
  state the purpose of the hasConfig key
- defer etcdClient.Close() after creating etcdClient
- Use errors.Join to handle errors in defered cleanup code, where the
  main function may have also returned an error
- Correct typo in comment: "it's" to "its"

Signed-off-by: James Laverack <james@isovalent.com>
@giorio94 giorio94 force-pushed the etcd-single-image-fixups-and-nits branch from a894f62 to eed94dd Compare December 1, 2023 15:27
@giorio94
Copy link
Member

giorio94 commented Dec 1, 2023

/test

@giorio94
Copy link
Member

giorio94 commented Dec 1, 2023

One of the Conformance E2E tests seemed to consistently fail due to #27762, although it cannot be related to this PR (as the changes here are not exercised by that test). Let's try rebasing onto main.

@aanm aanm added this pull request to the merge queue Dec 1, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 1, 2023
Merged via the queue into cilium:main with commit d491891 Dec 1, 2023
@JamesLaverack JamesLaverack mentioned this pull request Apr 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro approved these changes

@marseel marseel marseel approved these changes

@aanm aanm aanm approved these changes

@youngnick youngnick youngnick approved these changes

@qmonnet qmonnet qmonnet approved these changes

@giorio94 giorio94 giorio94 approved these changes

Assignees
No one assigned
Labels
area/clustermesh Relates to multi-cluster routing functionality in Cilium. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@JamesLaverack @qmonnet @giorio94 @gandro @marseel @aanm @youngnick