Merge pull request #5616 from djoshy/update-ami

NO-ISSUE: Update AMI script and list

Author: openshift-merge-bot[bot]

hack/update_amis.py

@@ -221,7 +221,7 @@ def main():
     # Determine the project root (parent of hack directory)
     script_dir = Path(__file__).parent.resolve()
     project_root = script_dir.parent
-    AMI_GO_FILE = project_root / "pkg/controller/machine-set-boot-image/ami.go"
+    AMI_GO_FILE = project_root / "pkg/controller/bootimage/ami.go"
 
     # Check if ami.go exists
     if not AMI_GO_FILE.exists():
@@ -238,7 +238,7 @@ def main():
     log_info("Walking through entire git history to collect all AMIs...")
 
     # Create temporary directory and clone with filter
-    with tempfile.TemporaryDirectory() as temp_dir:
+    with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as temp_dir:
         repo_path = Path(temp_dir)
 
         log_info(f"Cloning repository with full history for {FILE_PATH}...")

pkg/controller/bootimage/ami.go

@@ -1610,5 +1610,46 @@ var AllowedAMIs = sets.New(
 	"ami-0fce6c634ad46ed2e", "ami-0fd105cfc3f17a162", "ami-0fd188f09e5e2df2d", "ami-0fd2a3fdbe3135cd4", "ami-0fd77b9b31046643e",
 	"ami-0fdb98a22840f76d1", "ami-0fe11729a38bb8458", "ami-0fe91b3ba9260fb63", "ami-0fef258bfa767590e", "ami-0fef5532c8b3d9424",
 	"ami-0ff26d140edcbf079", "ami-0ff2a84a7f39e9209", "ami-0ff36a21094797b8c", "ami-0ff3db724afebe9bb", "ami-0ff6c856ba89744e8",
-	"ami-0ffeaf0e7a7c3fb94",
+	"ami-0ffeaf0e7a7c3fb94", "ami-00122d5ac8e61a920", "ami-00147afa35f18c612", "ami-0028d62ce151cb1f1", "ami-00377959ff7cf0ed6",
+	"ami-003e58022c051040e", "ami-0047a1fdd4844608d", "ami-0049bd4c2c9f9eb6b", "ami-005fd8e544fb4fb71", "ami-006a33223c87af648",
+	"ami-00a88a6e634ac6676", "ami-00b7abd2378a23c3d", "ami-00be64f508df27900", "ami-00c0f1b2fc7ab92d4", "ami-00cb7a4812319b46a",
+	"ami-00e46647409373ccd", "ami-010e028e80d902a46", "ami-01469b817e364700f", "ami-015f20039cd6a920b", "ami-01718000bd7650956",
+	"ami-01744b2421a2a7528", "ami-01804615464b3fa7f", "ami-0183001bfd7b04a74", "ami-0185042d2323ab5b2", "ami-018e1c615c4bfffd6",
+	"ami-01a49ace97bb5804c", "ami-01a7ded1f488310ae", "ami-01c3b55a857ad1db3", "ami-01c8221c9a56e0c74", "ami-01d0891e1fa7c28fe",
+	"ami-01e1ea8f4552f5d49", "ami-020580d0094aad79b", "ami-023dae7837b26b43e", "ami-02571eee09fd2067f", "ami-0262e74400e67e377",
+	"ami-0265ec024c31e7603", "ami-0268f6527bccf84c6", "ami-02822b9d01e073e65", "ami-028a26fbc22b95470", "ami-028f2a6bc11075e78",
+	"ami-02a3eb8a029fc6a91", "ami-02c48b6c8488542b2", "ami-02dabe38e11e0be40", "ami-02ffd1d5ed7351ceb", "ami-032e08fde31f0a6cc",
+	"ami-03335cd0583f09a92", "ami-03721e932164062f0", "ami-038ce19f4290ced4c", "ami-03937ceb129e80f21", "ami-039ca2cb0afd8c275",
+	"ami-03a6ddee59246ab62", "ami-03ad8dfd00457b6aa", "ami-03aed17ea188e9d92", "ami-03c7ddb1e5314f138", "ami-03ce4d4bb4f67e777",
+	"ami-03d8bfd58de713367", "ami-04018496b0a1da2d2", "ami-040c20d38a56a878d", "ami-0411309bf22fb1139", "ami-0411a4dd8cbf726db",
+	"ami-042feba6717887157", "ami-043e9d5894e68426d", "ami-04474fd6b98762a98", "ami-044d4ceda29b3ae61", "ami-044f6be5ddc9043c1",
+	"ami-046265b58e108ce9d", "ami-04675f1b0e889c289", "ami-04687750801886a46", "ami-047a9bf27c7448475", "ami-04941543f3e575579",
+	"ami-04a266a067396c6b2", "ami-04c75dcb69da9704b", "ami-04dd4c56b43a23fb5", "ami-052259adcd061bc9a", "ami-0541a60892c677593",
+	"ami-05478426f756db81c", "ami-054eb3c4286f4dbca", "ami-054f384036093db98", "ami-0568a9d7812d8306c", "ami-0569abe19529c8b10",
+	"ami-0570e9cfb088e1cf0", "ami-057fc4518e613e0e7", "ami-05829d8d5c031e4a8", "ami-05ab0cf33b0e946a7", "ami-05b83dea4f866fe0d",
+	"ami-05c93b2ffa2819119", "ami-05cd3ce55a1f00a2b", "ami-05db797d370786c2c", "ami-05ddf59e283155ea1", "ami-05df0807fa938c2ac",
+	"ami-05e2f026089764e17", "ami-060ecb2bc2fa9a26d", "ami-06149aec55f3e1d6c", "ami-0614efde957eed218", "ami-061a848a463ac34cc",
+	"ami-0632ffa330e30aea1", "ami-0676d90a27bb5de59", "ami-06b01b6460947cd34", "ami-06ca6a39e6b6bdaaa", "ami-06ea845fe728a8891",
+	"ami-06f1790ede94f05bb", "ami-07373c702177ea4f6", "ami-074b751c8fd1b4352", "ami-07680a1b8de089d13", "ami-076caa125c9655f61",
+	"ami-07bb8c4c6000bdd53", "ami-07d83e72beff3eb6c", "ami-08066b4a2c0a88670", "ami-085479db4c7de2f61", "ami-085607af8f322e956",
+	"ami-086cc002b6d450301", "ami-088bb0be24ee36810", "ami-08950fa455701f288", "ami-089cc33bc4f453a4f", "ami-08bbe5267ab44c03b",
+	"ami-08d2b6bcaca241f2c", "ami-08f1c0c6caafcf2c5", "ami-08f548f5be577ce2d", "ami-08fc4dcec9ef85a97", "ami-090084b481adf23e9",
+	"ami-0903153a907ee1c14", "ami-095386042a7673286", "ami-097ffb6f644b7bad1", "ami-099271017e446edb7", "ami-09aff5ac8bd25e9b8",
+	"ami-09b223a7c699ecde8", "ami-09c783ffb0c11a817", "ami-09c91e670678ce2c1", "ami-09cde51703738523d", "ami-09f0f012b2c626f59",
+	"ami-09fe84b542894b7b8", "ami-0a0391de700b812ae", "ami-0a1cc6a65238669f3", "ami-0a2e8cab5b17d37a7", "ami-0a3b22174319ad66e",
+	"ami-0a43c04558792823c", "ami-0a44bb6d4903a93a1", "ami-0a62c879da82e8f99", "ami-0a6a284e74f2e9afd", "ami-0a7587d3b80d854a7",
+	"ami-0aed5d16198d8f0c3", "ami-0af3988f6b0fbee7f", "ami-0af72833671d615f1", "ami-0b05862564ac8353d", "ami-0b183fafd7eeae965",
+	"ami-0b23054e68ef5ec3b", "ami-0b23e452c6ef61561", "ami-0b24c5cec9d22bc4b", "ami-0b264801b0e00009c", "ami-0b33e5fa839bd9402",
+	"ami-0b4752c7b345e3de3", "ami-0b4c8eb083314dcbf", "ami-0b5b9be3ea6fc17de", "ami-0b5c724cf40784def", "ami-0b6f85f496fb5d5a4",
+	"ami-0b75a0095e400b302", "ami-0b84ed8e08d76c662", "ami-0bd0a6b691937ab01", "ami-0bd9fd38420abcef7", "ami-0c03cca2c3178b22a",
+	"ami-0c144ed9a6c7b1c5b", "ami-0c27520bfa297e78a", "ami-0c2766bed8642ec80", "ami-0c2bafedf2fc1dfc3", "ami-0c4cb83cc7e4ec057",
+	"ami-0c62d29b1c87b080d", "ami-0c7461830f8ce2661", "ami-0cac0742eaf194409", "ami-0cae26f807e55cec2", "ami-0cb8e17a3153ba5b3",
+	"ami-0cd2bd65b0d629cf3", "ami-0d08ccc7bcf77433d", "ami-0d0e4d9fd6230a686", "ami-0d19d79e52ad365c8", "ami-0d48a47b22126286b",
+	"ami-0d5a963b3ec3f6f06", "ami-0d6f0c1a044b6848f", "ami-0d7c8859dc8f2ac02", "ami-0d7cd25aa1c2710b2", "ami-0d869f95d599ce4a4",
+	"ami-0d89f0bf3a03d4d8c", "ami-0d9c31d261926bc88", "ami-0dac5438f83a2fd80", "ami-0dad11fecc11e858b", "ami-0db9ba4e39c2eaba5",
+	"ami-0dc4ac6e428d0793d", "ami-0de1744ca27e964ce", "ami-0de88496066d7428e", "ami-0df3e903f8cbb14b0", "ami-0e0850e74100f0f31",
+	"ami-0e0bd2ecbbdc04568", "ami-0e1d89645676202af", "ami-0e2fa5fb90bfe56d9", "ami-0e4e8493548b09b54", "ami-0e57b7ffe1095cbef",
+	"ami-0e6c67a8674179e1b", "ami-0e845ff8f43225df7", "ami-0e896b8e4e7de42be", "ami-0eaab2e9dd28dc852", "ami-0ed85c100ca774a06",
+	"ami-0eeea15b1c070e051", "ami-0f23efddf2ba41f5a", "ami-0f63d94711c4c3663", "ami-0f6479fb82d8108d1", "ami-0f684b45a6e89dce2",
+	"ami-0f872380c3a5cd4b2", "ami-0f99194701f0b95c9", "ami-0fa3e446c3007f39e", "ami-0fd0c820ea9c05888", "ami-0fd7c367ed8a90d52",
 )