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

Move containerd config from cloudup to nodeup #11986

Merged
merged 1 commit into from
Jul 14, 2021
Merged

Move containerd config from cloudup to nodeup #11986

merged 1 commit into from
Jul 14, 2021

Conversation

olemarkus
Copy link
Member

Prepare for appending nvidia runtime configuration to containerd + potential support for registry authentication as secrets.

@k8s-ci-robot k8s-ci-robot added area/api area/nodeup size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 13, 2021
hakman
hakman requested changes Jul 14, 2021
View reviewed changes
Copy link
Member

@hakman hakman left a comment

Choose a reason for hiding this comment

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

Other than this, looks good to me.

pkg/apis/nodeup/config.go Outdated
@@ -72,7 +72,7 @@ type Config struct {
// Hooks are for custom actions, for example on first installation.
Hooks [][]kops.HookSpec
// ContainerdConfig config holds the configuration for containerd
ContainerdConfig string `json:"containerdConfig,omitempty"`
ContainerdOverrideConfig *string `json:"containerdConfig,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 want to add ContainerdConfigBase so that people can merge some custom config with what kOps builds.

Suggested change
ContainerdOverrideConfig *string `json:"containerdConfig,omitempty"`
ContainerdConfigOverride *string `json:"containerdConfigOverride,omitempty"`

johngmyers
johngmyers requested changes Jul 14, 2021
View reviewed changes
nodeup/pkg/model/containerd.go Outdated
Comment on lines 438 to 441
if fi.StringValue(containerd.ConfigOverride) != "" {
return *cluster.Spec.Containerd.ConfigOverride
}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if fi.StringValue(containerd.ConfigOverride) != "" {
return *cluster.Spec.Containerd.ConfigOverride
}

nodeup/pkg/model/containerd.go Outdated
return ""
}

containerd := cluster.Spec.Containerd
Copy link
Member

@johngmyers johngmyers Jul 14, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

It would be better to pass necessary values, such as RegistryMirrors, in the NodeupConfig than refer to the cluster spec. I'm trying to remove references to the cluster spec from nodeup as changes to cluster spec don't mark nodes as NeedUpdate.

Copy link
Member Author

Choose a reason for hiding this comment

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

I just passed in the entire struct. All of them should trigger NeedUpdate.

hakman
hakman approved these changes Jul 14, 2021
View reviewed changes
Copy link
Member

@hakman hakman left a comment

Choose a reason for hiding this comment

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

This should unblock GPU and other CRI related changes.

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 Jul 14, 2021
@k8s-ci-robot k8s-ci-robot merged commit 2526a35 into kubernetes:master Jul 14, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Jul 14, 2021
@johngmyers
Copy link
Member

b.Cluster does not come from NodeupConfig or anything else deriving from userdata. Changes to it do not cause NeedsUpdate.

@olemarkus olemarkus deleted the nodeup-containerd branch July 14, 2021 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hakman hakman hakman approved these changes

@mikesplain mikesplain Awaiting requested review from mikesplain

@zetaab zetaab Awaiting requested review from zetaab

@johngmyers johngmyers Awaiting requested review from johngmyers

Assignees

@johngmyers johngmyers

@hakman hakman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@olemarkus @k8s-ci-robot @johngmyers @hakman