CephFS migrations

eclipse-cbi · Nov 21, 2024 · e19c54e · e19c54e
1 parent cb5f7b2
commit e19c54e
Show file tree

Hide file tree

Showing 27 changed files with 752 additions and 42 deletions.
diff --git a/instances/modeling.emf.egf/config.jsonnet b/instances/modeling.emf.egf/config.jsonnet
@@ -5,8 +5,8 @@
   },
   jenkins+: {
     plugins+: [
-      "gerrit-trigger",
       "jacoco",
     ],
   },
+  seLinuxLevel: "s0:c37,c9",
 }
diff --git a/instances/modeling.emf.egf/target/config.json b/instances/modeling.emf.egf/target/config.json
@@ -689,15 +689,12 @@
                   "View/Configure",
                   "View/Create",
                   "View/Delete",
-                  "View/Read",
-                  "Gerrit/ManualTrigger",
-                  "Gerrit/Retrigger"
+                  "View/Read"
                ]
             }
          }
       ],
       "plugins": [
-         "gerrit-trigger",
          "jacoco"
       ],
       "pluginsForceUpgrade": true,
@@ -901,6 +898,7 @@
       },
       "generate": false
    },
+   "seLinuxLevel": "s0:c37,c9",
    "secrets": {
       "dockerconfigjson": {
          "dockerconfigjson-for-pull-as-default": {
@@ -937,10 +935,6 @@
                "pull"
             ]
          }
-      },
-      "gerrit-trigger-plugin": {
-         "identityFile": "/run/secrets/jenkins/ssh/id_rsa",
-         "username": "genie.egf"
       }
    }
 }
diff --git a/instances/modeling.emf.egf/target/jenkins/configuration.yml b/instances/modeling.emf.egf/target/jenkins/configuration.yml
@@ -49,8 +49,6 @@ jenkins:
               - View/Create
               - View/Delete
               - View/Read
-              - Gerrit/ManualTrigger
-              - Gerrit/Retrigger
         - user:
             name: anonymous
             permissions:
@@ -704,7 +702,7 @@ unclassified:
     createAccountBasedOnEmail: true
     useExistingAccountWithSameEmail: true
   jobConfigHistory:
-    excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml"
+    excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml"
     maxDaysToKeepEntries: "60"
     maxEntriesPerPage: "12"
     maxHistoryEntries: "500"
@@ -845,7 +843,7 @@ tool:
           - installSource:
               installers:
                 - antFromApache:
-                    id: "1.10.12"
+                    id: "1.10.15"
   maven:
     installations:
       - name: "apache-maven-latest"

diff --git a/instances/modeling.emf.egf/target/jenkins/partials/permissions.hbs b/instances/modeling.emf.egf/target/jenkins/partials/permissions.hbs
@@ -28,8 +28,6 @@
       - View/Create
       - View/Delete
       - View/Read
-      - Gerrit/ManualTrigger
-      - Gerrit/Retrigger
 - user:
     name: anonymous
     permissions:

diff --git a/instances/modeling.emf.egf/target/k8s/configmap-jenkins-config.yml b/instances/modeling.emf.egf/target/k8s/configmap-jenkins-config.yml
@@ -72,8 +72,6 @@ data:
                   - View/Create
                   - View/Delete
                   - View/Read
-                  - Gerrit/ManualTrigger
-                  - Gerrit/Retrigger
             - user:
                 name: anonymous
                 permissions:
@@ -727,7 +725,7 @@ data:
         createAccountBasedOnEmail: true
         useExistingAccountWithSameEmail: true
       jobConfigHistory:
-        excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml"
+        excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml"
         maxDaysToKeepEntries: "60"
         maxEntriesPerPage: "12"
         maxHistoryEntries: "500"
@@ -868,7 +866,7 @@ data:
               - installSource:
                   installers:
                     - antFromApache:
-                        id: "1.10.12"
+                        id: "1.10.15"
       maven:
         installations:
           - name: "apache-maven-latest"

diff --git a/instances/modeling.emf.egf/target/k8s/statefulset.json b/instances/modeling.emf.egf/target/k8s/statefulset.json
@@ -119,7 +119,12 @@
                         "cpu": "250m"
                      }
                   },
-                  "securityContext": { },
+                  "securityContext": {
+                     "seLinuxOptions": {
+                        "level": "s0:c37,c9",
+                        "type": "spc_t"
+                     }
+                  },
                   "volumeMounts": [
                      {
                         "mountPath": "/var/jenkins",
@@ -137,11 +142,6 @@
                         "mountPath": "/etc/jenkins/",
                         "name": "jenkins-config",
                         "readOnly": true
-                     },
-                     {
-                        "mountPath": "/run/secrets/jenkins/ssh",
-                        "name": "gerrit-ssh-keys",
-                        "readOnly": true
                      }
                   ]
                }
@@ -162,12 +162,6 @@
                      "name": "jenkins-config"
                   },
                   "name": "jenkins-config"
-               },
-               {
-                  "name": "gerrit-ssh-keys",
-                  "secret": {
-                     "secretName": "gerrit-ssh-keys"
-                  }
                }
             ]
          }

diff --git a/instances/technology.m2e/config.jsonnet b/instances/technology.m2e/config.jsonnet
@@ -4,4 +4,5 @@
     displayName: "Eclipse Maven Integration",
     resourcePacks: 2,
   },
+  seLinuxLevel: "s0:c47,c24",
 }
diff --git a/instances/technology.m2e/target/config.json b/instances/technology.m2e/target/config.json
@@ -896,6 +896,7 @@
       },
       "generate": false
    },
+   "seLinuxLevel": "s0:c47,c24",
    "secrets": {
       "dockerconfigjson": {
          "dockerconfigjson-for-pull-as-default": {

diff --git a/instances/technology.m2e/target/jenkins/configuration.yml b/instances/technology.m2e/target/jenkins/configuration.yml
@@ -702,7 +702,7 @@ unclassified:
     createAccountBasedOnEmail: true
     useExistingAccountWithSameEmail: true
   jobConfigHistory:
-    excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml"
+    excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml"
     maxDaysToKeepEntries: "60"
     maxEntriesPerPage: "12"
     maxHistoryEntries: "500"
@@ -843,7 +843,7 @@ tool:
           - installSource:
               installers:
                 - antFromApache:
-                    id: "1.10.12"
+                    id: "1.10.15"
   maven:
     installations:
       - name: "apache-maven-latest"

diff --git a/instances/technology.m2e/target/k8s/configmap-jenkins-config.yml b/instances/technology.m2e/target/k8s/configmap-jenkins-config.yml
@@ -725,7 +725,7 @@ data:
         createAccountBasedOnEmail: true
         useExistingAccountWithSameEmail: true
       jobConfigHistory:
-        excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml"
+        excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml"
         maxDaysToKeepEntries: "60"
         maxEntriesPerPage: "12"
         maxHistoryEntries: "500"
@@ -866,7 +866,7 @@ data:
               - installSource:
                   installers:
                     - antFromApache:
-                        id: "1.10.12"
+                        id: "1.10.15"
       maven:
         installations:
           - name: "apache-maven-latest"

diff --git a/instances/technology.m2e/target/k8s/statefulset.json b/instances/technology.m2e/target/k8s/statefulset.json
@@ -119,7 +119,12 @@
                         "cpu": "550m"
                      }
                   },
-                  "securityContext": { },
+                  "securityContext": {
+                     "seLinuxOptions": {
+                        "level": "s0:c47,c24",
+                        "type": "spc_t"
+                     }
+                  },
                   "volumeMounts": [
                      {
                         "mountPath": "/var/jenkins",

diff --git a/instances/technology.tycho/config.jsonnet b/instances/technology.tycho/config.jsonnet
@@ -10,4 +10,5 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet';
       // https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/1110#note_648658
       permissionsTemplates.user("[email protected]", ["Agent/Connect", "Agent/Disconnect", "Agent/ExtendedRead"])
   },
+  seLinuxLevel: "s0:c56,c10",
 }
diff --git a/instances/technology.tycho/target/config.json b/instances/technology.tycho/target/config.json
@@ -906,6 +906,7 @@
       },
       "generate": false
    },
+   "seLinuxLevel": "s0:c56,c10",
    "secrets": {
       "dockerconfigjson": {
          "dockerconfigjson-for-pull-as-default": {

diff --git a/instances/technology.tycho/target/jenkins/configuration.yml b/instances/technology.tycho/target/jenkins/configuration.yml
@@ -708,7 +708,7 @@ unclassified:
     createAccountBasedOnEmail: true
     useExistingAccountWithSameEmail: true
   jobConfigHistory:
-    excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml"
+    excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml"
     maxDaysToKeepEntries: "60"
     maxEntriesPerPage: "12"
     maxHistoryEntries: "500"
@@ -849,7 +849,7 @@ tool:
           - installSource:
               installers:
                 - antFromApache:
-                    id: "1.10.12"
+                    id: "1.10.15"
   maven:
     installations:
       - name: "apache-maven-latest"

diff --git a/instances/technology.tycho/target/k8s/configmap-jenkins-config.yml b/instances/technology.tycho/target/k8s/configmap-jenkins-config.yml
@@ -731,7 +731,7 @@ data:
         createAccountBasedOnEmail: true
         useExistingAccountWithSameEmail: true
       jobConfigHistory:
-        excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml"
+        excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml"
         maxDaysToKeepEntries: "60"
         maxEntriesPerPage: "12"
         maxHistoryEntries: "500"
@@ -872,7 +872,7 @@ data:
               - installSource:
                   installers:
                     - antFromApache:
-                        id: "1.10.12"
+                        id: "1.10.15"
       maven:
         installations:
           - name: "apache-maven-latest"

diff --git a/instances/technology.tycho/target/k8s/statefulset.json b/instances/technology.tycho/target/k8s/statefulset.json
@@ -119,7 +119,12 @@
                         "cpu": "1750m"
                      }
                   },
-                  "securityContext": { },
+                  "securityContext": {
+                     "seLinuxOptions": {
+                        "level": "s0:c56,c10",
+                        "type": "spc_t"
+                     }
+                  },
                   "volumeMounts": [
                      {
                         "mountPath": "/var/jenkins",

diff --git a/instances/tools.orbit/config.jsonnet b/instances/tools.orbit/config.jsonnet
@@ -3,4 +3,5 @@
     fullName: "tools.orbit",
     displayName: "Eclipse Orbit"
   },
+  seLinuxLevel: "s0:c50,c25",
 }
diff --git a/instances/tools.orbit/target/config.json b/instances/tools.orbit/target/config.json
@@ -896,6 +896,7 @@
       },
       "generate": false
    },
+   "seLinuxLevel": "s0:c50,c25",
    "secrets": {
       "dockerconfigjson": {
          "dockerconfigjson-for-pull-as-default": {

diff --git a/instances/tools.orbit/target/k8s/pv_cephfs_backup.json b/instances/tools.orbit/target/k8s/pv_cephfs_backup.json
@@ -0,0 +1,60 @@
+{
+    "apiVersion": "v1",
+    "kind": "PersistentVolume",
+    "metadata": {
+        "annotations": {
+            "pv.kubernetes.io/provisioned-by": "rook-ceph.cephfs.csi.ceph.com",
+            "volume.kubernetes.io/provisioner-deletion-secret-name": "rook-csi-cephfs-provisioner-ceph-prod-fs-2repl-production-cluster",
+            "volume.kubernetes.io/provisioner-deletion-secret-namespace": "rook-ceph-prod-external"
+        },
+        "creationTimestamp": "2024-11-21T19:22:52Z",
+        "finalizers": [
+            "kubernetes.io/pv-protection"
+        ],
+        "name": "pvc-e64d3bf7-6dda-4192-aef2-65203d7a2b6c",
+        "resourceVersion": "1180539954",
+        "uid": "f4832197-67dd-4587-b418-51cb1b9362ff"
+    },
+    "spec": {
+        "accessModes": [
+            "ReadWriteOnce"
+        ],
+        "capacity": {
+            "storage": "50Gi"
+        },
+        "claimRef": {
+            "apiVersion": "v1",
+            "kind": "PersistentVolumeClaim",
+            "name": "jenkins-home-cephfs-orbit-cephfs-0",
+            "namespace": "orbit",
+            "resourceVersion": "1180539881",
+            "uid": "e64d3bf7-6dda-4192-aef2-65203d7a2b6c"
+        },
+        "csi": {
+            "controllerExpandSecretRef": {
+                "name": "rook-csi-cephfs-provisioner-ceph-prod-cephfs-production-cluster",
+                "namespace": "rook-ceph-prod-external"
+            },
+            "driver": "rook-ceph.cephfs.csi.ceph.com",
+            "nodeStageSecretRef": {
+                "name": "rook-csi-cephfs-node-ceph-prod-fs-2repl-production-cluster",
+                "namespace": "rook-ceph-prod-external"
+            },
+            "volumeAttributes": {
+                "clusterID": "rook-ceph-prod-external",
+                "fsName": "fs-2repl-production-cluster",
+                "pool": "pool-2repl-cephfs-production-cluster-data",
+                "storage.kubernetes.io/csiProvisionerIdentity": "1728978999455-8292-rook-ceph.cephfs.csi.ceph.com",
+                "subvolumeName": "csi-vol-39f2753b-193b-4086-babe-e9cbc7259598",
+                "subvolumePath": "/volumes/csi/csi-vol-39f2753b-193b-4086-babe-e9cbc7259598/ba613a3b-6704-4818-9ec8-b904cdda8328"
+            },
+            "volumeHandle": "0001-0017-rook-ceph-prod-external-0000000000000007-39f2753b-193b-4086-babe-e9cbc7259598"
+        },
+        "persistentVolumeReclaimPolicy": "Retain",
+        "storageClassName": "cephfs-2repl",
+        "volumeMode": "Filesystem"
+    },
+    "status": {
+        "phase": "Bound"
+    }
+}