containerd: add OOMScoreAdjust to containerd service (microsoft#8322)

archana25-ms · Mar 8, 2024 · 25b405a · 25b405a
1 parent ca73d53
commit 25b405a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/SPECS/containerd/containerd.service b/SPECS/containerd/containerd.service
@@ -9,6 +9,7 @@ ExecStart=/usr/bin/containerd
 Restart=always
 Delegate=yes
 KillMode=process
+OOMScoreAdjust=-999
 
 [Install]
 WantedBy=multi-user.target
diff --git a/SPECS/containerd/containerd.signatures.json b/SPECS/containerd/containerd.signatures.json
@@ -1,6 +1,6 @@
 {
  "Signatures": {
-  "containerd.service": "b7908653ff8298fc8c1c21854a6e338f40c607ec40d177269615a8f3448c5153",
+  "containerd.service": "a07bfcf412669b06673190b0779f48e652c9adcf1758289e849a00802804eec8",
   "containerd.toml": "793d4f11a4e69bdb3b1903da2cdf76b7f32dbc97197b12d295a05ecc284e230e",
   "containerd-1.7.13.tar.gz": "ae2b914bff0ddbb9b29d5fc689a51e1ce89ea4edfc4df9ae10517c6f5d2d5aaf"
  }

diff --git a/SPECS/containerd/containerd.spec b/SPECS/containerd/containerd.spec
@@ -4,7 +4,7 @@
 Summary: Industry-standard container runtime
 Name: containerd
 Version: 1.7.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: Tools/Container
 URL: https://www.containerd.io
@@ -85,6 +85,9 @@ fi
 %dir /opt/containerd/lib
 
 %changelog
+* Fri Mar 08 2024 Henry Beberman <[email protected]> - 1.7.13-2
+- Add OOMScoreAdjust -999 to containerd.service
+
 * Fri Feb 23 2024 Henry Beberman <[email protected]> - 1.7.13-1
 - Rename package to containerd
 - Upgrade to 1.7.13, remove unused patches

diff --git a/SPECS/moby-containerd-cc/containerd.service b/SPECS/moby-containerd-cc/containerd.service
@@ -9,6 +9,7 @@ ExecStart=/usr/bin/containerd
 Restart=always
 Delegate=yes
 KillMode=process
+OOMScoreAdjust=-999
 
 [Install]
 WantedBy=multi-user.target
diff --git a/SPECS/moby-containerd-cc/moby-containerd-cc.signatures.json b/SPECS/moby-containerd-cc/moby-containerd-cc.signatures.json
@@ -1,6 +1,6 @@
 {
   "Signatures": {
-    "containerd.service": "b7908653ff8298fc8c1c21854a6e338f40c607ec40d177269615a8f3448c5153",
+    "containerd.service": "a07bfcf412669b06673190b0779f48e652c9adcf1758289e849a00802804eec8",
     "containerd.toml": "a228a28965a30845c10bae150fb5bc60a07f5bc0f78d5b17bfaa6cf48a47a7ca",
     "moby-containerd-cc-1.7.1.tar.gz": "f8969a4e03d42f49a7788d2021f38861f34c9136829a2906fcbd9a0bf79c8f96"
   }

diff --git a/SPECS/moby-containerd-cc/moby-containerd-cc.spec b/SPECS/moby-containerd-cc/moby-containerd-cc.spec
@@ -6,7 +6,7 @@
 Summary: Industry-standard container runtime for confidential containers
 Name: moby-%{upstream_name}
 Version: 1.7.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: ASL 2.0
 Group: Tools/Container
 URL: https://www.containerd.io
@@ -76,6 +76,9 @@ fi
 %config(noreplace) %{_sysconfdir}/containerd/config.toml
 
 %changelog
+* Fri Mar 08 2024 Henry Beberman <[email protected]> - 1.7.1-8
+- Add OOMScoreAdjust -999 to containerd.service
+
 * Wed Mar 06 2024 Manuel Huber <[email protected]> - 1.7.1-7
 - Drop obsolete 'btrfs-progs-devel' build dependency