Merge pull request #7352 from Gacko/lwskn

Ingress NGINX: Deprecate NGINX v1.21.
kubernetes · Oct 1, 2024 · 4445f28 · 4445f28
2 parents 865cad0 + 95c80bd
commit 4445f28
Showing 1 changed file with 51 additions and 51 deletions.
diff --git a/registry.k8s.io/images/k8s-staging-ingress-nginx/images.yaml b/registry.k8s.io/images/k8s-staging-ingress-nginx/images.yaml
@@ -181,57 +181,6 @@
     "sha256:25d6a5f11211cc5c3f9f2bf552b585374af287b4debf693cacbe2da47daa5084": ["v20231226-1a7112e06"]
 
 # Ingress NGINX: NGINX
-- name: nginx
-  dmap:
-    "sha256:3f5e28bb248d5170e77b77fc2a1a385724aeff41a0b34b5afad7dd9cf93de000": ["0b5e0685112e4537ee20a0bdbba451e9f6158aa3"]
-    "sha256:15f91034a03550dfab6ec50a7be4abbb683d087e234ad7fef5adedef54e46a5a": ["0ff500c23f34e939305de709cb6d47da34b66611"]
-    "sha256:46c27294e467f46d0006ad1eb5fd3f7005eb3cbd00dd43be2ed9b02edfc6e828": ["9fdbef829c327b95a3c6d6816a301df41bda997f"]
-    "sha256:b555a13dcc9165157a61b2279ed7f309e406c3267c93472cb6967215eacf4ab3": ["18ee046b432502aedfed9321f0a9b50bfc009a67"]
-    "sha256:da6b877ed96dada46ed6e379051c2dd461dd5d329af7a7531820ad3e16197e20": ["21aa7f55a3325c1c26de0dfb62ede4c0a809a994"]
-    "sha256:86c1581e69dc92d107f8edd36724890ea682a3afda8c1fb1ba41aabc7bc0128d": ["66a760794f91809bcd897cbdb45435653d73fd92"]
-    "sha256:a71ac64dd8cfd68341ba47dbdc4d8c2cb91325fce669875193ea0319118201b5": ["81c2afd975a6f9a9847184472286044d7d5296f6"]
-    "sha256:ec8a104df307f5c6d68157b7ac8e5e1e2c2f0ea07ddf25bb1c6c43c67e351180": ["5402d35663917ccbbf77ff48a22b8c6f77097f48"]
-    "sha256:99f079bc9e418b450e0902ea78e86c70315dad3a420871d29e812c55cc0beea1": ["9960efe1e9a9c6e944967b52e1a8a7b7b659874d"]
-    "sha256:3b650123c755392f8c0eb9a356b12716327106e624ab5f5b43bc25ab130978fb": ["91057c439cf07ffb62887b8a8bda66ce3cbe39ca"]
-    "sha256:03e983f8adb9fdb56bc0b258c9d17e24a183c0728111102b21a31756b5031209": ["ac3bbaf068d099e438444fbfa1b3bd1c31a6a183"]
-    "sha256:9767d829a54c2941780b6e7e32d32ab55ff7bee79fee46d7bf04da3ad4d7166e": ["bf8362cb500b413d04d04b1312df1914b4b193f8"]
-    "sha256:94ff9b435a5f3f4570bbdaed4a3a523f63a54ce2ad6b132b5640bae2af5d9d90": ["c5766dc011965f22fac2f4437e86d0fd9960a50c"]
-    "sha256:a51abd4fd2beb5a93f88ff9859c930d0437250bef90118572ad1127c5b30dfa2": ["c648595cd73a2d605cd7d9575b72b367755c7ec8"]
-    "sha256:18f91105e4099941d2efee71a8ec52c6ef7702d5f7e8214b7cb5f25cc10a0b41": ["cd6f88af3f976a180ed966dadf273473ae768dfa"]
-    "sha256:283c8c6132ebaeb155c927ea6e8ae0cd834a4a05d4807eceafa1b6e44d875911": ["e1a16f6e74ef43cdfd59de75b3394d6b20ef7645"]
-    "sha256:2686073c2ec9e3eae0afd2c26947a38a1d3676bee2f33c0f7245bd326e25a459": ["e3e0d9c1f487cf00c02a2a0ca579f4aff9698e59"]
-    "sha256:f0d8d32a20f8c1a7c98b504a03b162931d93edd60ecc2c745917a32e9e3e92ad": ["f0490cbfbf29a7a05caaac29998dde56173ac2bb"]
-    "sha256:35da1d3e00f5e763e59cb59159bf88ba0f0b6e8835885ac9d8b63029a478dba7": ["v20200625-g1813d1c56"]
-    "sha256:b0727cebafc35f5ab50f3fa0be5fda7f79937f1683f525f40982e75b882195d8": ["v20200708-g00f4a215d"]
-    "sha256:d731d822e8a29627d91aac928a8c2b337c68d04b6abb248acbc1826f289f73d0": ["v20200811-g4ecd38dca"]
-    "sha256:3bafc6840f2477c05eb029580fa8ecf4bd33b0f0765e3cd9cc82ad91f817ccf3": ["v20200812-g0673e5e17"]
-    "sha256:ef38aa45e7ae82b311f3287e53c4e0b3f1c000b6394ffe5cdb74d25aa149c567": ["v20200903-g333288e75"]
-    "sha256:646a0815768536be16d180e4fb218d88527b42effadbeab39589261d916b17ee": ["v20200909-ge480f024e"]
-    "sha256:edaa16fa38c9c638180e9e71952f464fadebf11d450a0647146b33d05236879b": ["v20200929-gc8c69df30"]
-    "sha256:e1e56f7cddc1fd20f03bedf0ec12862c59af64a35de8f73fee0d505f41024b44": ["v20201008-ge90b55900"]
-    "sha256:bd22e4f9bbf88aee527a86692be4442d03fa1ef2df94356312c9db8bec1f7ea3": ["v20201028-g2c1279cd8"]
-    "sha256:460be3452745c8bd944bee8435df962f53082e6f346b9f1742f6d803fe985ac4": ["v20201215-ga48ae4203"]
-    "sha256:b92a94876aa3795480b1b3076f6feea1e93b015bcf052ff517f3a6827a72b9ef": ["v20201226-g944d36fdb"]
-    "sha256:2db55a11e6a1d9dfa690c7667d3936de1c0fd48855e7b60ab31e6c98e31e5354": ["v20201230-g0cca8e83c"]
-    "sha256:edd1d06bc6892b0dfb42de7d782ceb3c50eec843b09024abf3f95ba23f4feed5": ["v20210104-g2254a9186"]
-    "sha256:224da667cf3047998ea691e9766fedd1eab94257a39df81374bfa14536da3688": ["v20210115-gba0502603"]
-    "sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6": ["v20210324-g8baef769d"]
-    "sha256:a7356029dd0c26cc3466bf7a27daec0f4df73aa14ca6c8b871a767022a812c0b": ["v20210530-g6aab4c291"]
-    "sha256:f9363669cf26514c9548c1fe4f8f4e2f58dfb76616bcd638a0ff7f0ec3457c17": ["v20210809-g98288bc3c"]
-    "sha256:fac972a7e43b18408ecb9e87da868df519428294e2e988c16be72479ee873c0e": ["v20210904-gb7c973dce"]
-    "sha256:8c1e48123e64e3f2b90ed32a53babd9b5f5431dad26beecdcb8fc185ded3b6dd": ["v20210915-g498892514"]
-    "sha256:1ef404b5e8741fe49605a1f40c3fdd8ef657aecdb9526ea979d1672eeabd0cd9": ["v20210926-g5662db450"]
-    "sha256:ee001455750923c131bff706f20cd95078a78c9538ab0c15f754fd9af7fe9656": ["v20220318-controller-v1.1.2-21-ge51c15160"]
-    "sha256:b05566e432d85a7681feb7ef93fda8385d53712478737b39e617c993c86c5e65": ["v20230526"]
-    "sha256:cf77c71aa6e4284925ca2233ddf871b5823eaa3ee000347ae25096b07fb52c57": ["v20230527"]
-    "sha256:7b479f66872c0b1cb0f1315e305b8a3e9c6da846c7dd3855db99bc8cfd6791e1": ["v20230623-427f3d2fb"]
-    "sha256:9dfb1909b4ffd3e3f046db0684c63aeb41e3b7b9732629c2dae09af4e59fc56e": ["v20230722-86c00a231"]
-    "sha256:34881d62f71e8573fb765c40585dba28a1148206fbbe2c3871ad3f4e8c6e360f": ["v20231011-8b53cabe0"]
-    "sha256:ca1349074a0d087d8fca347ea4c04fa12c0275f53f72d6f65118307285efc8ca": ["v20231129-9439e6c71"]
-    "sha256:03508408458d00ba4e219d2693ba2a039ba66d4151ab9b43794f61877e0abb73": ["v20231208-4c39e6acc"]
-    "sha256:5cab44b8639a5908db8ad1d7f0b5333346a6a0164cb6d35a0dce3d72839226dd": ["v20231215-ca91adaad"]
-
-# Ingress NGINX: NGINX v1.25
 - name: nginx-1.25
   dmap:
     "sha256:cdafd6c9d36e23414ce41330a482f9136ce82fac46802809681f61cdcd5ad0bb": ["v0.0.5"]
@@ -366,6 +315,57 @@
     "sha256:a5df4671eb4c53a44fb83b55a0db9742d6088eb2a2453e0ed468b55da4ffa6df": ["v20230721-40f94ef1b"]
     "sha256:5519997c2b582c37358cae8956ca3d8855c669d91306adc1c155beb16e8d431b": ["v20231011-8b53cabe0"]
 
+# Ingress NGINX: NGINX v1.21
+- name: nginx
+  dmap:
+    "sha256:3f5e28bb248d5170e77b77fc2a1a385724aeff41a0b34b5afad7dd9cf93de000": ["0b5e0685112e4537ee20a0bdbba451e9f6158aa3"]
+    "sha256:15f91034a03550dfab6ec50a7be4abbb683d087e234ad7fef5adedef54e46a5a": ["0ff500c23f34e939305de709cb6d47da34b66611"]
+    "sha256:46c27294e467f46d0006ad1eb5fd3f7005eb3cbd00dd43be2ed9b02edfc6e828": ["9fdbef829c327b95a3c6d6816a301df41bda997f"]
+    "sha256:b555a13dcc9165157a61b2279ed7f309e406c3267c93472cb6967215eacf4ab3": ["18ee046b432502aedfed9321f0a9b50bfc009a67"]
+    "sha256:da6b877ed96dada46ed6e379051c2dd461dd5d329af7a7531820ad3e16197e20": ["21aa7f55a3325c1c26de0dfb62ede4c0a809a994"]
+    "sha256:86c1581e69dc92d107f8edd36724890ea682a3afda8c1fb1ba41aabc7bc0128d": ["66a760794f91809bcd897cbdb45435653d73fd92"]
+    "sha256:a71ac64dd8cfd68341ba47dbdc4d8c2cb91325fce669875193ea0319118201b5": ["81c2afd975a6f9a9847184472286044d7d5296f6"]
+    "sha256:ec8a104df307f5c6d68157b7ac8e5e1e2c2f0ea07ddf25bb1c6c43c67e351180": ["5402d35663917ccbbf77ff48a22b8c6f77097f48"]
+    "sha256:99f079bc9e418b450e0902ea78e86c70315dad3a420871d29e812c55cc0beea1": ["9960efe1e9a9c6e944967b52e1a8a7b7b659874d"]
+    "sha256:3b650123c755392f8c0eb9a356b12716327106e624ab5f5b43bc25ab130978fb": ["91057c439cf07ffb62887b8a8bda66ce3cbe39ca"]
+    "sha256:03e983f8adb9fdb56bc0b258c9d17e24a183c0728111102b21a31756b5031209": ["ac3bbaf068d099e438444fbfa1b3bd1c31a6a183"]
+    "sha256:9767d829a54c2941780b6e7e32d32ab55ff7bee79fee46d7bf04da3ad4d7166e": ["bf8362cb500b413d04d04b1312df1914b4b193f8"]
+    "sha256:94ff9b435a5f3f4570bbdaed4a3a523f63a54ce2ad6b132b5640bae2af5d9d90": ["c5766dc011965f22fac2f4437e86d0fd9960a50c"]
+    "sha256:a51abd4fd2beb5a93f88ff9859c930d0437250bef90118572ad1127c5b30dfa2": ["c648595cd73a2d605cd7d9575b72b367755c7ec8"]
+    "sha256:18f91105e4099941d2efee71a8ec52c6ef7702d5f7e8214b7cb5f25cc10a0b41": ["cd6f88af3f976a180ed966dadf273473ae768dfa"]
+    "sha256:283c8c6132ebaeb155c927ea6e8ae0cd834a4a05d4807eceafa1b6e44d875911": ["e1a16f6e74ef43cdfd59de75b3394d6b20ef7645"]
+    "sha256:2686073c2ec9e3eae0afd2c26947a38a1d3676bee2f33c0f7245bd326e25a459": ["e3e0d9c1f487cf00c02a2a0ca579f4aff9698e59"]
+    "sha256:f0d8d32a20f8c1a7c98b504a03b162931d93edd60ecc2c745917a32e9e3e92ad": ["f0490cbfbf29a7a05caaac29998dde56173ac2bb"]
+    "sha256:35da1d3e00f5e763e59cb59159bf88ba0f0b6e8835885ac9d8b63029a478dba7": ["v20200625-g1813d1c56"]
+    "sha256:b0727cebafc35f5ab50f3fa0be5fda7f79937f1683f525f40982e75b882195d8": ["v20200708-g00f4a215d"]
+    "sha256:d731d822e8a29627d91aac928a8c2b337c68d04b6abb248acbc1826f289f73d0": ["v20200811-g4ecd38dca"]
+    "sha256:3bafc6840f2477c05eb029580fa8ecf4bd33b0f0765e3cd9cc82ad91f817ccf3": ["v20200812-g0673e5e17"]
+    "sha256:ef38aa45e7ae82b311f3287e53c4e0b3f1c000b6394ffe5cdb74d25aa149c567": ["v20200903-g333288e75"]
+    "sha256:646a0815768536be16d180e4fb218d88527b42effadbeab39589261d916b17ee": ["v20200909-ge480f024e"]
+    "sha256:edaa16fa38c9c638180e9e71952f464fadebf11d450a0647146b33d05236879b": ["v20200929-gc8c69df30"]
+    "sha256:e1e56f7cddc1fd20f03bedf0ec12862c59af64a35de8f73fee0d505f41024b44": ["v20201008-ge90b55900"]
+    "sha256:bd22e4f9bbf88aee527a86692be4442d03fa1ef2df94356312c9db8bec1f7ea3": ["v20201028-g2c1279cd8"]
+    "sha256:460be3452745c8bd944bee8435df962f53082e6f346b9f1742f6d803fe985ac4": ["v20201215-ga48ae4203"]
+    "sha256:b92a94876aa3795480b1b3076f6feea1e93b015bcf052ff517f3a6827a72b9ef": ["v20201226-g944d36fdb"]
+    "sha256:2db55a11e6a1d9dfa690c7667d3936de1c0fd48855e7b60ab31e6c98e31e5354": ["v20201230-g0cca8e83c"]
+    "sha256:edd1d06bc6892b0dfb42de7d782ceb3c50eec843b09024abf3f95ba23f4feed5": ["v20210104-g2254a9186"]
+    "sha256:224da667cf3047998ea691e9766fedd1eab94257a39df81374bfa14536da3688": ["v20210115-gba0502603"]
+    "sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6": ["v20210324-g8baef769d"]
+    "sha256:a7356029dd0c26cc3466bf7a27daec0f4df73aa14ca6c8b871a767022a812c0b": ["v20210530-g6aab4c291"]
+    "sha256:f9363669cf26514c9548c1fe4f8f4e2f58dfb76616bcd638a0ff7f0ec3457c17": ["v20210809-g98288bc3c"]
+    "sha256:fac972a7e43b18408ecb9e87da868df519428294e2e988c16be72479ee873c0e": ["v20210904-gb7c973dce"]
+    "sha256:8c1e48123e64e3f2b90ed32a53babd9b5f5431dad26beecdcb8fc185ded3b6dd": ["v20210915-g498892514"]
+    "sha256:1ef404b5e8741fe49605a1f40c3fdd8ef657aecdb9526ea979d1672eeabd0cd9": ["v20210926-g5662db450"]
+    "sha256:ee001455750923c131bff706f20cd95078a78c9538ab0c15f754fd9af7fe9656": ["v20220318-controller-v1.1.2-21-ge51c15160"]
+    "sha256:b05566e432d85a7681feb7ef93fda8385d53712478737b39e617c993c86c5e65": ["v20230526"]
+    "sha256:cf77c71aa6e4284925ca2233ddf871b5823eaa3ee000347ae25096b07fb52c57": ["v20230527"]
+    "sha256:7b479f66872c0b1cb0f1315e305b8a3e9c6da846c7dd3855db99bc8cfd6791e1": ["v20230623-427f3d2fb"]
+    "sha256:9dfb1909b4ffd3e3f046db0684c63aeb41e3b7b9732629c2dae09af4e59fc56e": ["v20230722-86c00a231"]
+    "sha256:34881d62f71e8573fb765c40585dba28a1148206fbbe2c3871ad3f4e8c6e360f": ["v20231011-8b53cabe0"]
+    "sha256:ca1349074a0d087d8fca347ea4c04fa12c0275f53f72d6f65118307285efc8ca": ["v20231129-9439e6c71"]
+    "sha256:03508408458d00ba4e219d2693ba2a039ba66d4151ab9b43794f61877e0abb73": ["v20231208-4c39e6acc"]
+    "sha256:5cab44b8639a5908db8ad1d7f0b5333346a6a0164cb6d35a0dce3d72839226dd": ["v20231215-ca91adaad"]
+
 # Ingress NGINX: OpenTelemetry
 - name: opentelemetry
   dmap: