Skip to content

Commit 8ac076b

Browse files
authored
Merge pull request #722 from payall4u/payall4u/support-to-config-unified
spec generator support setting unified
2 parents 205f593 + a202491 commit 8ac076b

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

generate/config.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@ func (g *Generator) initConfigLinuxResourcesPids() {
123123
}
124124
}
125125

126+
func (g *Generator) initConfigLinuxResourcesUnified() {
127+
g.initConfigLinuxResources()
128+
if g.Config.Linux.Resources.Unified == nil {
129+
g.Config.Linux.Resources.Unified = map[string]string{}
130+
}
131+
}
132+
126133
func (g *Generator) initConfigSolaris() {
127134
g.initConfig()
128135
if g.Config.Solaris == nil {

generate/generate.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -857,6 +857,28 @@ func (g *Generator) DropLinuxResourcesHugepageLimit(pageSize string) {
857857
}
858858
}
859859

860+
// AddLinuxResourcesUnified sets the g.Config.Linux.Resources.Unified
861+
func (g *Generator) SetLinuxResourcesUnified(unified map[string]string) {
862+
g.initConfigLinuxResourcesUnified()
863+
for k, v := range unified {
864+
g.Config.Linux.Resources.Unified[k] = v
865+
}
866+
}
867+
868+
// AddLinuxResourcesUnified adds or updates the key-value pair from g.Config.Linux.Resources.Unified
869+
func (g *Generator) AddLinuxResourcesUnified(key, val string) {
870+
g.initConfigLinuxResourcesUnified()
871+
g.Config.Linux.Resources.Unified[key] = val
872+
}
873+
874+
// DropLinuxResourcesUnified drops a key-value pair from g.Config.Linux.Resources.Unified
875+
func (g *Generator) DropLinuxResourcesUnified(key string) {
876+
if g.Config == nil || g.Config.Linux == nil || g.Config.Linux.Resources == nil || g.Config.Linux.Resources.Unified == nil {
877+
return
878+
}
879+
delete(g.Config.Linux.Resources.Unified, key)
880+
}
881+
860882
// SetLinuxResourcesMemoryLimit sets g.Config.Linux.Resources.Memory.Limit.
861883
func (g *Generator) SetLinuxResourcesMemoryLimit(limit int64) {
862884
g.initConfigLinuxResourcesMemory()

0 commit comments

Comments
 (0)