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

Add an option to skip NTP installation #11160

Merged
merged 1 commit into from Mar 31, 2021
Merged

Add an option to skip NTP installation #11160

merged 1 commit into from Mar 31, 2021

Conversation

kenji-cloudnatix
Copy link
Contributor

Add NTPConfig to ClusterSpec. NTPConfig has the SkipInstall option.

#9661

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 30, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @kenji-cloudnatix. 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 the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 30, 2021
@kenji-cloudnatix kenji-cloudnatix force-pushed the kenji/ntp-skip-install branch 2 times, most recently from 5335f49 to fe2dc8c Compare March 30, 2021 22:14
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 30, 2021
@kenji-cloudnatix kenji-cloudnatix force-pushed the kenji/ntp-skip-install branch 2 times, most recently from 7d87722 to 8dc5761 Compare March 30, 2021 23:06
@hakman
Copy link
Member

hakman commented Mar 31, 2021

/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 Mar 31, 2021
hakman
hakman reviewed Mar 31, 2021
View reviewed changes
pkg/apis/kops/ntpconfig.go Outdated
// NTPConfig is the configuration for NTP.
type NTPConfig struct {
// SkipInstall is set to true when we prevent kops from installing and modifying NTP.
SkipInstall bool `json:"skipInstall,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

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

I think we were planning to move away from SkipInstall and add Enabled and/or Managed:
Enabled = false would mean the service is actually disabled by the task.
Managed = false would just skip the task.

/cc @justinsb @rifelpet @olemarkus

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the review, @hakman ! I've added Managed. I wasn't sure we want to have Enabled for NTP since I believe either systemd-timesyncd or chrony is needed in every env. Does this make sense?

Copy link
Member

Choose a reason for hiding this comment

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

👍

hakman
hakman approved these changes Mar 31, 2021
View reviewed changes
pkg/apis/kops/v1alpha2/ntpconfig.go Outdated Show resolved Hide resolved
pkg/apis/kops/v1alpha2/ntpconfig.go Outdated Show resolved Hide resolved
pkg/apis/kops/v1alpha2/ntpconfig.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 31, 2021
@hakman
Copy link
Member

hakman commented Mar 31, 2021

/approve cancel

@hakman
Copy link
Member

hakman commented Mar 31, 2021

/lgtm cancel

@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 31, 2021
hakman
hakman requested changes Mar 31, 2021
View reviewed changes
Copy link
Member

@hakman hakman left a comment •
edited

Choose a reason for hiding this comment

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

Please see my inline comments.
Approved this prematurely by mistake. Sorry.

@kenji-cloudnatix
Copy link
Contributor Author

Sure, @hakman ! Applied your comments.

@hakman
Copy link
Member

hakman commented Mar 31, 2021

/test pull-kops-bazel-test

@hakman
Copy link
Member

hakman commented Mar 31, 2021 •
edited

Thanks @kenji-cloudnatix. I appreciate the nudge on this.
@rifelpet Would you mind taking a final look? We may want to mention this in the docs.
/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 31, 2021
@rifelpet
Copy link
Member

Agreed this looks good to me but could use a section in https://kops.sigs.k8s.io/cluster_spec/

I was debating whether it would make sense to have this be a property of the instance group rather than the cluster, given that it is used by nodeup. I can't think of legitimate use-cases where a cluster might need node-specific NTP configurations though. Maybe others can?

@kenji-cloudnatix
Add an option to skip NTP installation
baff30d 
Add NTPConfig to ClusterSpec. NTPConfig has the SkipInstall option.

kubernetes#9661
@kenji-cloudnatix
Copy link
Contributor Author

Sure, @rifelpet ! updated https://kops.sigs.k8s.io/cluster_spec/

Please let me know the NTP config should be somewhere level.. Thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 31, 2021
@k8s-ci-robot k8s-ci-robot merged commit ba3914a into kubernetes:master Mar 31, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Mar 31, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, rifelpet

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

@hakman hakman mentioned this pull request Apr 1, 2021
Merged
k8s-ci-robot added a commit that referenced this pull request Apr 1, 2021
@k8s-ci-robot
Merge pull request #11164 from hakman/automated-cherry-pick-of-#11160…
9fa851d 
…-upstream-release-1.20

Automated cherry pick of #11160: Add an option to skip NTP installation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hakman hakman hakman requested changes

@rifelpet rifelpet rifelpet approved these changes

@johngmyers johngmyers Awaiting requested review from johngmyers

@rdrgmnzs rdrgmnzs Awaiting requested review from rdrgmnzs

@justinsb justinsb Awaiting requested review from justinsb

@olemarkus olemarkus Awaiting requested review from olemarkus

Assignees

@rifelpet rifelpet

@hakman hakman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api area/documentation area/nodeup 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
v1.21
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@kenji-cloudnatix @k8s-ci-robot @hakman @rifelpet