From 252e88d3e8d296c428d9ee16150ea631c2282c89 Mon Sep 17 00:00:00 2001 From: arkadeepsen Date: Fri, 20 Sep 2024 16:46:04 +0530 Subject: [PATCH 1/2] UPSTREAM: : Update Pipfile and Pipfile.lock for upgrading packages with vulnerabilities --- images/ansible-operator/Pipfile | 4 +- images/ansible-operator/Pipfile.lock | 368 ++++++++++++++------------- 2 files changed, 194 insertions(+), 178 deletions(-) diff --git a/images/ansible-operator/Pipfile b/images/ansible-operator/Pipfile index faf73579..b2c377d5 100644 --- a/images/ansible-operator/Pipfile +++ b/images/ansible-operator/Pipfile @@ -7,8 +7,10 @@ name = "pypi" ansible-runner = "~=2.3.3" ansible-runner-http = "~=1.0.0" ansible-core = "~=2.15.9" -urllib3 = "~=1.26.17" +urllib3 = "~=1.26.19" kubernetes = "==29.0.0" +requests = "==2.31.0" +setuptools = "==70.0.0" [dev-packages] diff --git a/images/ansible-operator/Pipfile.lock b/images/ansible-operator/Pipfile.lock index 4b1bf4d9..704ce1e8 100644 --- a/images/ansible-operator/Pipfile.lock +++ b/images/ansible-operator/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "7ede654b3fe5d96bff5fa2283bcd81cb8d589f19351ceaed91b0649cb7f390ae" + "sha256": "4f26b656a7025af4938cabac2d3468ecc852960fa0c036d1c3dc64e73bbefbf8" }, "pipfile-spec": 6, "requires": { @@ -18,12 +18,12 @@ "default": { "ansible-core": { "hashes": [ - "sha256:8368f64e6596f009ddf308eab8ac32ae1e2642ec5c0d4c03366e673de14f144c", - "sha256:b7761454c923f63a3d1fcac97b14e378bcc9a8518c3dde07f3ec0988c4667a9d" + "sha256:390edd603420122f7cb1c470d8d1f8bdbbd795a1844dd03c1917db21935aecb9", + "sha256:5fde82cd3928d9857ad880782c644f27d3168b0f25321d5a8d6befa524aa1818" ], "index": "pypi", "markers": "python_version >= '3.9'", - "version": "==2.15.11" + "version": "==2.15.12" }, "ansible-runner": { "hashes": [ @@ -44,77 +44,92 @@ }, "cachetools": { "hashes": [ - "sha256:0abad1021d3f8325b2fc1d2e9c8b9c9d57b04c3932657a72465447332c24d945", - "sha256:ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105" + "sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292", + "sha256:2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a" ], "markers": "python_version >= '3.7'", - "version": "==5.3.3" + "version": "==5.5.0" }, "certifi": { "hashes": [ - "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f", - "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1" + "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8", + "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9" ], "markers": "python_version >= '3.6'", - "version": "==2024.2.2" + "version": "==2024.8.30" }, "cffi": { "hashes": [ - "sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc", - "sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a", - "sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417", - "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab", - "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520", - "sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36", - "sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743", - "sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8", - "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed", - "sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684", - "sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56", - "sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324", - "sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d", - "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235", - "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e", - "sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088", - "sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000", - "sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7", - "sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e", - "sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673", - "sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c", - "sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe", - "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2", - "sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098", - "sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8", - "sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a", - "sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0", - "sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b", - "sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896", - "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e", - "sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9", - "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2", - "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b", - "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6", - "sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404", - "sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f", - "sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0", - "sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4", - "sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc", - "sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936", - "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba", - "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872", - "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb", - "sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614", - "sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1", - "sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d", - "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969", - "sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b", - "sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4", - "sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627", - "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956", - "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357" + "sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8", + "sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2", + "sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1", + "sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15", + "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36", + "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824", + "sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8", + "sha256:28b16024becceed8c6dfbc75629e27788d8a3f9030691a1dbf9821a128b22c36", + "sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17", + "sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf", + "sha256:31000ec67d4221a71bd3f67df918b1f88f676f1c3b535a7eb473255fdc0b83fc", + "sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3", + "sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed", + "sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702", + "sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1", + "sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8", + "sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903", + "sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6", + "sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d", + "sha256:636062ea65bd0195bc012fea9321aca499c0504409f413dc88af450b57ffd03b", + "sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e", + "sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be", + "sha256:6f17be4345073b0a7b8ea599688f692ac3ef23ce28e5df79c04de519dbc4912c", + "sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683", + "sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9", + "sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c", + "sha256:7596d6620d3fa590f677e9ee430df2958d2d6d6de2feeae5b20e82c00b76fbf8", + "sha256:78122be759c3f8a014ce010908ae03364d00a1f81ab5c7f4a7a5120607ea56e1", + "sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4", + "sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655", + "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67", + "sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595", + "sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0", + "sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65", + "sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41", + "sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6", + "sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401", + "sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6", + "sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3", + "sha256:b2ab587605f4ba0bf81dc0cb08a41bd1c0a5906bd59243d56bad7668a6fc6c16", + "sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93", + "sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e", + "sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4", + "sha256:c7eac2ef9b63c79431bc4b25f1cd649d7f061a28808cbc6c47b534bd789ef964", + "sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c", + "sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576", + "sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0", + "sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3", + "sha256:d016c76bdd850f3c626af19b0542c9677ba156e4ee4fccfdd7848803533ef662", + "sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3", + "sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff", + "sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5", + "sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd", + "sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f", + "sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5", + "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14", + "sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d", + "sha256:e221cf152cff04059d011ee126477f0d9588303eb57e88923578ace7baad17f9", + "sha256:e31ae45bc2e29f6b2abd0de1cc3b9d5205aa847cafaecb8af1476a609a2f6eb7", + "sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382", + "sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a", + "sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e", + "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a", + "sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4", + "sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99", + "sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87", + "sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b" ], "markers": "platform_python_implementation != 'PyPy'", - "version": "==1.16.0" + "version": "==1.17.1" }, "charset-normalizer": { "hashes": [ @@ -214,41 +229,36 @@ }, "cryptography": { "hashes": [ - "sha256:02c0eee2d7133bdbbc5e24441258d5d2244beb31da5ed19fbb80315f4bbbff55", - "sha256:0d563795db98b4cd57742a78a288cdbdc9daedac29f2239793071fe114f13785", - "sha256:16268d46086bb8ad5bf0a2b5544d8a9ed87a0e33f5e77dd3c3301e63d941a83b", - "sha256:1a58839984d9cb34c855197043eaae2c187d930ca6d644612843b4fe8513c886", - "sha256:2954fccea107026512b15afb4aa664a5640cd0af630e2ee3962f2602693f0c82", - "sha256:2e47577f9b18723fa294b0ea9a17d5e53a227867a0a4904a1a076d1646d45ca1", - "sha256:31adb7d06fe4383226c3e963471f6837742889b3c4caa55aac20ad951bc8ffda", - "sha256:3577d029bc3f4827dd5bf8bf7710cac13527b470bbf1820a3f394adb38ed7d5f", - "sha256:36017400817987670037fbb0324d71489b6ead6231c9604f8fc1f7d008087c68", - "sha256:362e7197754c231797ec45ee081f3088a27a47c6c01eff2ac83f60f85a50fe60", - "sha256:3de9a45d3b2b7d8088c3fbf1ed4395dfeff79d07842217b38df14ef09ce1d8d7", - "sha256:4f698edacf9c9e0371112792558d2f705b5645076cc0aaae02f816a0171770fd", - "sha256:5482e789294854c28237bba77c4c83be698be740e31a3ae5e879ee5444166582", - "sha256:5e44507bf8d14b36b8389b226665d597bc0f18ea035d75b4e53c7b1ea84583cc", - "sha256:779245e13b9a6638df14641d029add5dc17edbef6ec915688f3acb9e720a5858", - "sha256:789caea816c6704f63f6241a519bfa347f72fbd67ba28d04636b7c6b7da94b0b", - "sha256:7f8b25fa616d8b846aef64b15c606bb0828dbc35faf90566eb139aa9cff67af2", - "sha256:8cb8ce7c3347fcf9446f201dc30e2d5a3c898d009126010cbd1f443f28b52678", - "sha256:93a3209f6bb2b33e725ed08ee0991b92976dfdcf4e8b38646540674fc7508e13", - "sha256:a3a5ac8b56fe37f3125e5b72b61dcde43283e5370827f5233893d461b7360cd4", - "sha256:a47787a5e3649008a1102d3df55424e86606c9bae6fb77ac59afe06d234605f8", - "sha256:a79165431551042cc9d1d90e6145d5d0d3ab0f2d66326c201d9b0e7f5bf43604", - "sha256:a987f840718078212fdf4504d0fd4c6effe34a7e4740378e59d47696e8dfb477", - "sha256:a9bc127cdc4ecf87a5ea22a2556cab6c7eda2923f84e4f3cc588e8470ce4e42e", - "sha256:bd13b5e9b543532453de08bcdc3cc7cebec6f9883e886fd20a92f26940fd3e7a", - "sha256:c65f96dad14f8528a447414125e1fc8feb2ad5a272b8f68477abbcc1ea7d94b9", - "sha256:d8e3098721b84392ee45af2dd554c947c32cc52f862b6a3ae982dbb90f577f14", - "sha256:e6b79d0adb01aae87e8a44c2b64bc3f3fe59515280e00fb6d57a7267a2583cda", - "sha256:e6b8f1881dac458c34778d0a424ae5769de30544fc678eac51c1c8bb2183e9da", - "sha256:e9b2a6309f14c0497f348d08a065d52f3020656f675819fc405fb63bbcd26562", - "sha256:ecbfbc00bf55888edda9868a4cf927205de8499e7fabe6c050322298382953f2", - "sha256:efd0bf5205240182e0f13bcaea41be4fdf5c22c5129fc7ced4a0282ac86998c9" + "sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494", + "sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806", + "sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d", + "sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062", + "sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2", + "sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4", + "sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1", + "sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85", + "sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84", + "sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042", + "sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d", + "sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962", + "sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2", + "sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa", + "sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d", + "sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365", + "sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96", + "sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47", + "sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d", + "sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d", + "sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c", + "sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb", + "sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277", + "sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172", + "sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034", + "sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a", + "sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289" ], "markers": "python_version >= '3.7'", - "version": "==42.0.7" + "version": "==43.0.1" }, "docutils": { "hashes": [ @@ -260,19 +270,19 @@ }, "google-auth": { "hashes": [ - "sha256:672dff332d073227550ffc7457868ac4218d6c500b155fe6cc17d2b13602c360", - "sha256:d452ad095688cd52bae0ad6fafe027f6a6d6f560e810fec20914e17a09526415" + "sha256:25df55f327ef021de8be50bad0dfd4a916ad0de96da86cd05661c9297723ad3f", + "sha256:f4c64ed4e01e8e8b646ef34c018f8bf3338df0c8e37d8b3bba40e7f574a3278a" ], "markers": "python_version >= '3.7'", - "version": "==2.29.0" + "version": "==2.35.0" }, "idna": { "hashes": [ - "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc", - "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0" + "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", + "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3" ], - "markers": "python_version >= '3.5'", - "version": "==3.7" + "markers": "python_version >= '3.6'", + "version": "==3.10" }, "importlib-metadata": { "hashes": [ @@ -390,11 +400,11 @@ }, "packaging": { "hashes": [ - "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5", - "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9" + "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", + "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124" ], - "markers": "python_version >= '3.7'", - "version": "==24.0" + "markers": "python_version >= '3.8'", + "version": "==24.1" }, "pexpect": { "hashes": [ @@ -412,19 +422,19 @@ }, "pyasn1": { "hashes": [ - "sha256:3a35ab2c4b5ef98e17dfdec8ab074046fbda76e281c5a706ccd82328cfc8f64c", - "sha256:cca4bb0f2df5504f02f6f8a775b6e416ff9b0b3b16f7ee80b5a3153d9b804473" + "sha256:0d632f46f2ba09143da3a8afe9e33fb6f92fa2320ab7e886e2d0f7672af84629", + "sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034" ], "markers": "python_version >= '3.8'", - "version": "==0.6.0" + "version": "==0.6.1" }, "pyasn1-modules": { "hashes": [ - "sha256:831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6", - "sha256:be04f15b66c206eed667e0bb5ab27e2b1855ea54a842e5037738099e8ca4ae0b" + "sha256:49bfa96b45a292b711e986f222502c1c9a5e1f4e568fc30e2574a6c7d07838fd", + "sha256:c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c" ], "markers": "python_version >= '3.8'", - "version": "==0.4.0" + "version": "==0.4.1" }, "pycparser": { "hashes": [ @@ -447,71 +457,74 @@ "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==2.9.0.post0" }, "pyyaml": { "hashes": [ - "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5", - "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc", - "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df", - "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741", - "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206", - "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27", - "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595", - "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62", - "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98", - "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696", - "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290", - "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9", - "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d", - "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6", - "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867", - "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47", - "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486", - "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6", - "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3", - "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007", - "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938", - "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0", - "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c", - "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735", - "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d", - "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28", - "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4", - "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba", - "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8", - "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef", - "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5", - "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd", - "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3", - "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0", - "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515", - "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c", - "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c", - "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924", - "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34", - "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43", - "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859", - "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673", - "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54", - "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a", - "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b", - "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab", - "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa", - "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c", - "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585", - "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d", - "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f" + "sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff", + "sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48", + "sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086", + "sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e", + "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133", + "sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5", + "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484", + "sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee", + "sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5", + "sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68", + "sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a", + "sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf", + "sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99", + "sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8", + "sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85", + "sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19", + "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc", + "sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a", + "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1", + "sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317", + "sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c", + "sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631", + "sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d", + "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652", + "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5", + "sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e", + "sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b", + "sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8", + "sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476", + "sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706", + "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563", + "sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237", + "sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b", + "sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083", + "sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180", + "sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425", + "sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e", + "sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f", + "sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725", + "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183", + "sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab", + "sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774", + "sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725", + "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e", + "sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5", + "sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d", + "sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290", + "sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44", + "sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed", + "sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4", + "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba", + "sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12", + "sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4" ], - "markers": "python_version >= '3.6'", - "version": "==6.0.1" + "markers": "python_version >= '3.8'", + "version": "==6.0.2" }, "requests": { "hashes": [ "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f", "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1" ], + "index": "pypi", "markers": "python_version >= '3.7'", "version": "==2.31.0" }, @@ -547,28 +560,29 @@ }, "setuptools": { "hashes": [ - "sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987", - "sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32" + "sha256:54faa7f2e8d2d11bcd2c07bed282eef1046b5c080d1c32add737d7b5817b1ad4", + "sha256:f211a66637b8fa059bb28183da127d4e86396c991a942b028c6650d4319c3fd0" ], + "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==69.5.1" + "version": "==70.0.0" }, "six": { "hashes": [ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==1.16.0" }, "urllib3": { "hashes": [ - "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07", - "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0" + "sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e", + "sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32" ], "index": "pypi", "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==1.26.18" + "version": "==1.26.20" }, "websocket-client": { "hashes": [ @@ -580,11 +594,11 @@ }, "zipp": { "hashes": [ - "sha256:206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b", - "sha256:2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715" + "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350", + "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29" ], "markers": "python_version >= '3.8'", - "version": "==3.18.1" + "version": "==3.20.2" } }, "develop": {} From 5870a92d1593819b5a76f38af73bd0f172cb9501 Mon Sep 17 00:00:00 2001 From: arkadeepsen Date: Thu, 5 Sep 2024 17:33:37 +0530 Subject: [PATCH 2/2] UPSTREAM: : Use pip instead of rpm to build ansible-operator image Add Dockerfile.requirements for generating the requirements.txt and requirments-build.txt files from the upstream Pipfile Add make target to generate the requirements Add make target to check if the current requirements.txt and requirements-build.txt files are up-to-date Update Dockerfile to use cachito specific env vars for installing the python modules using pip Remove unused shell scripts and inline the user creation script in the Dockerfile Update base images to rhel9 in Dockerfile --- .ci-operator.yaml | 2 +- openshift/Dockerfile | 53 ++++---- openshift/Dockerfile.requirements | 69 ++++++++++ openshift/Makefile | 20 +++ openshift/install-ansible.sh | 20 +++ openshift/release/ansible/bin/ao-logs | 14 -- openshift/release/ansible/bin/user_setup | 11 -- openshift/requirements-build.txt | 52 ++++++++ openshift/requirements-pre-build.txt | 8 ++ openshift/requirements.txt | 162 +++++++++++++++++++++++ openshift/setup.cfg | 3 + 11 files changed, 365 insertions(+), 49 deletions(-) create mode 100644 openshift/Dockerfile.requirements create mode 100755 openshift/install-ansible.sh delete mode 100755 openshift/release/ansible/bin/ao-logs delete mode 100755 openshift/release/ansible/bin/user_setup create mode 100644 openshift/requirements-build.txt create mode 100644 openshift/requirements-pre-build.txt create mode 100644 openshift/requirements.txt create mode 100644 openshift/setup.cfg diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 393a8263..1e59c02c 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.22-openshift-4.17 + tag: rhel-9-release-golang-1.22-openshift-4.17 diff --git a/openshift/Dockerfile b/openshift/Dockerfile index bc55dcf0..dc66c13e 100644 --- a/openshift/Dockerfile +++ b/openshift/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder ENV GO111MODULE=on \ GOFLAGS=-mod=vendor @@ -7,7 +7,7 @@ COPY . /go/src/github.com/openshift/ansible-operator-plugins RUN cd /go/src/github.com/openshift/ansible-operator-plugins \ && make build -FROM registry.ci.openshift.org/ocp/4.17:base +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 RUN mkdir -p /etc/ansible \ && echo "localhost ansible_connection=local" > /etc/ansible/hosts \ @@ -19,32 +19,39 @@ ENV HOME=/opt/ansible \ USER_NAME=ansible \ USER_UID=1001 -RUN yum install -y \ - ansible \ - ansible-runner \ - ansible-runner-http \ - python3-kubernetes \ - python3-openshift \ - python3-oauthlib \ - python3-requests-oauthlib \ - python3-jmespath \ - tini \ - && yum clean all \ - && rm -rf /var/cache/yum +# cryptography packages cannot be installed in the OSBS environment using pip. +# Thus installing it via rpm. +RUN yum clean all && rm -rf /var/cache/yum/* \ + && yum update -y \ + && yum install -y catatonit python3-cryptography python3-devel gcc python3-pip + +# pip install will install a higher version of the requests module. However, pip fails +# to uninstall the existing request module as it is installed from rpm. Thus, removing +# the module before using pip install. +RUN yum remove -y python3-requests + +# Add steps for cachito +ENV REMOTE_SOURCES=${REMOTE_SOURCES:-"./openshift/"} +ENV REMOTE_SOURCES_DIR=${REMOTE_SOURCES_DIR:-"/cachito"} +COPY ${REMOTE_SOURCES} ${REMOTE_SOURCES_DIR} +COPY openshift/install-ansible.sh . +RUN chmod +x /install-ansible.sh \ + && ./install-ansible.sh + +# Remove packages which are only needed for cachito +RUN yum remove -y python3-devel gcc \ + && yum clean all \ + && rm -rf /var/cache/yum COPY --from=builder /go/src/github.com/openshift/ansible-operator-plugins/ansible-operator /usr/local/bin/ansible-operator COPY openshift/release/ansible/ansible_collections ${HOME}/.ansible/collections/ansible_collections -COPY openshift/release/ansible/bin /usr/local/bin - -RUN chmod +x /usr/local/bin/user_setup && \ - ./usr/local/bin/user_setup - # Ensure directory permissions are properly set -RUN mkdir -p ${HOME}/.ansible/tmp \ - && chown -R ${USER_UID}:0 ${HOME} \ - && chmod -R ug+rwx ${HOME} +RUN echo "${USER_NAME}:x:${USER_UID}:0:${USER_NAME} user:${HOME}:/sbin/nologin" >> /etc/passwd \ + && mkdir -p ${HOME}/.ansible/tmp \ + && chown -R ${USER_UID}:0 ${HOME} \ + && chmod -R ug+rwx ${HOME} WORKDIR ${HOME} USER ${USER_UID} -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/ansible-operator", "run", "--watches-file=./watches.yaml"] +ENTRYPOINT ["/usr/libexec/catatonit/catatonit", "--", "/usr/local/bin/ansible-operator", "run", "--watches-file=./watches.yaml"] diff --git a/openshift/Dockerfile.requirements b/openshift/Dockerfile.requirements new file mode 100644 index 00000000..9f211b5e --- /dev/null +++ b/openshift/Dockerfile.requirements @@ -0,0 +1,69 @@ +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 + +RUN yum install -y rust cargo libffi-devel python3-devel gcc python3-pip + +COPY ./Pipfile* ./ + +# The build dependencies are required by cachito. Following script +# does exactly the same. More info at: https://github.com/containerbuildsystem/cachito/blob/master/docs/pip.md#build-dependencies +RUN curl -LO https://raw.githubusercontent.com/containerbuildsystem/cachito/master/bin/pip_find_builddeps.py \ + && chmod +x pip_find_builddeps.py + +# Create requirements.in file from the pipenv created using the +# same Pipfile and Pipfile.lock used for upstream image. Then +# use pip-compile to generate the requirements.txt file. Copy +# setuptools into requirements-build.txt as pip-compile will +# omit it from the requierements.txt file. +RUN python3 -m pip install pipenv==2023.11.15 \ + && python3 -m pip install pip-tools \ + && pipenv install --deploy \ + # NOTE: This ignored vulnerability (70612) was detected in jinja2, \ + # but the vulnerability is disputed and may never be fixed. See: \ + # - https://github.com/advisories/GHSA-f6pv-j8mr-w6rr \ + # - https://github.com/dbt-labs/dbt-core/issues/10250 \ + # - https://data.safetycli.com/v/70612/97c/ \ + # NOTE: This ignored vulnerability (71064) was detected in requests, \ + # but the upgraded version doesn't support the use case (protocol we are using).\ + # Ref: https://github.com/operator-framework/ansible-operator-plugins/pull/67#issuecomment-2189164688 + && pipenv check --ignore 70612 --ignore 71064 \ + && pipenv run pip freeze --all > ./requirements.in \ + # Add wheel and setuptools to requirements-build.in file as these packages + # are part of the build dependencies of some packages in requirements.in file. + && grep "wheel==" ./requirements.in >> ./requirements-build.in || true \ + && grep "setuptools==" ./requirements.in >> ./requirements-build.in || true \ + && pip-compile --output-file=./requirements.txt ./requirements.in --strip-extras \ + # NOTE: Comment out ansible-runner, ansible-runner-http and python-daemon as + # both ansible-runner and ansible-runner-http has python-daemon as dependency. + # pip_find_builddeps.py encounters an error when trying to get the build + # dependencies of python-daemon==3.0.1. + # TODO: Whenever a newer version of python-daemon is released check + # whether pip_find_builddeps.py is able to fetch its build dependencies + # without any error. If so, then remove the following lines which comments + # out ansible-runner, ansible-runner-http and python-daemon. + && sed -i '/ansible-runner==/s/^/#/g' ./requirements.txt \ + && sed -i '/ansible-runner-http==/s/^/#/g' ./requirements.txt \ + && sed -i '/python-daemon==/s/^/#/g' ./requirements.txt \ + && ./pip_find_builddeps.py requirements.txt -o requirements-build.in --append \ + # Uncomment ansible-runner, ansible-runner-http and python-daemon, so that + # they are re-enabled in the requirements.txt file. + && sed -i '/ansible-runner==/s/^#//g' ./requirements.txt \ + && sed -i '/ansible-runner-http==/s/^#//g' ./requirements.txt \ + && sed -i '/python-daemon==/s/^#//g' ./requirements.txt \ + && pip-compile --output-file=./requirements-build.txt ./requirements-build.in --strip-extras --allow-unsafe \ + # NOTE: Comment out cryptography and its dependencies from the requirements.txt + # and requirements-build.txt files as these packages can't be installed in the + # isolated environment of OSBS image build. These packages will be installed + # through rpms. + && sed -i '/cryptography==/s/^/#/g' ./requirements.txt \ + && sed -i '/cffi==/s/^/#/g' ./requirements.txt \ + && sed -i '/pycparser==/s/^/#/g' ./requirements.txt \ + && sed -i '/cffi==/s/^/#/g' ./requirements-build.txt \ + && sed -i '/pycparser==/s/^/#/g' ./requirements-build.txt \ + && sed -i '/maturin==/s/^/#/g' ./requirements-build.txt \ + # Add flit-core to requirements-pre-build.in file as this package is part of the + # build dependencies of some packages in requirements-build.txt file. + && grep "flit-core==" ./requirements-build.txt >> ./requirements-pre-build.in || true \ + && pip-compile --output-file=./requirements-pre-build.txt ./requirements-pre-build.in --strip-extras + +VOLUME /tmp/requirements +ENTRYPOINT ["cp", "./requirements.txt", "./requirements-build.txt", "./requirements-pre-build.txt", "/tmp/requirements/"] diff --git a/openshift/Makefile b/openshift/Makefile index f8bad22a..06ecc00d 100644 --- a/openshift/Makefile +++ b/openshift/Makefile @@ -8,3 +8,23 @@ include $(addprefix $(DIR)/vendor/github.com/openshift/build-machinery-go/make/, .PHONY: test-e2e-ansible test-e2e-ansible: ./openshift/ci/tests/e2e-ansible-scaffolding.sh + +CONTAINER_ENGINE ?= docker +REQUIREMENTS_IMG ?= pip-requirements + +.PHONY: build-requirements +build-requirements: + cp ../images/ansible-operator/Pipfile* . + $(CONTAINER_ENGINE) build -t $(REQUIREMENTS_IMG) -f Dockerfile.requirements . + rm Pipfile* + +# Use this target to generate the requirements.txt, requirements-build.txt and requirements-pre-build.txt +# files using the corresponding Pipfile and Pipfile.lock from the images/ansible-operator directory. The +# generated files will be used for building the image using cachito in the OSBS environment. +.PHONY: generate-requirements +generate-requirements: build-requirements + $(CONTAINER_ENGINE) run --rm -it -v .:/tmp/requirements/:Z $(REQUIREMENTS_IMG) + +.PHONY: check-requirements +check-requirements: generate-requirements + git diff --exit-code # fast-fail if generate-requirements produced changes diff --git a/openshift/install-ansible.sh b/openshift/install-ansible.sh new file mode 100755 index 00000000..e64d234c --- /dev/null +++ b/openshift/install-ansible.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -euo pipefail + +PIP_OPTS="--no-cache-dir" +# Check if we are building the image in the OSBS environment. If so, source the +# env vars specific for enabling cachito. +if [ -d ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps ]; then + source ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps/cachito.env + cd ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps/app/openshift +else + cd ${REMOTE_SOURCES_DIR} +fi + +# Install the packages in order of build dependency to avoid issues during installation. +python3 -m pip install ${PIP_OPTS} -r requirements-pre-build.txt +python3 -m pip install ${PIP_OPTS} -r requirements-build.txt +python3 -m pip install ${PIP_OPTS} -r requirements.txt + +rm -rf ${REMOTE_SOURCES_DIR} diff --git a/openshift/release/ansible/bin/ao-logs b/openshift/release/ansible/bin/ao-logs deleted file mode 100755 index ca597fd7..00000000 --- a/openshift/release/ansible/bin/ao-logs +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -echo "WARN: This script is deprecated and will soon be removed" - -watch_dir=${1:-/tmp/ansible-operator/runner} -filename=${2:-stdout} -mkdir -p ${watch_dir} -inotifywait -r -m -e close_write ${watch_dir} | while read dir op file -do - if [[ "${file}" = "${filename}" ]] ; then - echo "${dir}/${file}" - cat ${dir}/${file} - fi -done diff --git a/openshift/release/ansible/bin/user_setup b/openshift/release/ansible/bin/user_setup deleted file mode 100755 index 593a1710..00000000 --- a/openshift/release/ansible/bin/user_setup +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -x - -# ensure $HOME exists and is accessible by group 0 (we don't know what the runtime UID will be) -echo "${USER_NAME}:x:${USER_UID}:0:${USER_NAME} user:${HOME}:/sbin/nologin" >> /etc/passwd -mkdir -p "${HOME}/.ansible/tmp" -chown -R "${USER_UID}:0" "${HOME}" -chmod -R ug+rwx "${HOME}" - -# no need for this script to remain in the image after running -rm "$0" diff --git a/openshift/requirements-build.txt b/openshift/requirements-build.txt new file mode 100644 index 00000000..5c9d22f4 --- /dev/null +++ b/openshift/requirements-build.txt @@ -0,0 +1,52 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --allow-unsafe --output-file=./requirements-build.txt --strip-extras ./requirements-build.in +# +#cffi==1.17.1 + # via -r ./requirements-build.in +cython==3.0.11 + # via -r ./requirements-build.in +flit-core==3.9.0 + # via -r ./requirements-build.in +#maturin==1.7.1 + # via -r ./requirements-build.in +packaging==24.1 + # via + # -r ./requirements-build.in + # setuptools-scm +pbr==6.1.0 + # via -r ./requirements-build.in +poetry-core==1.9.0 + # via -r ./requirements-build.in +#pycparser==2.22 + # via + # -r ./requirements-build.in + # cffi +semantic-version==2.10.0 + # via + # -r ./requirements-build.in + # setuptools-rust +setuptools-rust==1.10.1 + # via -r ./requirements-build.in +setuptools-scm==7.1.0 + # via -r ./requirements-build.in +tomli==2.0.1 + # via + # -r ./requirements-build.in + # maturin + # setuptools-scm +typing-extensions==4.12.2 + # via + # -r ./requirements-build.in + # setuptools-scm +wheel==0.44.0 + # via -r ./requirements-build.in + +# The following packages are considered to be unsafe in a requirements file: +setuptools==70.0.0 + # via + # -r ./requirements-build.in + # setuptools-rust + # setuptools-scm diff --git a/openshift/requirements-pre-build.txt b/openshift/requirements-pre-build.txt new file mode 100644 index 00000000..7c26bcac --- /dev/null +++ b/openshift/requirements-pre-build.txt @@ -0,0 +1,8 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --output-file=./requirements-pre-build.txt --strip-extras ./requirements-pre-build.in +# +flit-core==3.9.0 + # via -r ./requirements-pre-build.in diff --git a/openshift/requirements.txt b/openshift/requirements.txt new file mode 100644 index 00000000..e6f67a12 --- /dev/null +++ b/openshift/requirements.txt @@ -0,0 +1,162 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --output-file=./requirements.txt --strip-extras ./requirements.in +# +ansible-core==2.15.12 + # via -r ./requirements.in +ansible-runner==2.3.6 + # via + # -r ./requirements.in + # ansible-runner-http +ansible-runner-http==1.0.0 + # via -r ./requirements.in +cachetools==5.5.0 + # via + # -r ./requirements.in + # google-auth +certifi==2024.8.30 + # via + # -r ./requirements.in + # kubernetes + # requests +#cffi==1.17.1 + # via + # -r ./requirements.in + # cryptography +charset-normalizer==3.3.2 + # via + # -r ./requirements.in + # requests +#cryptography==43.0.1 + # via + # -r ./requirements.in + # ansible-core +docutils==0.21.2 + # via + # -r ./requirements.in + # python-daemon +google-auth==2.35.0 + # via + # -r ./requirements.in + # kubernetes +idna==3.10 + # via + # -r ./requirements.in + # requests +importlib-metadata==6.2.1 + # via + # -r ./requirements.in + # ansible-runner +importlib-resources==5.0.7 + # via + # -r ./requirements.in + # ansible-core +jinja2==3.1.4 + # via + # -r ./requirements.in + # ansible-core +kubernetes==29.0.0 + # via -r ./requirements.in +lockfile==0.12.2 + # via + # -r ./requirements.in + # python-daemon +markupsafe==2.1.5 + # via + # -r ./requirements.in + # jinja2 +oauthlib==3.2.2 + # via + # -r ./requirements.in + # kubernetes + # requests-oauthlib +packaging==24.1 + # via + # -r ./requirements.in + # ansible-core + # ansible-runner +pexpect==4.9.0 + # via + # -r ./requirements.in + # ansible-runner +ptyprocess==0.7.0 + # via + # -r ./requirements.in + # pexpect +pyasn1==0.6.1 + # via + # -r ./requirements.in + # pyasn1-modules + # rsa +pyasn1-modules==0.4.1 + # via + # -r ./requirements.in + # google-auth +#pycparser==2.22 + # via + # -r ./requirements.in + # cffi +python-daemon==3.0.1 + # via + # -r ./requirements.in + # ansible-runner +python-dateutil==2.9.0.post0 + # via + # -r ./requirements.in + # kubernetes +pyyaml==6.0.2 + # via + # -r ./requirements.in + # ansible-core + # ansible-runner + # kubernetes +requests==2.31.0 + # via + # -r ./requirements.in + # ansible-runner-http + # kubernetes + # requests-oauthlib + # requests-unixsocket +requests-oauthlib==2.0.0 + # via + # -r ./requirements.in + # kubernetes +requests-unixsocket==0.3.0 + # via + # -r ./requirements.in + # ansible-runner-http +resolvelib==1.0.1 + # via + # -r ./requirements.in + # ansible-core +rsa==4.9 + # via + # -r ./requirements.in + # google-auth +six==1.16.0 + # via + # -r ./requirements.in + # ansible-runner + # kubernetes + # python-dateutil +urllib3==1.26.20 + # via + # -r ./requirements.in + # kubernetes + # requests +websocket-client==1.8.0 + # via + # -r ./requirements.in + # kubernetes +wheel==0.44.0 + # via -r ./requirements.in +zipp==3.20.2 + # via + # -r ./requirements.in + # importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/openshift/setup.cfg b/openshift/setup.cfg new file mode 100644 index 00000000..a40c8651 --- /dev/null +++ b/openshift/setup.cfg @@ -0,0 +1,3 @@ +[metadata] +name = ansible-operator +version = 99.99.99