From 9fc78883ddc1740e733775cf93b3a23dd12aec1f Mon Sep 17 00:00:00 2001 From: Frederic Gurr Date: Wed, 11 Dec 2024 18:43:08 +0100 Subject: [PATCH] Cephfs migrations --- instances/modeling.graphiti/config.jsonnet | 1 + instances/modeling.graphiti/target/config.json | 5 +++-- .../modeling.graphiti/target/jenkins/configuration.yml | 2 ++ .../target/k8s/configmap-jenkins-config.yml | 2 ++ instances/modeling.graphiti/target/k8s/statefulset.json | 7 ++++++- instances/modeling.mdt.papyrus/config.jsonnet | 1 + instances/modeling.mdt.papyrus/target/config.json | 5 +++-- .../modeling.mdt.papyrus/target/jenkins/configuration.yml | 2 ++ .../target/k8s/configmap-jenkins-config.yml | 2 ++ instances/modeling.mdt.papyrus/target/k8s/statefulset.json | 7 ++++++- instances/polarsys.chess/config.jsonnet | 1 + instances/polarsys.chess/target/config.json | 5 +++-- instances/polarsys.chess/target/jenkins/configuration.yml | 2 ++ .../polarsys.chess/target/k8s/configmap-jenkins-config.yml | 2 ++ instances/polarsys.chess/target/k8s/statefulset.json | 7 ++++++- instances/tools.linuxtools/config.jsonnet | 1 + instances/tools.linuxtools/target/config.json | 5 +++-- .../tools.linuxtools/target/jenkins/configuration.yml | 2 ++ .../target/k8s/configmap-jenkins-config.yml | 2 ++ instances/tools.linuxtools/target/k8s/statefulset.json | 7 ++++++- 20 files changed, 56 insertions(+), 12 deletions(-) diff --git a/instances/modeling.graphiti/config.jsonnet b/instances/modeling.graphiti/config.jsonnet index 9c626ca0a..228d59718 100644 --- a/instances/modeling.graphiti/config.jsonnet +++ b/instances/modeling.graphiti/config.jsonnet @@ -3,4 +3,5 @@ fullName: "modeling.graphiti", displayName: "Eclipse Graphiti", }, + seLinuxLevel: "s0:c41,c10", } diff --git a/instances/modeling.graphiti/target/config.json b/instances/modeling.graphiti/target/config.json index 8c342fcd5..a6cf73b05 100644 --- a/instances/modeling.graphiti/target/config.json +++ b/instances/modeling.graphiti/target/config.json @@ -420,8 +420,8 @@ "id": "2.479.2", "key_fingerprint": "5BA31D57EF5975CA", "plugin_manager": { - "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.0/jenkins-plugin-manager-2.13.0.jar", - "version": "2.13.0" + "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.2/jenkins-plugin-manager-2.13.2.jar", + "version": "2.13.2" }, "pluginroot": "/var/cache/jenkins/plugins", "plugins": [ @@ -603,6 +603,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c41,c10", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/modeling.graphiti/target/jenkins/configuration.yml b/instances/modeling.graphiti/target/jenkins/configuration.yml index 5e6a359c3..87f7f1634 100644 --- a/instances/modeling.graphiti/target/jenkins/configuration.yml +++ b/instances/modeling.graphiti/target/jenkins/configuration.yml @@ -73,6 +73,8 @@ jenkins: containerCapStr: "2" jenkinsUrl: "http://jenkins-ui.graphiti.svc.cluster.local/graphiti" jenkinsTunnel: "jenkins-discovery.graphiti.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "graphiti" podRetention: "never" diff --git a/instances/modeling.graphiti/target/k8s/configmap-jenkins-config.yml b/instances/modeling.graphiti/target/k8s/configmap-jenkins-config.yml index d91895497..3a3ba5ce5 100644 --- a/instances/modeling.graphiti/target/k8s/configmap-jenkins-config.yml +++ b/instances/modeling.graphiti/target/k8s/configmap-jenkins-config.yml @@ -96,6 +96,8 @@ data: containerCapStr: "2" jenkinsUrl: "http://jenkins-ui.graphiti.svc.cluster.local/graphiti" jenkinsTunnel: "jenkins-discovery.graphiti.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "graphiti" podRetention: "never" diff --git a/instances/modeling.graphiti/target/k8s/statefulset.json b/instances/modeling.graphiti/target/k8s/statefulset.json index ecd3e7465..879f62323 100644 --- a/instances/modeling.graphiti/target/k8s/statefulset.json +++ b/instances/modeling.graphiti/target/k8s/statefulset.json @@ -119,7 +119,12 @@ "cpu": "250m" } }, - "securityContext": { }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c41,c10", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/modeling.mdt.papyrus/config.jsonnet b/instances/modeling.mdt.papyrus/config.jsonnet index 1227f7355..4c472cad5 100644 --- a/instances/modeling.mdt.papyrus/config.jsonnet +++ b/instances/modeling.mdt.papyrus/config.jsonnet @@ -29,4 +29,5 @@ }, }, }, + seLinuxLevel: "s0:c51,c10", } \ No newline at end of file diff --git a/instances/modeling.mdt.papyrus/target/config.json b/instances/modeling.mdt.papyrus/target/config.json index a40e94ed7..d223d2f4b 100644 --- a/instances/modeling.mdt.papyrus/target/config.json +++ b/instances/modeling.mdt.papyrus/target/config.json @@ -520,8 +520,8 @@ "id": "2.479.2", "key_fingerprint": "5BA31D57EF5975CA", "plugin_manager": { - "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.0/jenkins-plugin-manager-2.13.0.jar", - "version": "2.13.0" + "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.2/jenkins-plugin-manager-2.13.2.jar", + "version": "2.13.2" }, "pluginroot": "/var/cache/jenkins/plugins", "plugins": [ @@ -703,6 +703,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c51,c10", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/modeling.mdt.papyrus/target/jenkins/configuration.yml b/instances/modeling.mdt.papyrus/target/jenkins/configuration.yml index 68d8ea79b..6f251661e 100644 --- a/instances/modeling.mdt.papyrus/target/jenkins/configuration.yml +++ b/instances/modeling.mdt.papyrus/target/jenkins/configuration.yml @@ -73,6 +73,8 @@ jenkins: containerCapStr: "6" jenkinsUrl: "http://jenkins-ui.papyrus.svc.cluster.local/papyrus" jenkinsTunnel: "jenkins-discovery.papyrus.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "papyrus" podRetention: "never" diff --git a/instances/modeling.mdt.papyrus/target/k8s/configmap-jenkins-config.yml b/instances/modeling.mdt.papyrus/target/k8s/configmap-jenkins-config.yml index 69c24a024..9e12c26c5 100644 --- a/instances/modeling.mdt.papyrus/target/k8s/configmap-jenkins-config.yml +++ b/instances/modeling.mdt.papyrus/target/k8s/configmap-jenkins-config.yml @@ -96,6 +96,8 @@ data: containerCapStr: "6" jenkinsUrl: "http://jenkins-ui.papyrus.svc.cluster.local/papyrus" jenkinsTunnel: "jenkins-discovery.papyrus.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "papyrus" podRetention: "never" diff --git a/instances/modeling.mdt.papyrus/target/k8s/statefulset.json b/instances/modeling.mdt.papyrus/target/k8s/statefulset.json index 9b09cc648..6efee7b23 100644 --- a/instances/modeling.mdt.papyrus/target/k8s/statefulset.json +++ b/instances/modeling.mdt.papyrus/target/k8s/statefulset.json @@ -119,7 +119,12 @@ "cpu": "850m" } }, - "securityContext": { }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c51,c10", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/polarsys.chess/config.jsonnet b/instances/polarsys.chess/config.jsonnet index b7158c8ce..5ebdcfe27 100644 --- a/instances/polarsys.chess/config.jsonnet +++ b/instances/polarsys.chess/config.jsonnet @@ -3,4 +3,5 @@ fullName: "polarsys.chess", displayName: "Eclipse Chess" }, + seLinuxLevel: "s0:c32,c29", } diff --git a/instances/polarsys.chess/target/config.json b/instances/polarsys.chess/target/config.json index db13e0447..cae1f977f 100644 --- a/instances/polarsys.chess/target/config.json +++ b/instances/polarsys.chess/target/config.json @@ -420,8 +420,8 @@ "id": "2.479.2", "key_fingerprint": "5BA31D57EF5975CA", "plugin_manager": { - "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.0/jenkins-plugin-manager-2.13.0.jar", - "version": "2.13.0" + "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.2/jenkins-plugin-manager-2.13.2.jar", + "version": "2.13.2" }, "pluginroot": "/var/cache/jenkins/plugins", "plugins": [ @@ -603,6 +603,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c32,c29", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-chess": { diff --git a/instances/polarsys.chess/target/jenkins/configuration.yml b/instances/polarsys.chess/target/jenkins/configuration.yml index ad05c71c3..80346eb77 100644 --- a/instances/polarsys.chess/target/jenkins/configuration.yml +++ b/instances/polarsys.chess/target/jenkins/configuration.yml @@ -73,6 +73,8 @@ jenkins: containerCapStr: "2" jenkinsUrl: "http://jenkins-ui.chess.svc.cluster.local/chess" jenkinsTunnel: "jenkins-discovery.chess.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "chess" podRetention: "never" diff --git a/instances/polarsys.chess/target/k8s/configmap-jenkins-config.yml b/instances/polarsys.chess/target/k8s/configmap-jenkins-config.yml index 285da287b..7f6a464aa 100644 --- a/instances/polarsys.chess/target/k8s/configmap-jenkins-config.yml +++ b/instances/polarsys.chess/target/k8s/configmap-jenkins-config.yml @@ -96,6 +96,8 @@ data: containerCapStr: "2" jenkinsUrl: "http://jenkins-ui.chess.svc.cluster.local/chess" jenkinsTunnel: "jenkins-discovery.chess.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "chess" podRetention: "never" diff --git a/instances/polarsys.chess/target/k8s/statefulset.json b/instances/polarsys.chess/target/k8s/statefulset.json index 579d0c5bb..a19a50fe7 100644 --- a/instances/polarsys.chess/target/k8s/statefulset.json +++ b/instances/polarsys.chess/target/k8s/statefulset.json @@ -119,7 +119,12 @@ "cpu": "250m" } }, - "securityContext": { }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c32,c29", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/tools.linuxtools/config.jsonnet b/instances/tools.linuxtools/config.jsonnet index 13b0652f7..138da7805 100644 --- a/instances/tools.linuxtools/config.jsonnet +++ b/instances/tools.linuxtools/config.jsonnet @@ -9,4 +9,5 @@ "build-with-parameters" ], }, + seLinuxLevel: "s0:c46,c40", } diff --git a/instances/tools.linuxtools/target/config.json b/instances/tools.linuxtools/target/config.json index f93d88ee0..13f31ea73 100644 --- a/instances/tools.linuxtools/target/config.json +++ b/instances/tools.linuxtools/target/config.json @@ -423,8 +423,8 @@ "id": "2.479.2", "key_fingerprint": "5BA31D57EF5975CA", "plugin_manager": { - "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.0/jenkins-plugin-manager-2.13.0.jar", - "version": "2.13.0" + "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.2/jenkins-plugin-manager-2.13.2.jar", + "version": "2.13.2" }, "pluginroot": "/var/cache/jenkins/plugins", "plugins": [ @@ -606,6 +606,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c46,c40", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/tools.linuxtools/target/jenkins/configuration.yml b/instances/tools.linuxtools/target/jenkins/configuration.yml index cb0edee64..94841c3a6 100644 --- a/instances/tools.linuxtools/target/jenkins/configuration.yml +++ b/instances/tools.linuxtools/target/jenkins/configuration.yml @@ -73,6 +73,8 @@ jenkins: containerCapStr: "2" jenkinsUrl: "http://jenkins-ui.linuxtools.svc.cluster.local/linuxtools" jenkinsTunnel: "jenkins-discovery.linuxtools.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "linuxtools" podRetention: "never" diff --git a/instances/tools.linuxtools/target/k8s/configmap-jenkins-config.yml b/instances/tools.linuxtools/target/k8s/configmap-jenkins-config.yml index 99ba17bcc..6809f6749 100644 --- a/instances/tools.linuxtools/target/k8s/configmap-jenkins-config.yml +++ b/instances/tools.linuxtools/target/k8s/configmap-jenkins-config.yml @@ -96,6 +96,8 @@ data: containerCapStr: "2" jenkinsUrl: "http://jenkins-ui.linuxtools.svc.cluster.local/linuxtools" jenkinsTunnel: "jenkins-discovery.linuxtools.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "linuxtools" podRetention: "never" diff --git a/instances/tools.linuxtools/target/k8s/statefulset.json b/instances/tools.linuxtools/target/k8s/statefulset.json index dd3e5f159..68e10013a 100644 --- a/instances/tools.linuxtools/target/k8s/statefulset.json +++ b/instances/tools.linuxtools/target/k8s/statefulset.json @@ -119,7 +119,12 @@ "cpu": "250m" } }, - "securityContext": { }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c46,c40", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins",