CephFS Migrations

eclipse-cbi · Jan 14, 2025 · 6fad632 · 6fad632
1 parent b0fa4a9
commit 6fad632
Show file tree

Hide file tree

Showing 14 changed files with 339 additions and 7 deletions.
diff --git a/instances/ee4j.servlet/config.jsonnet b/instances/ee4j.servlet/config.jsonnet
@@ -8,4 +8,5 @@
       "dashboard-view",
     ],
   },
+  seLinuxLevel: "s0:c53,c12",
 }
diff --git a/instances/ee4j.servlet/target/config.json b/instances/ee4j.servlet/target/config.json
@@ -475,8 +475,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": [
@@ -658,6 +658,7 @@
       },
       "generate": false
    },
+   "seLinuxLevel": "s0:c53,c12",
    "secrets": {
       "dockerconfigjson": {
          "dockerconfigjson-for-pull-as-default": {

diff --git a/instances/ee4j.servlet/target/jenkins/configuration.yml b/instances/ee4j.servlet/target/jenkins/configuration.yml
@@ -117,6 +117,8 @@ jenkins:
         containerCapStr: "2"
         jenkinsUrl: "http://jenkins-ui.servlet.svc.cluster.local/servlet"
         jenkinsTunnel: "jenkins-discovery.servlet.svc.cluster.local:50000"
+        garbageCollection:
+          timeout: 300
         maxRequestsPerHostStr: "32"
         namespace: "servlet"
         podRetention: "never"
@@ -566,6 +568,8 @@ tool:
         home: "/opt/tools/java/adoptopenjdk/openj9-jdk-8/latest"
       - name: "temurin-latest"
         home: "/opt/tools/java/temurin/latest"
+      - name: "temurin-jdk23-latest"
+        home: "/opt/tools/java/temurin/jdk-23/latest"
       - name: "temurin-jdk22-latest"
         home: "/opt/tools/java/temurin/jdk-22/latest"
       - name: "temurin-jdk21-latest"

diff --git a/instances/ee4j.servlet/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.servlet/target/k8s/configmap-jenkins-config.yml
@@ -140,6 +140,8 @@ data:
             containerCapStr: "2"
             jenkinsUrl: "http://jenkins-ui.servlet.svc.cluster.local/servlet"
             jenkinsTunnel: "jenkins-discovery.servlet.svc.cluster.local:50000"
+            garbageCollection:
+              timeout: 300
             maxRequestsPerHostStr: "32"
             namespace: "servlet"
             podRetention: "never"
@@ -589,6 +591,8 @@ data:
             home: "/opt/tools/java/adoptopenjdk/openj9-jdk-8/latest"
           - name: "temurin-latest"
             home: "/opt/tools/java/temurin/latest"
+          - name: "temurin-jdk23-latest"
+            home: "/opt/tools/java/temurin/jdk-23/latest"
           - name: "temurin-jdk22-latest"
             home: "/opt/tools/java/temurin/jdk-22/latest"
           - name: "temurin-jdk21-latest"

diff --git a/instances/ee4j.servlet/target/k8s/statefulset.json b/instances/ee4j.servlet/target/k8s/statefulset.json
@@ -119,7 +119,12 @@
                         "cpu": "250m"
                      }
                   },
-                  "securityContext": { },
+                  "securityContext": {
+                     "seLinuxOptions": {
+                        "level": "s0:c53,c12",
+                        "type": "spc_t"
+                     }
+                  },
                   "volumeMounts": [
                      {
                         "mountPath": "/var/jenkins",

diff --git a/instances/foundation-internal.infra/config.jsonnet b/instances/foundation-internal.infra/config.jsonnet
@@ -44,4 +44,5 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet';
       namespace: "foundation-internal-infra"
     }
   },
+  seLinuxLevel: "s0:c27,c24",
 }
diff --git a/instances/foundation-internal.infra/target/config.json b/instances/foundation-internal.infra/target/config.json
@@ -491,8 +491,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": [
@@ -674,6 +674,7 @@
       },
       "generate": false
    },
+   "seLinuxLevel": "s0:c27,c24",
    "secrets": {
       "dockerconfigjson": {
          "dockerconfigjson-for-pull-as-default": {

diff --git a/instances/foundation-internal.infra/target/jenkins/configuration.yml b/instances/foundation-internal.infra/target/jenkins/configuration.yml
@@ -108,6 +108,8 @@ jenkins:
         containerCapStr: "6"
         jenkinsUrl: "http://jenkins-ui.foundation-internal-infra.svc.cluster.local/ci/infra"
         jenkinsTunnel: "jenkins-discovery.foundation-internal-infra.svc.cluster.local:50000"
+        garbageCollection:
+          timeout: 300
         maxRequestsPerHostStr: "32"
         namespace: "foundation-internal-infra"
         podRetention: "never"
@@ -632,6 +634,8 @@ tool:
         home: "/opt/tools/java/adoptopenjdk/openj9-jdk-8/latest"
       - name: "temurin-latest"
         home: "/opt/tools/java/temurin/latest"
+      - name: "temurin-jdk23-latest"
+        home: "/opt/tools/java/temurin/jdk-23/latest"
       - name: "temurin-jdk22-latest"
         home: "/opt/tools/java/temurin/jdk-22/latest"
       - name: "temurin-jdk21-latest"

diff --git a/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml b/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml
@@ -131,6 +131,8 @@ data:
             containerCapStr: "6"
             jenkinsUrl: "http://jenkins-ui.foundation-internal-infra.svc.cluster.local/ci/infra"
             jenkinsTunnel: "jenkins-discovery.foundation-internal-infra.svc.cluster.local:50000"
+            garbageCollection:
+              timeout: 300
             maxRequestsPerHostStr: "32"
             namespace: "foundation-internal-infra"
             podRetention: "never"
@@ -655,6 +657,8 @@ data:
             home: "/opt/tools/java/adoptopenjdk/openj9-jdk-8/latest"
           - name: "temurin-latest"
             home: "/opt/tools/java/temurin/latest"
+          - name: "temurin-jdk23-latest"
+            home: "/opt/tools/java/temurin/jdk-23/latest"
           - name: "temurin-jdk22-latest"
             home: "/opt/tools/java/temurin/jdk-22/latest"
           - name: "temurin-jdk21-latest"

diff --git a/instances/foundation-internal.infra/target/k8s/statefulset.json b/instances/foundation-internal.infra/target/k8s/statefulset.json
@@ -119,7 +119,12 @@
                         "cpu": "1000m"
                      }
                   },
-                  "securityContext": { },
+                  "securityContext": {
+                     "seLinuxOptions": {
+                        "level": "s0:c27,c24",
+                        "type": "spc_t"
+                     }
+                  },
                   "volumeMounts": [
                      {
                         "mountPath": "/var/jenkins",
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,5 @@ @@
           "dashboard-view",
         ],
       },
+      seLinuxLevel: "s0:c53,c12",
     }