kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move SysctlParameters into the NodeupConfig

This commit is contained in:
John Gardiner Myers 2020-06-06 22:44:40 -07:00
parent 386286d172
commit a25f9198d1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodeup/pkg/model/sysctls.go
View File

@ -149,7 +149,7 @@ func (b *SysctlBuilder) Build(c *fi.ModelBuilderContext) error {
"net.ipv4.ip_forward=1", "net.ipv4.ip_forward=1",
"") "")
if params := b.InstanceGroup.Spec.SysctlParameters; len(params) > 0 { if params := b.NodeupConfig.SysctlParameters; len(params) > 0 {
sysctls = append(sysctls, sysctls = append(sysctls,
"# Custom sysctl parameters from instance group spec", "# Custom sysctl parameters from instance group spec",
"") "")

5
pkg/apis/nodeup/config.go
View File

@ -48,6 +48,10 @@ type Config struct {
// StaticManifests describes generic static manifests // StaticManifests describes generic static manifests
// Using this allows us to keep complex logic out of nodeup // Using this allows us to keep complex logic out of nodeup
StaticManifests []*StaticManifest `json:"staticManifests,omitempty"` StaticManifests []*StaticManifest `json:"staticManifests,omitempty"`
// SysctlParameters will configure kernel parameters using sysctl(8). When
// specified, each parameter must follow the form variable=value, the way
// it would appear in sysctl.conf.
SysctlParameters []string `json:",omitempty"`
// VolumeMounts are a collection of volume mounts. // VolumeMounts are a collection of volume mounts.
VolumeMounts []*kops.VolumeMountSpec `json:",omitempty"` VolumeMounts []*kops.VolumeMountSpec `json:",omitempty"`
} }
@ -73,6 +77,7 @@ type StaticManifest struct {
func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) *Config { func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) *Config {
return &Config{ return &Config{
InstanceGroupRole: instanceGroup.Spec.Role, InstanceGroupRole: instanceGroup.Spec.Role,
SysctlParameters: instanceGroup.Spec.SysctlParameters,
VolumeMounts: instanceGroup.Spec.VolumeMounts, VolumeMounts: instanceGroup.Spec.VolumeMounts,
} }
} }