diff --git a/instances/tools.windowbuilder/target/config.json b/instances/tools.windowbuilder/target/config.json index 98047988d..5049bf9e3 100644 --- a/instances/tools.windowbuilder/target/config.json +++ b/instances/tools.windowbuilder/target/config.json @@ -45,6 +45,7 @@ }, "home": "/home/jenkins", "kubernetes": { + "inheritYamlMergeStrategy": true, "resources": { "cpu": { "limit": "2000m", @@ -88,7 +89,8 @@ ], "name": "m2-dir" } - ] + ], + "yamlMergeStrategy": "merge" }, "labels": [ "basic" @@ -138,6 +140,7 @@ }, "home": "/home/jenkins", "kubernetes": { + "inheritYamlMergeStrategy": true, "resources": { "cpu": { "limit": "2000m", @@ -181,7 +184,8 @@ ], "name": "m2-dir" } - ] + ], + "yamlMergeStrategy": "merge" }, "labels": [ "basic-ubuntu" @@ -231,6 +235,7 @@ }, "home": "/home/jenkins", "kubernetes": { + "inheritYamlMergeStrategy": true, "resources": { "cpu": { "limit": "2000m", @@ -274,7 +279,8 @@ ], "name": "m2-dir" } - ] + ], + "yamlMergeStrategy": "merge" }, "labels": [ "migration", @@ -326,6 +332,7 @@ }, "home": "/home/jenkins", "kubernetes": { + "inheritYamlMergeStrategy": true, "resources": { "cpu": { "limit": "2000m", @@ -369,7 +376,8 @@ ], "name": "m2-dir" } - ] + ], + "yamlMergeStrategy": "merge" }, "labels": [ "centos-latest", @@ -511,6 +519,7 @@ "authorize-project", "bouncycastle-api", "build-timeout", + "cloudbees-disk-usage-simple", "cloudbees-folder", "command-launcher", "config-file-provider", diff --git a/instances/tools.windowbuilder/target/jenkins/configuration.yml b/instances/tools.windowbuilder/target/jenkins/configuration.yml index becbd8479..df1944fd4 100644 --- a/instances/tools.windowbuilder/target/jenkins/configuration.yml +++ b/instances/tools.windowbuilder/target/jenkins/configuration.yml @@ -90,10 +90,6 @@ jenkins: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -139,6 +135,13 @@ jenkins: spec: containers: - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" volumeMounts: - name: m2-secret-dir mountPath: /home/jenkins/.m2/settings-security.xml @@ -163,6 +166,8 @@ jenkins: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "basic-ubuntu" namespace: "windowbuilder" label: "basic-ubuntu" @@ -176,10 +181,6 @@ jenkins: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -225,6 +226,13 @@ jenkins: spec: containers: - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" volumeMounts: - name: m2-secret-dir mountPath: /home/jenkins/.m2/settings-security.xml @@ -249,6 +257,8 @@ jenkins: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "centos-7" namespace: "windowbuilder" label: "migration jipp-migration centos-7" @@ -262,10 +272,6 @@ jenkins: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -311,6 +317,13 @@ jenkins: spec: containers: - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" volumeMounts: - name: m2-secret-dir mountPath: /home/jenkins/.m2/settings-security.xml @@ -335,6 +348,8 @@ jenkins: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "centos-8" namespace: "windowbuilder" label: "centos-latest centos-8" @@ -348,10 +363,6 @@ jenkins: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -397,6 +408,13 @@ jenkins: spec: containers: - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" volumeMounts: - name: m2-secret-dir mountPath: /home/jenkins/.m2/settings-security.xml @@ -421,6 +439,8 @@ jenkins: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false diff --git a/instances/tools.windowbuilder/target/k8s/configmap-jenkins-config.yml b/instances/tools.windowbuilder/target/k8s/configmap-jenkins-config.yml index da467fc6d..203b31930 100644 --- a/instances/tools.windowbuilder/target/k8s/configmap-jenkins-config.yml +++ b/instances/tools.windowbuilder/target/k8s/configmap-jenkins-config.yml @@ -113,10 +113,6 @@ data: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -162,6 +158,13 @@ data: spec: containers: - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" volumeMounts: - name: m2-secret-dir mountPath: /home/jenkins/.m2/settings-security.xml @@ -186,6 +189,8 @@ data: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "basic-ubuntu" namespace: "windowbuilder" label: "basic-ubuntu" @@ -199,10 +204,6 @@ data: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -248,6 +249,13 @@ data: spec: containers: - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" volumeMounts: - name: m2-secret-dir mountPath: /home/jenkins/.m2/settings-security.xml @@ -272,6 +280,8 @@ data: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "centos-7" namespace: "windowbuilder" label: "migration jipp-migration centos-7" @@ -285,10 +295,6 @@ data: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -334,6 +340,13 @@ data: spec: containers: - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" volumeMounts: - name: m2-secret-dir mountPath: /home/jenkins/.m2/settings-security.xml @@ -358,6 +371,8 @@ data: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "centos-8" namespace: "windowbuilder" label: "centos-latest centos-8" @@ -371,10 +386,6 @@ data: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -420,6 +431,13 @@ data: spec: containers: - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" volumeMounts: - name: m2-secret-dir mountPath: /home/jenkins/.m2/settings-security.xml @@ -444,6 +462,8 @@ data: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false