From 518016a73efc93d0ac9f1c9791a34fa4f991322a Mon Sep 17 00:00:00 2001 From: Xander Harris Date: Sun, 18 Aug 2024 09:54:51 -0700 Subject: [PATCH] Add dependent charts Closes #31 --- .gitignore | 1 + Pipfile.lock | 1181 +++++++++++------------ templates/_helpers.tpl | 11 +- templates/configmap.yaml | 6 +- templates/deployment.yaml | 548 ++--------- templates/pvc.yaml | 71 +- templates/{secrets.yaml => secret.yaml} | 28 +- templates/service.yaml | 15 +- templates/serviceaccount.yaml | 1 + templates/statefulset.yaml | 208 ++-- tests/deployment_test.yaml | 219 ----- tests/pvc_test.yaml | 147 --- values.yaml | 163 ++-- 13 files changed, 875 insertions(+), 1724 deletions(-) rename templates/{secrets.yaml => secret.yaml} (60%) delete mode 100644 tests/deployment_test.yaml delete mode 100644 tests/pvc_test.yaml diff --git a/.gitignore b/.gitignore index 8e7f4e7..33712ba 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ _build gh.gpg secrets/ test.yaml +charts/ diff --git a/Pipfile.lock b/Pipfile.lock index 2ac15b2..f28712e 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -55,11 +55,11 @@ }, "billiard": { "hashes": [ - "sha256:12b641b0c539073fc8d3f5b8b7be998956665c4233c7c1fcd66a7e677c4fb36f", - "sha256:40b59a4ac8806ba2c2369ea98d876bc6108b051c227baffd928c644d15d8f3cb" + "sha256:07aa978b308f334ff8282bd4a746e681b3513db5c9a514cbdd810cbbdc19714d", + "sha256:9a3c3184cb275aa17a732f93f65b20c525d3d9f253722d26a82194803ade5a2c" ], "markers": "python_version >= '3.7'", - "version": "==4.2.1" + "version": "==4.2.0" }, "celery": { "hashes": [ @@ -71,84 +71,84 @@ }, "certifi": { "hashes": [ - "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8", - "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9" + "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b", + "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90" ], "markers": "python_version >= '3.6'", - "version": "==2024.8.30" + "version": "==2024.7.4" }, "cffi": { "hashes": [ - "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" + "sha256:011aff3524d578a9412c8b3cfaa50f2c0bd78e03eb7af7aa5e0df59b158efb2f", + "sha256:0a048d4f6630113e54bb4b77e315e1ba32a5a31512c31a273807d0027a7e69ab", + "sha256:0bb15e7acf8ab35ca8b24b90af52c8b391690ef5c4aec3d31f38f0d37d2cc499", + "sha256:0d46ee4764b88b91f16661a8befc6bfb24806d885e27436fdc292ed7e6f6d058", + "sha256:0e60821d312f99d3e1569202518dddf10ae547e799d75aef3bca3a2d9e8ee693", + "sha256:0fdacad9e0d9fc23e519efd5ea24a70348305e8d7d85ecbb1a5fa66dc834e7fb", + "sha256:14b9cbc8f7ac98a739558eb86fabc283d4d564dafed50216e7f7ee62d0d25377", + "sha256:17c6d6d3260c7f2d94f657e6872591fe8733872a86ed1345bda872cfc8c74885", + "sha256:1a2ddbac59dc3716bc79f27906c010406155031a1c801410f1bafff17ea304d2", + "sha256:2404f3de742f47cb62d023f0ba7c5a916c9c653d5b368cc966382ae4e57da401", + "sha256:24658baf6224d8f280e827f0a50c46ad819ec8ba380a42448e24459daf809cf4", + "sha256:24aa705a5f5bd3a8bcfa4d123f03413de5d86e497435693b638cbffb7d5d8a1b", + "sha256:2770bb0d5e3cc0e31e7318db06efcbcdb7b31bcb1a70086d3177692a02256f59", + "sha256:331ad15c39c9fe9186ceaf87203a9ecf5ae0ba2538c9e898e3a6967e8ad3db6f", + "sha256:3aa9d43b02a0c681f0bfbc12d476d47b2b2b6a3f9287f11ee42989a268a1833c", + "sha256:41f4915e09218744d8bae14759f983e466ab69b178de38066f7579892ff2a555", + "sha256:4304d4416ff032ed50ad6bb87416d802e67139e31c0bde4628f36a47a3164bfa", + "sha256:435a22d00ec7d7ea533db494da8581b05977f9c37338c80bc86314bec2619424", + "sha256:45f7cd36186db767d803b1473b3c659d57a23b5fa491ad83c6d40f2af58e4dbb", + "sha256:48b389b1fd5144603d61d752afd7167dfd205973a43151ae5045b35793232aa2", + "sha256:4e67d26532bfd8b7f7c05d5a766d6f437b362c1bf203a3a5ce3593a645e870b8", + "sha256:516a405f174fd3b88829eabfe4bb296ac602d6a0f68e0d64d5ac9456194a5b7e", + "sha256:5ba5c243f4004c750836f81606a9fcb7841f8874ad8f3bf204ff5e56332b72b9", + "sha256:5bdc0f1f610d067c70aa3737ed06e2726fd9d6f7bfee4a351f4c40b6831f4e82", + "sha256:6107e445faf057c118d5050560695e46d272e5301feffda3c41849641222a828", + "sha256:6327b572f5770293fc062a7ec04160e89741e8552bf1c358d1a23eba68166759", + "sha256:669b29a9eca6146465cc574659058ed949748f0809a2582d1f1a324eb91054dc", + "sha256:6ce01337d23884b21c03869d2f68c5523d43174d4fc405490eb0091057943118", + "sha256:6d872186c1617d143969defeadac5a904e6e374183e07977eedef9c07c8953bf", + "sha256:6f76a90c345796c01d85e6332e81cab6d70de83b829cf1d9762d0a3da59c7932", + "sha256:70d2aa9fb00cf52034feac4b913181a6e10356019b18ef89bc7c12a283bf5f5a", + "sha256:7cbc78dc018596315d4e7841c8c3a7ae31cc4d638c9b627f87d52e8abaaf2d29", + "sha256:856bf0924d24e7f93b8aee12a3a1095c34085600aa805693fb7f5d1962393206", + "sha256:8a98748ed1a1df4ee1d6f927e151ed6c1a09d5ec21684de879c7ea6aa96f58f2", + "sha256:93a7350f6706b31f457c1457d3a3259ff9071a66f312ae64dc024f049055f72c", + "sha256:964823b2fc77b55355999ade496c54dde161c621cb1f6eac61dc30ed1b63cd4c", + "sha256:a003ac9edc22d99ae1286b0875c460351f4e101f8c9d9d2576e78d7e048f64e0", + "sha256:a0ce71725cacc9ebf839630772b07eeec220cbb5f03be1399e0457a1464f8e1a", + "sha256:a47eef975d2b8b721775a0fa286f50eab535b9d56c70a6e62842134cf7841195", + "sha256:a8b5b9712783415695663bd463990e2f00c6750562e6ad1d28e072a611c5f2a6", + "sha256:a9015f5b8af1bb6837a3fcb0cdf3b874fe3385ff6274e8b7925d81ccaec3c5c9", + "sha256:aec510255ce690d240f7cb23d7114f6b351c733a74c279a84def763660a2c3bc", + "sha256:b00e7bcd71caa0282cbe3c90966f738e2db91e64092a877c3ff7f19a1628fdcb", + "sha256:b50aaac7d05c2c26dfd50c3321199f019ba76bb650e346a6ef3616306eed67b0", + "sha256:b7b6ea9e36d32582cda3465f54c4b454f62f23cb083ebc7a94e2ca6ef011c3a7", + "sha256:bb9333f58fc3a2296fb1d54576138d4cf5d496a2cc118422bd77835e6ae0b9cb", + "sha256:c1c13185b90bbd3f8b5963cd8ce7ad4ff441924c31e23c975cb150e27c2bf67a", + "sha256:c3b8bd3133cd50f6b637bb4322822c94c5ce4bf0d724ed5ae70afce62187c492", + "sha256:c5d97162c196ce54af6700949ddf9409e9833ef1003b4741c2b39ef46f1d9720", + "sha256:c815270206f983309915a6844fe994b2fa47e5d05c4c4cef267c3b30e34dbe42", + "sha256:cab2eba3830bf4f6d91e2d6718e0e1c14a2f5ad1af68a89d24ace0c6b17cced7", + "sha256:d1df34588123fcc88c872f5acb6f74ae59e9d182a2707097f9e28275ec26a12d", + "sha256:d6bdcd415ba87846fd317bee0774e412e8792832e7805938987e4ede1d13046d", + "sha256:db9a30ec064129d605d0f1aedc93e00894b9334ec74ba9c6bdd08147434b33eb", + "sha256:dbc183e7bef690c9abe5ea67b7b60fdbca81aa8da43468287dae7b5c046107d4", + "sha256:dca802c8db0720ce1c49cce1149ff7b06e91ba15fa84b1d59144fef1a1bc7ac2", + "sha256:dec6b307ce928e8e112a6bb9921a1cb00a0e14979bf28b98e084a4b8a742bd9b", + "sha256:df8bb0010fdd0a743b7542589223a2816bdde4d94bb5ad67884348fa2c1c67e8", + "sha256:e4094c7b464cf0a858e75cd14b03509e84789abf7b79f8537e6a72152109c76e", + "sha256:e4760a68cab57bfaa628938e9c2971137e05ce48e762a9cb53b76c9b569f1204", + "sha256:eb09b82377233b902d4c3fbeeb7ad731cdab579c6c6fda1f763cd779139e47c3", + "sha256:eb862356ee9391dc5a0b3cbc00f416b48c1b9a52d252d898e5b7696a5f9fe150", + "sha256:ef9528915df81b8f4c7612b19b8628214c65c9b7f74db2e34a646a0a2a0da2d4", + "sha256:f3157624b7558b914cb039fd1af735e5e8049a87c817cc215109ad1c8779df76", + "sha256:f3e0992f23bbb0be00a921eae5363329253c3b86287db27092461c887b791e5e", + "sha256:f9338cc05451f1942d0d8203ec2c346c830f8e86469903d5126c1f0a13a2bcbb", + "sha256:ffef8fd58a36fb5f1196919638f73dd3ae0db1a878982b27a9a5a176ede4ba91" ], "markers": "platform_python_implementation != 'PyPy'", - "version": "==1.17.1" + "version": "==1.17.0" }, "charset-normalizer": { "hashes": [ @@ -279,43 +279,43 @@ }, "cron-descriptor": { "hashes": [ - "sha256:736b3ae9d1a99bc3dbfc5b55b5e6e7c12031e7ba5de716625772f8b02dcd6013", - "sha256:f51ce4ffc1d1f2816939add8524f206c376a42c87a5fca3091ce26725b3b1bca" + "sha256:7b1a00d7d25d6ae6896c0da4457e790b98cba778398a3d48e341e5e0d33f0488", + "sha256:a67ba21804983b1427ed7f3e1ec27ee77bf24c652b0430239c268c5ddfbf9dc0" ], - "version": "==1.4.5" + "version": "==1.4.3" }, "cryptography": { "hashes": [ - "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" + "sha256:0663585d02f76929792470451a5ba64424acc3cd5227b03921dab0e2f27b1709", + "sha256:08a24a7070b2b6804c1940ff0f910ff728932a9d0e80e7814234269f9d46d069", + "sha256:232ce02943a579095a339ac4b390fbbe97f5b5d5d107f8a08260ea2768be8cc2", + "sha256:2905ccf93a8a2a416f3ec01b1a7911c3fe4073ef35640e7ee5296754e30b762b", + "sha256:299d3da8e00b7e2b54bb02ef58d73cd5f55fb31f33ebbf33bd00d9aa6807df7e", + "sha256:2c6d112bf61c5ef44042c253e4859b3cbbb50df2f78fa8fae6747a7814484a70", + "sha256:31e44a986ceccec3d0498e16f3d27b2ee5fdf69ce2ab89b52eaad1d2f33d8778", + "sha256:3d9a1eca329405219b605fac09ecfc09ac09e595d6def650a437523fcd08dd22", + "sha256:3dcdedae5c7710b9f97ac6bba7e1052b95c7083c9d0e9df96e02a1932e777895", + "sha256:47ca71115e545954e6c1d207dd13461ab81f4eccfcb1345eac874828b5e3eaaf", + "sha256:4a997df8c1c2aae1e1e5ac49c2e4f610ad037fc5a3aadc7b64e39dea42249431", + "sha256:51956cf8730665e2bdf8ddb8da0056f699c1a5715648c1b0144670c1ba00b48f", + "sha256:5bcb8a5620008a8034d39bce21dc3e23735dfdb6a33a06974739bfa04f853947", + "sha256:64c3f16e2a4fc51c0d06af28441881f98c5d91009b8caaff40cf3548089e9c74", + "sha256:6e2b11c55d260d03a8cf29ac9b5e0608d35f08077d8c087be96287f43af3ccdc", + "sha256:7b3f5fe74a5ca32d4d0f302ffe6680fcc5c28f8ef0dc0ae8f40c0f3a1b4fca66", + "sha256:844b6d608374e7d08f4f6e6f9f7b951f9256db41421917dfb2d003dde4cd6b66", + "sha256:9a8d6802e0825767476f62aafed40532bd435e8a5f7d23bd8b4f5fd04cc80ecf", + "sha256:aae4d918f6b180a8ab8bf6511a419473d107df4dbb4225c7b48c5c9602c38c7f", + "sha256:ac1955ce000cb29ab40def14fd1bbfa7af2017cca696ee696925615cafd0dce5", + "sha256:b88075ada2d51aa9f18283532c9f60e72170041bba88d7f37e49cbb10275299e", + "sha256:cb013933d4c127349b3948aa8aaf2f12c0353ad0eccd715ca789c8a0f671646f", + "sha256:cc70b4b581f28d0a254d006f26949245e3657d40d8857066c2ae22a61222ef55", + "sha256:e9c5266c432a1e23738d178e51c2c7a5e2ddf790f248be939448c0ba2021f9d1", + "sha256:ea9e57f8ea880eeea38ab5abf9fbe39f923544d7884228ec67d666abd60f5a47", + "sha256:ee0c405832ade84d4de74b9029bedb7b31200600fa524d218fc29bfa371e97f5", + "sha256:fdcb265de28585de5b859ae13e3846a8e805268a823a12a4da2597f1f5afc9f0" ], "markers": "python_version >= '3.7'", - "version": "==43.0.1" + "version": "==43.0.0" }, "defusedxml": { "hashes": [ @@ -334,11 +334,11 @@ }, "django": { "hashes": [ - "sha256:1ddc333a16fc139fd253035a1606bb24261951bbc3a6ca256717fa06cc41a898", - "sha256:6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad" + "sha256:61ee4a130efb8c451ef3467c67ca99fdce400fedd768634efc86a68c18d80d30", + "sha256:c77f926b81129493961e19c0e02188f8d07c112a1162df69bfab178ae447f94a" ], "markers": "python_version >= '3.8'", - "version": "==4.2.16" + "version": "==4.2.15" }, "django-ajax-tables": { "hashes": [ @@ -615,11 +615,11 @@ }, "filelock": { "hashes": [ - "sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0", - "sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435" + "sha256:2207938cbc1844345cb01a5a95524dae30f0ce089eba5b00378295a17e3e90cb", + "sha256:6ca1fffae96225dab4c6eaf1c4f4f28cd2568d3ec2a44e15a08520504de468e7" ], "markers": "python_version >= '3.8'", - "version": "==3.16.1" + "version": "==3.15.4" }, "funcy": { "hashes": [ @@ -689,11 +689,11 @@ }, "idna": { "hashes": [ - "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", - "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3" + "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc", + "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0" ], - "markers": "python_version >= '3.6'", - "version": "==3.10" + "markers": "python_version >= '3.5'", + "version": "==3.7" }, "importlib-resources": { "hashes": [ @@ -744,11 +744,11 @@ }, "kombu": { "hashes": [ - "sha256:14212f5ccf022fc0a70453bb025a1dcc32782a588c49ea866884047d66e14763", - "sha256:eef572dd2fd9fc614b37580e3caeafdd5af46c1eff31e7fba89138cdb406f2cf" + "sha256:ad200a8dbdaaa2bbc5f26d2ee7d707d9a1fded353a0f4bd751ce8c7d9f449c60", + "sha256:c8dd99820467610b4febbc7a9e8a0d3d7da2d35116b67184418b51cc520ea6b6" ], "markers": "python_version >= '3.8'", - "version": "==5.4.2" + "version": "==5.4.0" }, "loguru": { "hashes": [ @@ -986,12 +986,12 @@ "sso" ], "hashes": [ - "sha256:78a19fec0dc4db8bda9f8e2dd1f26ae7d7fb66fc01f3b7426290bd6aa183d48b", - "sha256:d464c82e92a3b33ce56b98cbfa84977e8f011cb3880294f4c8edf18f4669e864" + "sha256:64ab9be99e21b190a74ef5e8ba8bc28275f0b4da3e7d10ea38d270ff091ed4b4", + "sha256:830eccab8457d674fdad7591d5b295f8a278bcbbbf259c2dd3ab1aabad7530f9" ], "index": "pypi", "markers": "python_version < '3.13' and python_version >= '3.8'", - "version": "==2.3.4" + "version": "==2.3.0" }, "netaddr": { "hashes": [ @@ -1003,11 +1003,11 @@ }, "netutils": { "hashes": [ - "sha256:19b8cc3d2cf567a986f916c90f298d241af03a71c62ec6d38d6dc3395347670b", - "sha256:f457fb85cb622e89aa0403fb2128c50986f7ce38d93a5873981727d088619793" + "sha256:0d6e9026cc529f365a63377159aed07769baee0bf7a7138fa86fce37b64dd9d4", + "sha256:8ad8b5e02eb9d6692d0aaaf9c0f36da1a81f520f426a79d0e08e56cf7dbb3476" ], "markers": "python_version >= '3.8' and python_version < '4.0'", - "version": "==1.10.0" + "version": "==1.9.1" }, "nh3": { "hashes": [ @@ -1123,20 +1123,20 @@ }, "pipenv": { "hashes": [ - "sha256:0226ed63c81725117ed284bd58eb07e64207dc0c3fc8b52ead0ab2db91321870", - "sha256:612a395c583d81903b8dd9bbf14375b338a01bbcfdad28c17f465f2fc3fc6395" + "sha256:5360835c613837423a99b8c94952b139b777b3eaabb42cb9edb34556245b4c25", + "sha256:ae5a83fa5b66065cebd2bd8f73f0b281b3bd202a13d58cc644f0b9765128c990" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==2024.0.3" + "version": "==2024.0.1" }, "platformdirs": { "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" + "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee", + "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3" ], "markers": "python_version >= '3.8'", - "version": "==4.3.6" + "version": "==4.2.2" }, "prometheus-client": { "hashes": [ @@ -1264,42 +1264,39 @@ }, "pycryptodome": { "hashes": [ - "sha256:08b445799d571041765e7d5c9ca09c5d3866c2f22eeb0dd4394a4169285184f4", - "sha256:11ddf6c9b52116b62223b6a9f4741bc4f62bb265392a4463282f7f34bb287180", - "sha256:1c6273ca5a03b672e504995529b8bae56da0ebb691d8ef141c4aa68f60765700", - "sha256:27e1efcb68993b7ce5d1d047a46a601d41281bba9f1971e6be4aa27c69ab8065", - "sha256:2c16426ef49d9cba018be2340ea986837e1dfa25c2ea181787971654dd49aadd", - "sha256:37e531bf896b70fe302f003d3be5a0a8697737a8d177967da7e23eff60d6483c", - "sha256:420972f9c62978e852c74055d81c354079ce3c3a2213a92c9d7e37bbc63a26e2", - "sha256:4464b0e8fd5508bff9baf18e6fd4c6548b1ac2ce9862d6965ff6a84ec9cb302a", - "sha256:4805e053571140cb37cf153b5c72cd324bb1e3e837cbe590a19f69b6cf85fd03", - "sha256:67939a3adbe637281c611596e44500ff309d547e932c449337649921b17b6297", - "sha256:694020d2ff985cd714381b9da949a21028c24b86f562526186f6af7c7547e986", - "sha256:6c3df3613592ea6afaec900fd7189d23c8c28b75b550254f4bd33fe94acb84b9", - "sha256:6d0d2b97758ebf2f36c39060520447c26455acb3bcff309c28b1c816173a6ff5", - "sha256:7c9e222d0976f68d0cf6409cfea896676ddc1d98485d601e9508f90f60e2b0a2", - "sha256:81e9d23c0316fc1b45d984a44881b220062336bbdc340aa9218e8d0656587934", - "sha256:8ae0dd1bcfada451c35f9e29a3e5db385caabc190f98e4a80ad02a61098fb776", - "sha256:8cf5d3d6cf921fa81acd1f632f6cedcc03f5f68fc50c364cd39490ba01d17c49", - "sha256:954d156cd50130afd53f8d77f830fe6d5801bd23e97a69d358fed068f433fbfe", - "sha256:a470237ee71a1efd63f9becebc0ad84b88ec28e6784a2047684b693f458f41b7", - "sha256:a991f8ffe8dfe708f86690948ae46442eebdd0fff07dc1b605987939a34ec979", - "sha256:b0bfe61506795877ff974f994397f0c862d037f6f1c0bfc3572195fc00833b96", - "sha256:b7efd46b0b4ac869046e814d83244aeab14ef787f4850644119b1c8b0ec2d637", - "sha256:b8b80ff92049fd042177282917d994d344365ab7e8ec2bc03e853d93d2401786", - "sha256:c1bc0c49d986a1491d66d2a56570f12e960b12508b7e71f2423f532e28857f36", - "sha256:c22c80246c3c880c6950d2a8addf156cee74ec0dc5757d01e8e7067a3c7da015", - "sha256:cd4e7e8bf0fc1ada854688b9b309ee607e2aa85a8b44180f91021a4dd330a928", - "sha256:cd4e95b0eb4b28251c825fe7aa941fe077f993e5ca9b855665935b86fbb1cc08", - "sha256:e038ab77fec0956d7aa989a3c647652937fc142ef41c9382c2ebd13c127d5b4a", - "sha256:e3e6f89480616781d2a7f981472d0cdb09b9da9e8196f43c1234eff45c915766", - "sha256:e70f5c839c7798743a948efa2a65d1fe96bb397fe6d7f2bde93d869fe4f0ad69", - "sha256:ed932eb6c2b1c4391e166e1a562c9d2f020bfff44a0e1b108f67af38b390ea89", - "sha256:f34976c5c8eb79e14c7d970fb097482835be8d410a4220f86260695ede4c3e17" + "sha256:008ef2c631f112cd5a58736e0b29f4a28b4bb853e68878689f8b476fd56e0691", + "sha256:073dedf0f9c490ae22ca081b86357646ac9b76f3e2bd89119d137fc697a9e3b6", + "sha256:0896d5d15ffe584d46cb9b69a75cf14a2bc8f6daf635b7bf16c1b041342a44b1", + "sha256:1fb7a6f222072412f320b9e48d3ce981920efbfce37b06d028ec9bd94093b37f", + "sha256:4f1b594d0cf35bd12ec4244df1155a7f565bf6e6245976ac36174c1564688c90", + "sha256:51ebe9624ad0a0b4da1aaaa2d43aabadf8537737fd494cee0ffa37cd6326de02", + "sha256:681ac47c538c64305d710eaed2bb49532f62b3f4c93aa7c423c520df981392e5", + "sha256:702446a012fd9337b9327d168bb0c7dc714eb93ad361f6f61af9ca8305a301f1", + "sha256:720fafdf3e5c5de93039d8308f765cc60b8e9e7e852ad7135aa65dd89238191f", + "sha256:72de8c4d71e6b11d54528bb924447fa4fdabcbb3d76cc0e7f61d3b6075def6b3", + "sha256:765b8b16bc1fd699e183dde642c7f2653b8f3c9c1a50051139908e9683f97732", + "sha256:7a8b0e526ff239b4f4c61dd6898e2474d609843ffc437267f3a27ddff626e6f6", + "sha256:7b3478a187d897f003b2aa1793bcc59463e8d57a42e2aafbcbbe9cd47ec46863", + "sha256:857c16bffd938254e3a834cd6b2a755ed24e1a953b1a86e33da136d3e4c16a6f", + "sha256:88d6d54e83cf9bbd665ce1e7b9079983ee2d97a05f42e0569ff00a70f1dd8b1e", + "sha256:95bacf9ff7d1b90bba537d3f5f6c834efe6bfbb1a0195cb3573f29e6716ef08d", + "sha256:9c8e0e6c5e982699801b20fa74f43c19aa080d2b53a39f3c132d35958e153bd4", + "sha256:9ea70f6c3f6566159e3798e4593a4a8016994a0080ac29a45200615b45091a1b", + "sha256:b3af53dddf848afb38b3ac2bae7159ddad1feb9bac14aa3acec6ef1797b82f8d", + "sha256:ca6db61335d07220de0b665bfee7b8e9615b2dfc67a54016db4826dac34c2dd2", + "sha256:cb9453c981554984c6f5c5ce7682d7286e65e2173d7416114c3593a977a01bf5", + "sha256:d92a5eddffb0ad39f582f07c1de26e9daf6880e3e782a94bb7ebaf939567f8bf", + "sha256:deede160bdf87ddb71f0a1314ad5a267b1a960be314ea7dc6b7ad86da6da89a3", + "sha256:e3affa03c49cce7b0a9501cc7f608d4f8e61fb2522b276d599ac049b5955576d", + "sha256:e420cdfca73f80fe15f79bb34756959945231a052440813e5fce531e6e96331a", + "sha256:e468724173df02f9d83f3fea830bf0d04aa291b5add22b4a78e01c97aab04873", + "sha256:e5d72be02b17e6bd7919555811264403468d1d052fa67c946e402257c3c29a27", + "sha256:eec02d9199af4b1ccfe1f9c587691a07a1fa39d949d2c1dc69d079ab9af8212f", + "sha256:f5457e44d3f26d9946091e92b28f3e970a56538b96c87b4b155a84e32a40b7b5", + "sha256:f7aad304575d075faf2806977b726b67da7ba294adc97d878f92a062e357a56a" ], - "index": "pypi", "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==3.19.1" + "version": "==3.13.0" }, "pyjwt": { "hashes": [ @@ -1409,55 +1406,51 @@ }, "pyuwsgi": { "hashes": [ - "sha256:01aac38118cd35adb141a7ddbd721845c3b895a18d6cfddca3a237e0da5e5fc7", - "sha256:03ce17f4a114e0ca53686748e7a4556e62c7a0edc8a6033e076eb3bc4db5489f", - "sha256:0a9e82434e640eb5c7ce0845c3cfd6711088cff3b0265d98e6a34216972eec07", - "sha256:115cf76fe6358a7863e4f28d9dfd2fa51f1f198a7259ee5fec2e7cb52d0060bf", - "sha256:14769dd0c41bc531dba7fc8fe202a11d984d93f251896ffcc74daa0476eda966", - "sha256:244c81e050e240ebc8a1c455db8aefc6b5c9f4582551b34905092da0e03415a3", - "sha256:288f34589e7d76e70f4ebaccfeb34b76cefa661f41302b38722f305a22310e1f", - "sha256:312575bcc9513dfd7d76d993b7753d18b9a36e54cffca6b72ad2e1397636c7fd", - "sha256:35aeca4b60e883796f0c2fa4b78fa34e5f31947b317b7d63526aa68a31036467", - "sha256:3d07829faf43b5981487130a929eb8521aefdf39dd723c50e2e168362dafafdc", - "sha256:3d839d584276784f660168b89209c28ce9a1cb14f8911322f21d919c2566e49d", - "sha256:46f95c39b8713121536e5f0c4292eab30adcb8dabd088641fd34b5641d4fd81d", - "sha256:489ff6e77fcbe14ca7a853916388ddb4bd4e087dd243abef0b7a4732563401ba", - "sha256:4a81548e59852276af18d4404512cfcbaf20c40f38f345bb80b1a87f1dc7285c", - "sha256:524c5620aff07c72f9ef6526712f92a06ff9741c0c3ea7b46284045de1b8db40", - "sha256:544e2f791912dc5f38cb1159eae8ba037cdd472b40e2fcfc0ea7fb973aaebaaa", - "sha256:596c55b36b72fbb04b6e024578e8f9867185b6b07f50fcead75e71b6534154e7", - "sha256:5fd517e4336ebae0493063a031da0e6a53ff436dc5cd551b57f387d38459085c", - "sha256:5fe6149521f6545548452ae66d670be7ece962045952d07af7fdd156409771d4", - "sha256:709d3704dcb9e85576a31a1c04782fe17df6a577a6eaf07dd2b7c34982ca905f", - "sha256:70aec45ba640742df86e0f1a0baa01964b162d11f24ee70d56146bd6331462f9", - "sha256:7cfa8b9524bccca9052c6fd2682ec2fc744a9397eaf5febde8e60334fac4313a", - "sha256:85f8a3b09b41177496e5ed84aa9e0e3f815ac53422d37f72eec7933609f742e9", - "sha256:8c807ae36058dd7ae2653451081536c10886c74fc06aa1bf7a28cc2f0c815307", - "sha256:910642f91877e8dac6d0286c79688543d0d573e43e78d030d998faee8ca49bdb", - "sha256:9a13acc603cca50510dd2b0772f398bad1bcfaa5c418069becba016edac22ac4", - "sha256:a0bc7cb23a35b7da5ead97b2e9ea2894a74c96d9864782789526e66fdfcf5f91", - "sha256:af04d0ff93a89c65369c8b0b10d07394046e7d78694fad998b316aa7f8ca3e1d", - "sha256:b20664df152f225d56f6ba810347d47efa126d9ce751e6e5fbad07a12d7cdae2", - "sha256:bb69885e3f02a7538137197a8618766cda7e29bd7da005fce699e6385215a786", - "sha256:bb840399ff19b3e2308e33b2cd37143bc55b1666e99b38370660b95127b081aa", - "sha256:c7bb17f907f7e165d45b676939c9641dbf4d7c8c532caaa704006c6be69c3b60", - "sha256:c7f167545939764a1c6fcd0f861023f641ca09f9806f1f4b7e48b9ea2682db8e", - "sha256:c87bd20906bceebf0bfb3fc4f25b12ca3943aafeaf0dc289df9144d4ee41f9c5", - "sha256:c8ded279e1c4da7273f25d658979071520ae97712650f70ea50715618cb51910", - "sha256:cf4e2828ca8c213f91673ff960a29ebbc037d743e57b2758ea5a76dd13c0b01c", - "sha256:d48accc82c82d637be27ebb153c17a2773758df582602d7f8c1702e9dcf8ea3a", - "sha256:d9e21e147f851a77ab893a27466a166a52450558c88ce885974c2e63f6e3c298", - "sha256:db26c9ca688fb19e1716c7ab8e09811a9bd431576432ca626d89e9ebbef96fc1", - "sha256:df91af8b7dfd573683ccecfa646d447e4a23be7dc84329c0633e70faa9431ba8", - "sha256:e5f14b676f8aacd79a2106695657c212b4469cd98f1624dc0473e1e0e695bcc9", - "sha256:e9f5f0c377d9efc04d12937e79567628c4c1f72c0991f45c6dbb76541ca1b683", - "sha256:ea8e3e197f54902b34c5648880bc3c111ad4f677a7350203d1052606cc04119b", - "sha256:ead0863e90397be562ca9816b2e0704f8e59e734ab158eb467db333814af704e", - "sha256:f9b9bed61cf18002ed7e9cef81c42e6b825c01b7c8d983f2cff223f905987e64", - "sha256:fb1ba584cd07339f2adad5eb33ab51854330748426a63fbd58cb39031ffb7498", - "sha256:ffa63939802f29873a8b92e437fd9e17fccde0a80004260a2abe8ad71b42bd1d" - ], - "version": "==2.0.26" + "sha256:04ec79c4a3acad21002ebf1479050c3208605d27cc6659008df51092951eeb8e", + "sha256:0d9dfb79bffa552e5985385bc114ecec1d4079b95ce24796f577ef0df727da06", + "sha256:137db348bd5f585e8e5a609046d3ac9ef58483bba93de1e3c568c1a860c31b9c", + "sha256:17a8818ec98f92e7935cf0ff56ed4f02a069362e10554df969f70fcdf78d9199", + "sha256:245da016b424c261d148bbb83d2407aac77e6d5793cbd4e23a17f7e3a8aa061f", + "sha256:29ab8a02e812fbc34026ddb79f274a574c96fc488f384f320d3af37bd7edf932", + "sha256:374142b106de187c4572b4441a367fa3466d9ea5aaabe475da42bb9f2202a690", + "sha256:4270e68bb2633b0fc132aad6d415e4e0cde67093a97e64dd84bd186264a8c083", + "sha256:49dfe43726f4a71d3440f7a36eb3ba5b361e04807164d34ececda138e2dc2375", + "sha256:4a34ab2863ff0120c6e0e75c63c9ced462bfb4777e6b8237e4e1df60fb34af51", + "sha256:508f5d84cd677cecc640d0e321badc61080c40c61843cd130b32f356729a599f", + "sha256:52a45e98fe746ae9c9437c5b6f0cdb6117f979c8800f09c8e4dae2997786affd", + "sha256:52b7a837dbc8702b245481514a32c88418a42df7b5ee68d45695eba457abd3ee", + "sha256:59d6a718ad42be54b2b80c8c236b728b8b83fb93438786e95f63fc259229ccd7", + "sha256:65420b185003dd5b66f41a6d1aa03d63d953a18e818bd4a013fc8e9d580f11cb", + "sha256:6ba86c6aa815635eefe7728b9b219af281a4e956bab240c5871db6c151c300a8", + "sha256:7199009447770812056a5b417c4847bd44db1b0230d4bb64c48a4ffacd4e96f0", + "sha256:7887c2acc8262223ff9cdce974851da0917818c12ef3ec0f49ec11a9943731fe", + "sha256:7bc7c60d8e1242b3a638754d2487c505112c642010c460442993be85f3ca9ec7", + "sha256:8c5283e38c4fd3130cd7384d57535d60435c63b81a41a6463f26f340efeda9de", + "sha256:8cac396c2e8e0d199bde9bb8fc90538c82207d0c3d722d08b9a63619b41945d6", + "sha256:8de1d975be958cff9122ecc82bf393bf7f41fff6f1047e76ed972047763bbd31", + "sha256:9565569474f9e9f02f6fa490d96d8c5c7e3004829c01c0446cdb74c618b6a433", + "sha256:97c940a69242dc45658dba3330e64d809f34e33d9631547b6928fd20075b4bb9", + "sha256:a19ab0d5c43bc179a70cb079feb7804e39be6326bf98ec38808fcea5e7d44bd0", + "sha256:af376cafca1501b2d4b8184c427c55b32c1a3dcb6070dc27115ca552898c7ff8", + "sha256:b531ac80155b6c839215d05f95569b34e614e97aab055072c74112b1d2a45546", + "sha256:bae72689ddf8e0bdd1a974a364ed052dd19d7897f1d5c3efcf8d9010c60f56ef", + "sha256:c38b5bb59e1bf59030f2d43a3e67aa18e6089c8e7f43e9c5f2099567466d35f4", + "sha256:cfcfeb1eaca5f4dd0e6ed9194e7ec98dcb3a8ac108e8f0414ed7c28d608517ef", + "sha256:d3ad00212ffbb208b7146744ad3710b908734f844b5e2bf533fb09fc44726f37", + "sha256:d75859311605a510a6050ec622ec4beb9f2f8cce5f090e5cea70a1ff74133f8b", + "sha256:dcf93afec49f5cf29b0a68f4d2fb3e44a3ad1f205704ab2f41f9db47dacb8e13", + "sha256:e7140fc3548cd9d0f02c4511b679ba47d26593d2cceb249d2d147c9901d90022", + "sha256:eae183104f3fa26f3d9c28fe75f2ad914e3a365103a6a66e329c0f59f9e461d4", + "sha256:ed348cc4c5a4964c8e8fa61ab0ef50c00f7676179a6c0cb0f55f0122db1db1c2", + "sha256:f1ae2abaa47cb9c0018c790935897aec8001fb709dfac54286a37ab2e0b88dca", + "sha256:f361d168cf175796fe36ab6a88dee079245a2f08e587e8190a38bd1b33238fa8", + "sha256:f4f9c0694a11d8dfbbe2814b8b242a7c4dfa143b63e01447fabce9966a90fa60", + "sha256:f56a729808ed7aa1d7973d6f900a75bc36b976b7ab6c8867064f36e34cdafd4e", + "sha256:f7455976abfa1dd43b5f3376f7f04a925c16babba1c3fc6edcdd81f5c0f24383", + "sha256:f75e45e14462cbb94fc32242378eef7bda97173de57a68a5d46e4053677a7547", + "sha256:fc18481f336be63e80fc983aaa1a040e7c69c25c3145edcf93f0e6de2f1ad0d6" + ], + "version": "==2.0.23.post0" }, "pyyaml": { "hashes": [ @@ -1683,11 +1676,11 @@ }, "setuptools": { "hashes": [ - "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2", - "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538" + "sha256:5a03e1860cf56bb6ef48ce186b0e557fdba433237481a9a625176c2831be15d1", + "sha256:8d243eff56d095e5817f796ede6ae32941278f542e0f941867cc05ae52b162ec" ], "markers": "python_version >= '3.8'", - "version": "==75.1.0" + "version": "==72.1.0" }, "singledispatch": { "hashes": [ @@ -1797,11 +1790,11 @@ }, "urllib3": { "hashes": [ - "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac", - "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9" + "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472", + "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" ], "markers": "python_version >= '3.8'", - "version": "==2.2.3" + "version": "==2.2.2" }, "vine": { "hashes": [ @@ -1813,11 +1806,11 @@ }, "virtualenv": { "hashes": [ - "sha256:4f3ac17b81fba3ce3bd6f4ead2749a72da5929c01774948e243db9ba41df4ff6", - "sha256:ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4" + "sha256:4c43a2a236279d9ea36a0d76f98d84bd6ca94ac4e0f4a3b9d46d05e10fea542a", + "sha256:8cc4a31139e796e9a7de2cd5cf2489de1217193116a8fd42328f1bd65f434589" ], "markers": "python_version >= '3.7'", - "version": "==20.26.5" + "version": "==20.26.3" }, "wcwidth": { "hashes": [ @@ -1910,11 +1903,11 @@ }, "anyio": { "hashes": [ - "sha256:4c8bc31ccdb51c7f7bd251f51c609e038d63e34219b44aa86e47576389880b4c", - "sha256:6d170c36fba3bdd840c73d3868c1e777e33676a69c3a72cf0a0d5d6d8009b61d" + "sha256:5aadc6a1bbb7cdb0bede386cac5e2940f5e2ff3aa20277e991cf028e0585ce94", + "sha256:c1b2d8f46a8a812513012e1107cb0e68c17159a7a594208005a57dc776e1bdc7" ], - "markers": "python_version >= '3.9'", - "version": "==4.6.2.post1" + "markers": "python_version >= '3.8'", + "version": "==4.4.0" }, "argcomplete": { "hashes": [ @@ -1925,19 +1918,19 @@ }, "astroid": { "hashes": [ - "sha256:5eba185467253501b62a9f113c263524b4f5d55e1b30456370eed4cdbd6438fd", - "sha256:e73d0b62dd680a7c07cb2cd0ce3c22570b044dd01bd994bc3a2dd16c6cbba162" + "sha256:0e14202810b30da1b735827f78f5157be2bbd4a7a59b7707ca0bfc2fb4c0063a", + "sha256:413658a61eeca6202a59231abb473f932038fbcbf1666587f66d482083413a25" ], - "markers": "python_full_version >= '3.9.0'", - "version": "==3.3.4" + "markers": "python_full_version >= '3.8.0'", + "version": "==3.2.4" }, "babel": { "hashes": [ - "sha256:368b5b98b37c06b7daf6696391c3240c938b37767d4584413e8438c5c435fa8b", - "sha256:d1f3554ca26605fe173f3de0c65f750f5a42f924499bf134de6423582298e316" + "sha256:08706bdad8d0a3413266ab61bd6c34d0c28d6e1e7badf40a2cebe67644e2e1fb", + "sha256:8daf0e265d05768bc6c7a314cf1321e9a123afc328cc635c18622a2f30a04413" ], "markers": "python_version >= '3.8'", - "version": "==2.16.0" + "version": "==2.15.0" }, "beautifulsoup4": { "hashes": [ @@ -1961,122 +1954,107 @@ }, "certifi": { "hashes": [ - "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8", - "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9" + "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b", + "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90" ], "markers": "python_version >= '3.6'", - "version": "==2024.8.30" + "version": "==2024.7.4" }, "charset-normalizer": { "hashes": [ - "sha256:0099d79bdfcf5c1f0c2c72f91516702ebf8b0b8ddd8905f97a8aecf49712c621", - "sha256:0713f3adb9d03d49d365b70b84775d0a0d18e4ab08d12bc46baa6132ba78aaf6", - "sha256:07afec21bbbbf8a5cc3651aa96b980afe2526e7f048fdfb7f1014d84acc8b6d8", - "sha256:0b309d1747110feb25d7ed6b01afdec269c647d382c857ef4663bbe6ad95a912", - "sha256:0d99dd8ff461990f12d6e42c7347fd9ab2532fb70e9621ba520f9e8637161d7c", - "sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b", - "sha256:1110e22af8ca26b90bd6364fe4c763329b0ebf1ee213ba32b68c73de5752323d", - "sha256:130272c698667a982a5d0e626851ceff662565379baf0ff2cc58067b81d4f11d", - "sha256:136815f06a3ae311fae551c3df1f998a1ebd01ddd424aa5603a4336997629e95", - "sha256:14215b71a762336254351b00ec720a8e85cada43b987da5a042e4ce3e82bd68e", - "sha256:1db4e7fefefd0f548d73e2e2e041f9df5c59e178b4c72fbac4cc6f535cfb1565", - "sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64", - "sha256:2006769bd1640bdf4d5641c69a3d63b71b81445473cac5ded39740a226fa88ab", - "sha256:20587d20f557fe189b7947d8e7ec5afa110ccf72a3128d61a2a387c3313f46be", - "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e", - "sha256:27623ba66c183eca01bf9ff833875b459cad267aeeb044477fedac35e19ba907", - "sha256:285e96d9d53422efc0d7a17c60e59f37fbf3dfa942073f666db4ac71e8d726d0", - "sha256:2de62e8801ddfff069cd5c504ce3bc9672b23266597d4e4f50eda28846c322f2", - "sha256:2f6c34da58ea9c1a9515621f4d9ac379871a8f21168ba1b5e09d74250de5ad62", - "sha256:309a7de0a0ff3040acaebb35ec45d18db4b28232f21998851cfa709eeff49d62", - "sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23", - "sha256:3710a9751938947e6327ea9f3ea6332a09bf0ba0c09cae9cb1f250bd1f1549bc", - "sha256:3d59d125ffbd6d552765510e3f31ed75ebac2c7470c7274195b9161a32350284", - "sha256:40d3ff7fc90b98c637bda91c89d51264a3dcf210cade3a2c6f838c7268d7a4ca", - "sha256:425c5f215d0eecee9a56cdb703203dda90423247421bf0d67125add85d0c4455", - "sha256:43193c5cda5d612f247172016c4bb71251c784d7a4d9314677186a838ad34858", - "sha256:44aeb140295a2f0659e113b31cfe92c9061622cadbc9e2a2f7b8ef6b1e29ef4b", - "sha256:47334db71978b23ebcf3c0f9f5ee98b8d65992b65c9c4f2d34c2eaf5bcaf0594", - "sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc", - "sha256:4a51b48f42d9358460b78725283f04bddaf44a9358197b889657deba38f329db", - "sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b", - "sha256:4ec9dd88a5b71abfc74e9df5ebe7921c35cbb3b641181a531ca65cdb5e8e4dea", - "sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6", - "sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920", - "sha256:55f56e2ebd4e3bc50442fbc0888c9d8c94e4e06a933804e2af3e89e2f9c1c749", - "sha256:5726cf76c982532c1863fb64d8c6dd0e4c90b6ece9feb06c9f202417a31f7dd7", - "sha256:5d447056e2ca60382d460a604b6302d8db69476fd2015c81e7c35417cfabe4cd", - "sha256:5ed2e36c3e9b4f21dd9422f6893dec0abf2cca553af509b10cd630f878d3eb99", - "sha256:5ff2ed8194587faf56555927b3aa10e6fb69d931e33953943bc4f837dfee2242", - "sha256:62f60aebecfc7f4b82e3f639a7d1433a20ec32824db2199a11ad4f5e146ef5ee", - "sha256:63bc5c4ae26e4bc6be6469943b8253c0fd4e4186c43ad46e713ea61a0ba49129", - "sha256:6b40e8d38afe634559e398cc32b1472f376a4099c75fe6299ae607e404c033b2", - "sha256:6b493a043635eb376e50eedf7818f2f322eabbaa974e948bd8bdd29eb7ef2a51", - "sha256:6dba5d19c4dfab08e58d5b36304b3f92f3bd5d42c1a3fa37b5ba5cdf6dfcbcee", - "sha256:6fd30dc99682dc2c603c2b315bded2799019cea829f8bf57dc6b61efde6611c8", - "sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b", - "sha256:7706f5850360ac01d80c89bcef1640683cc12ed87f42579dab6c5d3ed6888613", - "sha256:7782afc9b6b42200f7362858f9e73b1f8316afb276d316336c0ec3bd73312742", - "sha256:79983512b108e4a164b9c8d34de3992f76d48cadc9554c9e60b43f308988aabe", - "sha256:7f683ddc7eedd742e2889d2bfb96d69573fde1d92fcb811979cdb7165bb9c7d3", - "sha256:82357d85de703176b5587dbe6ade8ff67f9f69a41c0733cf2425378b49954de5", - "sha256:84450ba661fb96e9fd67629b93d2941c871ca86fc38d835d19d4225ff946a631", - "sha256:86f4e8cca779080f66ff4f191a685ced73d2f72d50216f7112185dc02b90b9b7", - "sha256:8cda06946eac330cbe6598f77bb54e690b4ca93f593dee1568ad22b04f347c15", - "sha256:8ce7fd6767a1cc5a92a639b391891bf1c268b03ec7e021c7d6d902285259685c", - "sha256:8ff4e7cdfdb1ab5698e675ca622e72d58a6fa2a8aa58195de0c0061288e6e3ea", - "sha256:9289fd5dddcf57bab41d044f1756550f9e7cf0c8e373b8cdf0ce8773dc4bd417", - "sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250", - "sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88", - "sha256:95c3c157765b031331dd4db3c775e58deaee050a3042fcad72cbc4189d7c8dca", - "sha256:980b4f289d1d90ca5efcf07958d3eb38ed9c0b7676bf2831a54d4f66f9c27dfa", - "sha256:9ae4ef0b3f6b41bad6366fb0ea4fc1d7ed051528e113a60fa2a65a9abb5b1d99", - "sha256:9c98230f5042f4945f957d006edccc2af1e03ed5e37ce7c373f00a5a4daa6149", - "sha256:9fa2566ca27d67c86569e8c85297aaf413ffab85a8960500f12ea34ff98e4c41", - "sha256:a14969b8691f7998e74663b77b4c36c0337cb1df552da83d5c9004a93afdb574", - "sha256:a8aacce6e2e1edcb6ac625fb0f8c3a9570ccc7bfba1f63419b3769ccf6a00ed0", - "sha256:a8e538f46104c815be19c975572d74afb53f29650ea2025bbfaef359d2de2f7f", - "sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d", - "sha256:aa693779a8b50cd97570e5a0f343538a8dbd3e496fa5dcb87e29406ad0299654", - "sha256:ab22fbd9765e6954bc0bcff24c25ff71dcbfdb185fcdaca49e81bac68fe724d3", - "sha256:ab2e5bef076f5a235c3774b4f4028a680432cded7cad37bba0fd90d64b187d19", - "sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90", - "sha256:af73657b7a68211996527dbfeffbb0864e043d270580c5aef06dc4b659a4b578", - "sha256:b197e7094f232959f8f20541ead1d9862ac5ebea1d58e9849c1bf979255dfac9", - "sha256:b295729485b06c1a0683af02a9e42d2caa9db04a373dc38a6a58cdd1e8abddf1", - "sha256:b8831399554b92b72af5932cdbbd4ddc55c55f631bb13ff8fe4e6536a06c5c51", - "sha256:b8dcd239c743aa2f9c22ce674a145e0a25cb1566c495928440a181ca1ccf6719", - "sha256:bcb4f8ea87d03bc51ad04add8ceaf9b0f085ac045ab4d74e73bbc2dc033f0236", - "sha256:bd7af3717683bea4c87acd8c0d3d5b44d56120b26fd3f8a692bdd2d5260c620a", - "sha256:bf4475b82be41b07cc5e5ff94810e6a01f276e37c2d55571e3fe175e467a1a1c", - "sha256:c3e446d253bd88f6377260d07c895816ebf33ffffd56c1c792b13bff9c3e1ade", - "sha256:c57516e58fd17d03ebe67e181a4e4e2ccab1168f8c2976c6a334d4f819fe5944", - "sha256:c94057af19bc953643a33581844649a7fdab902624d2eb739738a30e2b3e60fc", - "sha256:cab5d0b79d987c67f3b9e9c53f54a61360422a5a0bc075f43cab5621d530c3b6", - "sha256:ce031db0408e487fd2775d745ce30a7cd2923667cf3b69d48d219f1d8f5ddeb6", - "sha256:cee4373f4d3ad28f1ab6290684d8e2ebdb9e7a1b74fdc39e4c211995f77bec27", - "sha256:d5b054862739d276e09928de37c79ddeec42a6e1bfc55863be96a36ba22926f6", - "sha256:dbe03226baf438ac4fda9e2d0715022fd579cb641c4cf639fa40d53b2fe6f3e2", - "sha256:dc15e99b2d8a656f8e666854404f1ba54765871104e50c8e9813af8a7db07f12", - "sha256:dcaf7c1524c0542ee2fc82cc8ec337f7a9f7edee2532421ab200d2b920fc97cf", - "sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114", - "sha256:dd9a8bd8900e65504a305bf8ae6fa9fbc66de94178c420791d0293702fce2df7", - "sha256:de7376c29d95d6719048c194a9cf1a1b0393fbe8488a22008610b0361d834ecf", - "sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d", - "sha256:e91f541a85298cf35433bf66f3fab2a4a2cff05c127eeca4af174f6d497f0d4b", - "sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed", - "sha256:ee803480535c44e7f5ad00788526da7d85525cfefaf8acf8ab9a310000be4b03", - "sha256:f09cb5a7bbe1ecae6e87901a2eb23e0256bb524a79ccc53eb0b7629fbe7677c4", - "sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67", - "sha256:f1a2f519ae173b5b6a2c9d5fa3116ce16e48b3462c8b96dfdded11055e3d6365", - "sha256:f28f891ccd15c514a0981f3b9db9aa23d62fe1a99997512b0491d2ed323d229a", - "sha256:f3e73a4255342d4eb26ef6df01e3962e73aa29baa3124a8e824c5d3364a65748", - "sha256:f606a1881d2663630ea5b8ce2efe2111740df4b687bd78b34a8131baa007f79b", - "sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079", - "sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482" + "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027", + "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087", + "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786", + "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8", + "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09", + "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185", + "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574", + "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e", + "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519", + "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898", + "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269", + "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3", + "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f", + "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6", + "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8", + "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a", + "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73", + "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc", + "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714", + "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2", + "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc", + "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce", + "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d", + "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e", + "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6", + "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269", + "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96", + "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d", + "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a", + "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4", + "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77", + "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d", + "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0", + "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed", + "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068", + "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac", + "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25", + "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8", + "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab", + "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26", + "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2", + "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db", + "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f", + "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5", + "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99", + "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c", + "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d", + "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811", + "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa", + "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a", + "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03", + "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b", + "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04", + "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c", + "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001", + "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458", + "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389", + "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99", + "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985", + "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537", + "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238", + "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f", + "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d", + "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796", + "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a", + "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143", + "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8", + "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c", + "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5", + "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5", + "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711", + "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4", + "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6", + "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c", + "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7", + "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4", + "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b", + "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae", + "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12", + "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c", + "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae", + "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8", + "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887", + "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b", + "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4", + "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f", + "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5", + "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33", + "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519", + "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561" ], "markers": "python_full_version >= '3.7.0'", - "version": "==3.4.0" + "version": "==3.3.2" }, "click": { "hashes": [ @@ -2144,11 +2122,11 @@ }, "idna": { "hashes": [ - "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", - "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3" + "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc", + "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0" ], - "markers": "python_version >= '3.6'", - "version": "==3.10" + "markers": "python_version >= '3.5'", + "version": "==3.7" }, "imagesize": { "hashes": [ @@ -2191,70 +2169,69 @@ }, "markupsafe": { "hashes": [ - "sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4", - "sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30", - "sha256:1225beacc926f536dc82e45f8a4d68502949dc67eea90eab715dea3a21c1b5f0", - "sha256:131a3c7689c85f5ad20f9f6fb1b866f402c445b220c19fe4308c0b147ccd2ad9", - "sha256:15ab75ef81add55874e7ab7055e9c397312385bd9ced94920f2802310c930396", - "sha256:1a9d3f5f0901fdec14d8d2f66ef7d035f2157240a433441719ac9a3fba440b13", - "sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028", - "sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca", - "sha256:2181e67807fc2fa785d0592dc2d6206c019b9502410671cc905d132a92866557", - "sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832", - "sha256:3169b1eefae027567d1ce6ee7cae382c57fe26e82775f460f0b2778beaad66c0", - "sha256:3809ede931876f5b2ec92eef964286840ed3540dadf803dd570c3b7e13141a3b", - "sha256:38a9ef736c01fccdd6600705b09dc574584b89bea478200c5fbf112a6b0d5579", - "sha256:3d79d162e7be8f996986c064d1c7c817f6df3a77fe3d6859f6f9e7be4b8c213a", - "sha256:444dcda765c8a838eaae23112db52f1efaf750daddb2d9ca300bcae1039adc5c", - "sha256:48032821bbdf20f5799ff537c7ac3d1fba0ba032cfc06194faffa8cda8b560ff", - "sha256:4aa4e5faecf353ed117801a068ebab7b7e09ffb6e1d5e412dc852e0da018126c", - "sha256:52305740fe773d09cffb16f8ed0427942901f00adedac82ec8b67752f58a1b22", - "sha256:569511d3b58c8791ab4c2e1285575265991e6d8f8700c7be0e88f86cb0672094", - "sha256:57cb5a3cf367aeb1d316576250f65edec5bb3be939e9247ae594b4bcbc317dfb", - "sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e", - "sha256:6381026f158fdb7c72a168278597a5e3a5222e83ea18f543112b2662a9b699c5", - "sha256:6af100e168aa82a50e186c82875a5893c5597a0c1ccdb0d8b40240b1f28b969a", - "sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d", - "sha256:6e296a513ca3d94054c2c881cc913116e90fd030ad1c656b3869762b754f5f8a", - "sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b", - "sha256:7e94c425039cde14257288fd61dcfb01963e658efbc0ff54f5306b06054700f8", - "sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225", - "sha256:88416bd1e65dcea10bc7569faacb2c20ce071dd1f87539ca2ab364bf6231393c", - "sha256:88b49a3b9ff31e19998750c38e030fc7bb937398b1f78cfa599aaef92d693144", - "sha256:8c4e8c3ce11e1f92f6536ff07154f9d49677ebaaafc32db9db4620bc11ed480f", - "sha256:8e06879fc22a25ca47312fbe7c8264eb0b662f6db27cb2d3bbbc74b1df4b9b87", - "sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d", - "sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93", - "sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf", - "sha256:9e2d922824181480953426608b81967de705c3cef4d1af983af849d7bd619158", - "sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84", - "sha256:a904af0a6162c73e3edcb969eeeb53a63ceeb5d8cf642fade7d39e7963a22ddb", - "sha256:ad10d3ded218f1039f11a75f8091880239651b52e9bb592ca27de44eed242a48", - "sha256:b424c77b206d63d500bcb69fa55ed8d0e6a3774056bdc4839fc9298a7edca171", - "sha256:b5a6b3ada725cea8a5e634536b1b01c30bcdcd7f9c6fff4151548d5bf6b3a36c", - "sha256:ba8062ed2cf21c07a9e295d5b8a2a5ce678b913b45fdf68c32d95d6c1291e0b6", - "sha256:ba9527cdd4c926ed0760bc301f6728ef34d841f405abf9d4f959c478421e4efd", - "sha256:bbcb445fa71794da8f178f0f6d66789a28d7319071af7a496d4d507ed566270d", - "sha256:bcf3e58998965654fdaff38e58584d8937aa3096ab5354d493c77d1fdd66d7a1", - "sha256:c0ef13eaeee5b615fb07c9a7dadb38eac06a0608b41570d8ade51c56539e509d", - "sha256:cabc348d87e913db6ab4aa100f01b08f481097838bdddf7c7a84b7575b7309ca", - "sha256:cdb82a876c47801bb54a690c5ae105a46b392ac6099881cdfb9f6e95e4014c6a", - "sha256:cfad01eed2c2e0c01fd0ecd2ef42c492f7f93902e39a42fc9ee1692961443a29", - "sha256:d16a81a06776313e817c951135cf7340a3e91e8c1ff2fac444cfd75fffa04afe", - "sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798", - "sha256:e07c3764494e3776c602c1e78e298937c3315ccc9043ead7e685b7f2b8d47b3c", - "sha256:e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8", - "sha256:e444a31f8db13eb18ada366ab3cf45fd4b31e4db1236a4448f68778c1d1a5a2f", - "sha256:e6a2a455bd412959b57a172ce6328d2dd1f01cb2135efda2e4576e8a23fa3b0f", - "sha256:eaa0a10b7f72326f1372a713e73c3f739b524b3af41feb43e4921cb529f5929a", - "sha256:eb7972a85c54febfb25b5c4b4f3af4dcc731994c7da0d8a0b4a6eb0640e1d178", - "sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0", - "sha256:f3818cb119498c0678015754eba762e0d61e5b52d34c8b13d770f0719f7b1d79", - "sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430", - "sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50" + "sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf", + "sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff", + "sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f", + "sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3", + "sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532", + "sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f", + "sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617", + "sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df", + "sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4", + "sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906", + "sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f", + "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4", + "sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8", + "sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371", + "sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2", + "sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465", + "sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52", + "sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6", + "sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169", + "sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad", + "sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2", + "sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0", + "sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029", + "sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f", + "sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a", + "sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced", + "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5", + "sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c", + "sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf", + "sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9", + "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb", + "sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad", + "sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3", + "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1", + "sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46", + "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc", + "sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a", + "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee", + "sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900", + "sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5", + "sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea", + "sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f", + "sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5", + "sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e", + "sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a", + "sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f", + "sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50", + "sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a", + "sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b", + "sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4", + "sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff", + "sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2", + "sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46", + "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b", + "sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf", + "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5", + "sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5", + "sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab", + "sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd", + "sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68" ], - "markers": "python_version >= '3.9'", - "version": "==3.0.2" + "markers": "python_version >= '3.7'", + "version": "==2.1.5" }, "mccabe": { "hashes": [ @@ -2293,19 +2270,19 @@ }, "packaging": { "hashes": [ - "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", - "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124" + "sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2", + "sha256:b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97" ], - "markers": "python_version >= '3.8'", - "version": "==24.1" + "markers": "python_version >= '3.7'", + "version": "==23.0" }, "platformdirs": { "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" + "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee", + "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3" ], "markers": "python_version >= '3.8'", - "version": "==4.3.6" + "version": "==4.2.2" }, "pydata-sphinx-theme": { "hashes": [ @@ -2325,12 +2302,12 @@ }, "pylint": { "hashes": [ - "sha256:2f846a466dd023513240bc140ad2dd73bfc080a5d85a710afdb728c420a5a2b9", - "sha256:9f3dcc87b1203e612b78d91a896407787e708b3f189b5fa0b307712d49ff0c6e" + "sha256:03c8e3baa1d9fb995b12c1dbe00aa6c4bcef210c2a2634374aedeb22fb4a8f8f", + "sha256:a5d01678349454806cff6d886fb072294f56a58c4761278c97fb557d708e1eb3" ], "index": "pypi", - "markers": "python_full_version >= '3.9.0'", - "version": "==3.3.1" + "markers": "python_full_version >= '3.8.0'", + "version": "==3.2.6" }, "pyyaml": { "hashes": [ @@ -2445,21 +2422,21 @@ }, "sphinx": { "hashes": [ - "sha256:09719015511837b76bf6e03e42eb7595ac8c2e41eeb9c29c5b755c6b677992a2", - "sha256:43c1911eecb0d3e161ad78611bc905d1ad0e523e4ddc202a58a821773dc4c927" + "sha256:0cce1ddcc4fd3532cf1dd283bc7d886758362c5c1de6598696579ce96d8ffa5b", + "sha256:56173572ae6c1b9a38911786e206a110c9749116745873feae4f9ce88e59391d" ], "index": "pypi", "markers": "python_version >= '3.10'", - "version": "==8.1.3" + "version": "==8.0.2" }, "sphinx-autobuild": { "hashes": [ - "sha256:158e16c36f9d633e613c9aaf81c19b0fc458ca78b112533b20dafcda430d60fa", - "sha256:248150f8f333e825107b6d4b86113ab28fa51750e5f9ae63b59dc339be951fb1" + "sha256:1c0ed37a1970eed197f9c5a66d65759e7c4e4cba7b5a5d77940752bf1a59f2c7", + "sha256:f2522779d30fcbf0253e09714f274ce8c608cb6ebcd67922b1c54de59faba702" ], "index": "pypi", "markers": "python_version >= '3.9'", - "version": "==2024.10.3" + "version": "==2024.4.16" }, "sphinx-book-theme": { "hashes": [ @@ -2537,19 +2514,19 @@ }, "starlette": { "hashes": [ - "sha256:39cbd8768b107d68bfe1ff1672b38a2c38b49777de46d2a592841d58e3bf7c2a", - "sha256:a0193a3c413ebc9c78bff1c3546a45bb8c8bcb4a84cae8747d650a65bd37210a" + "sha256:4ec6a59df6bbafdab5f567754481657f7ed90dc9d69b0c9ff017907dd54faeff", + "sha256:c7c0441065252160993a1a37cf2a73bb64d271b17303e0b0c1eb7191cfb12d75" ], "markers": "python_version >= '3.8'", - "version": "==0.41.0" + "version": "==0.38.2" }, "tomlkit": { "hashes": [ - "sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde", - "sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79" + "sha256:08ad192699734149f5b97b45f1f18dad7eb1b6d16bc72ad0c2335772650d7b72", + "sha256:7075d3042d03b80f603482d69bf0c8f345c2b30e41699fd8883227f89972b264" ], "markers": "python_version >= '3.8'", - "version": "==0.13.2" + "version": "==0.13.0" }, "typing-extensions": { "hashes": [ @@ -2569,19 +2546,19 @@ }, "urllib3": { "hashes": [ - "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac", - "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9" + "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472", + "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" ], "markers": "python_version >= '3.8'", - "version": "==2.2.3" + "version": "==2.2.2" }, "uvicorn": { "hashes": [ - "sha256:60b8f3a5ac027dcd31448f411ced12b5ef452c646f76f02f8cc3f25d8d26fd82", - "sha256:f78b36b143c16f54ccdb8190d0a26b5f1901fe5a3c777e1ab29f26391af8551e" + "sha256:ac6fdbd4425c5fd17a9fe39daf4d4d075da6fdc80f653e5894cdc2fd98752bee", + "sha256:b2d86de274726e9878188fa07576c9ceeff90a839e2b6e25c917fe05f5a6c835" ], "markers": "python_version >= '3.8'", - "version": "==0.32.0" + "version": "==0.30.5" }, "version-query": { "hashes": [ @@ -2594,184 +2571,162 @@ }, "watchfiles": { "hashes": [ - "sha256:01550ccf1d0aed6ea375ef259706af76ad009ef5b0203a3a4cce0f6024f9b68a", - "sha256:01def80eb62bd5db99a798d5e1f5f940ca0a05986dcfae21d833af7a46f7ee22", - "sha256:07cdef0c84c03375f4e24642ef8d8178e533596b229d32d2bbd69e5128ede02a", - "sha256:083dc77dbdeef09fa44bb0f4d1df571d2e12d8a8f985dccde71ac3ac9ac067a0", - "sha256:1cf1f6dd7825053f3d98f6d33f6464ebdd9ee95acd74ba2c34e183086900a827", - "sha256:21ab23fdc1208086d99ad3f69c231ba265628014d4aed31d4e8746bd59e88cd1", - "sha256:2dadf8a8014fde6addfd3c379e6ed1a981c8f0a48292d662e27cabfe4239c83c", - "sha256:2e28d91ef48eab0afb939fa446d8ebe77e2f7593f5f463fd2bb2b14132f95b6e", - "sha256:2efec17819b0046dde35d13fb8ac7a3ad877af41ae4640f4109d9154ed30a188", - "sha256:30bbd525c3262fd9f4b1865cb8d88e21161366561cd7c9e1194819e0a33ea86b", - "sha256:316449aefacf40147a9efaf3bd7c9bdd35aaba9ac5d708bd1eb5763c9a02bef5", - "sha256:327763da824817b38ad125dcd97595f942d720d32d879f6c4ddf843e3da3fe90", - "sha256:32aa53a9a63b7f01ed32e316e354e81e9da0e6267435c7243bf8ae0f10b428ef", - "sha256:34e19e56d68b0dad5cff62273107cf5d9fbaf9d75c46277aa5d803b3ef8a9e9b", - "sha256:3770e260b18e7f4e576edca4c0a639f704088602e0bc921c5c2e721e3acb8d15", - "sha256:3d2e3ab79a1771c530233cadfd277fcc762656d50836c77abb2e5e72b88e3a48", - "sha256:41face41f036fee09eba33a5b53a73e9a43d5cb2c53dad8e61fa6c9f91b5a51e", - "sha256:43e3e37c15a8b6fe00c1bce2473cfa8eb3484bbeecf3aefbf259227e487a03df", - "sha256:449f43f49c8ddca87c6b3980c9284cab6bd1f5c9d9a2b00012adaaccd5e7decd", - "sha256:4933a508d2f78099162da473841c652ad0de892719043d3f07cc83b33dfd9d91", - "sha256:49d617df841a63b4445790a254013aea2120357ccacbed00253f9c2b5dc24e2d", - "sha256:49fb58bcaa343fedc6a9e91f90195b20ccb3135447dc9e4e2570c3a39565853e", - "sha256:4a7fa2bc0efef3e209a8199fd111b8969fe9db9c711acc46636686331eda7dd4", - "sha256:4abf4ad269856618f82dee296ac66b0cd1d71450fc3c98532d93798e73399b7a", - "sha256:4b8693502d1967b00f2fb82fc1e744df128ba22f530e15b763c8d82baee15370", - "sha256:4d28cea3c976499475f5b7a2fec6b3a36208656963c1a856d328aeae056fc5c1", - "sha256:5148c2f1ea043db13ce9b0c28456e18ecc8f14f41325aa624314095b6aa2e9ea", - "sha256:54ca90a9ae6597ae6dc00e7ed0a040ef723f84ec517d3e7ce13e63e4bc82fa04", - "sha256:551ec3ee2a3ac9cbcf48a4ec76e42c2ef938a7e905a35b42a1267fa4b1645896", - "sha256:5c51749f3e4e269231510da426ce4a44beb98db2dce9097225c338f815b05d4f", - "sha256:632676574429bee8c26be8af52af20e0c718cc7f5f67f3fb658c71928ccd4f7f", - "sha256:6509ed3f467b79d95fc62a98229f79b1a60d1b93f101e1c61d10c95a46a84f43", - "sha256:6bdcfa3cd6fdbdd1a068a52820f46a815401cbc2cb187dd006cb076675e7b735", - "sha256:7138eff8baa883aeaa074359daabb8b6c1e73ffe69d5accdc907d62e50b1c0da", - "sha256:7211b463695d1e995ca3feb38b69227e46dbd03947172585ecb0588f19b0d87a", - "sha256:73bde715f940bea845a95247ea3e5eb17769ba1010efdc938ffcb967c634fa61", - "sha256:78470906a6be5199524641f538bd2c56bb809cd4bf29a566a75051610bc982c3", - "sha256:7ae3e208b31be8ce7f4c2c0034f33406dd24fbce3467f77223d10cd86778471c", - "sha256:7e4bd963a935aaf40b625c2499f3f4f6bbd0c3776f6d3bc7c853d04824ff1c9f", - "sha256:82ae557a8c037c42a6ef26c494d0631cacca040934b101d001100ed93d43f361", - "sha256:82b2509f08761f29a0fdad35f7e1638b8ab1adfa2666d41b794090361fb8b855", - "sha256:8360f7314a070c30e4c976b183d1d8d1585a4a50c5cb603f431cebcbb4f66327", - "sha256:85d5f0c7771dcc7a26c7a27145059b6bb0ce06e4e751ed76cdf123d7039b60b5", - "sha256:88bcd4d0fe1d8ff43675360a72def210ebad3f3f72cabfeac08d825d2639b4ab", - "sha256:9301c689051a4857d5b10777da23fafb8e8e921bcf3abe6448a058d27fb67633", - "sha256:951088d12d339690a92cef2ec5d3cfd957692834c72ffd570ea76a6790222777", - "sha256:95cf3b95ea665ab03f5a54765fa41abf0529dbaf372c3b83d91ad2cfa695779b", - "sha256:96619302d4374de5e2345b2b622dc481257a99431277662c30f606f3e22f42be", - "sha256:999928c6434372fde16c8f27143d3e97201160b48a614071261701615a2a156f", - "sha256:9a60e2bf9dc6afe7f743e7c9b149d1fdd6dbf35153c78fe3a14ae1a9aee3d98b", - "sha256:9f895d785eb6164678ff4bb5cc60c5996b3ee6df3edb28dcdeba86a13ea0465e", - "sha256:a2a9891723a735d3e2540651184be6fd5b96880c08ffe1a98bae5017e65b544b", - "sha256:a974231b4fdd1bb7f62064a0565a6b107d27d21d9acb50c484d2cdba515b9366", - "sha256:aa0fd7248cf533c259e59dc593a60973a73e881162b1a2f73360547132742823", - "sha256:acbfa31e315a8f14fe33e3542cbcafc55703b8f5dcbb7c1eecd30f141df50db3", - "sha256:afb72325b74fa7a428c009c1b8be4b4d7c2afedafb2982827ef2156646df2fe1", - "sha256:b3ef2c69c655db63deb96b3c3e587084612f9b1fa983df5e0c3379d41307467f", - "sha256:b52a65e4ea43c6d149c5f8ddb0bef8d4a1e779b77591a458a893eb416624a418", - "sha256:b665caeeda58625c3946ad7308fbd88a086ee51ccb706307e5b1fa91556ac886", - "sha256:b74fdffce9dfcf2dc296dec8743e5b0332d15df19ae464f0e249aa871fc1c571", - "sha256:b995bfa6bf01a9e09b884077a6d37070464b529d8682d7691c2d3b540d357a0c", - "sha256:bd82010f8ab451dabe36054a1622870166a67cf3fce894f68895db6f74bbdc94", - "sha256:bdcd5538e27f188dd3c804b4a8d5f52a7fc7f87e7fd6b374b8e36a4ca03db428", - "sha256:c79d7719d027b7a42817c5d96461a99b6a49979c143839fc37aa5748c322f234", - "sha256:cdab9555053399318b953a1fe1f586e945bc8d635ce9d05e617fd9fe3a4687d6", - "sha256:ce72dba6a20e39a0c628258b5c308779b8697f7676c254a845715e2a1039b968", - "sha256:d337193bbf3e45171c8025e291530fb7548a93c45253897cd764a6a71c937ed9", - "sha256:d3dcb774e3568477275cc76554b5a565024b8ba3a0322f77c246bc7111c5bb9c", - "sha256:d64ba08db72e5dfd5c33be1e1e687d5e4fcce09219e8aee893a4862034081d4e", - "sha256:d7a2e3b7f5703ffbd500dabdefcbc9eafeff4b9444bbdd5d83d79eedf8428fab", - "sha256:d831ee0a50946d24a53821819b2327d5751b0c938b12c0653ea5be7dea9c82ec", - "sha256:d9018153cf57fc302a2a34cb7564870b859ed9a732d16b41a9b5cb2ebed2d444", - "sha256:e5171ef898299c657685306d8e1478a45e9303ddcd8ac5fed5bd52ad4ae0b69b", - "sha256:e94e98c7cb94cfa6e071d401ea3342767f28eb5a06a58fafdc0d2a4974f4f35c", - "sha256:ec39698c45b11d9694a1b635a70946a5bad066b593af863460a8e600f0dff1ca", - "sha256:ed9aba6e01ff6f2e8285e5aa4154e2970068fe0fc0998c4380d0e6278222269b", - "sha256:edf71b01dec9f766fb285b73930f95f730bb0943500ba0566ae234b5c1618c18", - "sha256:ee82c98bed9d97cd2f53bdb035e619309a098ea53ce525833e26b93f673bc318", - "sha256:f4c96283fca3ee09fb044f02156d9570d156698bc3734252175a38f0e8975f07", - "sha256:f7d9b87c4c55e3ea8881dfcbf6d61ea6775fffed1fedffaa60bd047d3c08c430", - "sha256:f83df90191d67af5a831da3a33dd7628b02a95450e168785586ed51e6d28943c", - "sha256:fca9433a45f18b7c779d2bae7beeec4f740d28b788b117a48368d95a3233ed83", - "sha256:fd92bbaa2ecdb7864b7600dcdb6f2f1db6e0346ed425fbd01085be04c63f0b05" - ], - "markers": "python_version >= '3.8'", - "version": "==0.24.0" + "sha256:00095dd368f73f8f1c3a7982a9801190cc88a2f3582dd395b289294f8975172b", + "sha256:00ad0bcd399503a84cc688590cdffbe7a991691314dde5b57b3ed50a41319a31", + "sha256:00f39592cdd124b4ec5ed0b1edfae091567c72c7da1487ae645426d1b0ffcad1", + "sha256:030bc4e68d14bcad2294ff68c1ed87215fbd9a10d9dea74e7cfe8a17869785ab", + "sha256:052d668a167e9fc345c24203b104c313c86654dd6c0feb4b8a6dfc2462239249", + "sha256:067dea90c43bf837d41e72e546196e674f68c23702d3ef80e4e816937b0a3ffd", + "sha256:0b04a2cbc30e110303baa6d3ddce8ca3664bc3403be0f0ad513d1843a41c97d1", + "sha256:0bc3b2f93a140df6806c8467c7f51ed5e55a931b031b5c2d7ff6132292e803d6", + "sha256:0c8e0aa0e8cc2a43561e0184c0513e291ca891db13a269d8d47cb9841ced7c71", + "sha256:103622865599f8082f03af4214eaff90e2426edff5e8522c8f9e93dc17caee13", + "sha256:1235c11510ea557fe21be5d0e354bae2c655a8ee6519c94617fe63e05bca4171", + "sha256:1cc0cba54f47c660d9fa3218158b8963c517ed23bd9f45fe463f08262a4adae1", + "sha256:1d9188979a58a096b6f8090e816ccc3f255f137a009dd4bbec628e27696d67c1", + "sha256:213792c2cd3150b903e6e7884d40660e0bcec4465e00563a5fc03f30ea9c166c", + "sha256:25c817ff2a86bc3de3ed2df1703e3d24ce03479b27bb4527c57e722f8554d971", + "sha256:2627a91e8110b8de2406d8b2474427c86f5a62bf7d9ab3654f541f319ef22bcb", + "sha256:280a4afbc607cdfc9571b9904b03a478fc9f08bbeec382d648181c695648202f", + "sha256:28324d6b28bcb8d7c1041648d7b63be07a16db5510bea923fc80b91a2a6cbed6", + "sha256:28585744c931576e535860eaf3f2c0ec7deb68e3b9c5a85ca566d69d36d8dd27", + "sha256:28f393c1194b6eaadcdd8f941307fc9bbd7eb567995232c830f6aef38e8a6e88", + "sha256:2abeb79209630da981f8ebca30a2c84b4c3516a214451bfc5f106723c5f45843", + "sha256:2bdadf6b90c099ca079d468f976fd50062905d61fae183f769637cb0f68ba59a", + "sha256:2f350cbaa4bb812314af5dab0eb8d538481e2e2279472890864547f3fe2281ed", + "sha256:3218a6f908f6a276941422b035b511b6d0d8328edd89a53ae8c65be139073f84", + "sha256:3973145235a38f73c61474d56ad6199124e7488822f3a4fc97c72009751ae3b0", + "sha256:3a0d883351a34c01bd53cfa75cd0292e3f7e268bacf2f9e33af4ecede7e21d1d", + "sha256:425440e55cd735386ec7925f64d5dde392e69979d4c8459f6bb4e920210407f2", + "sha256:4b9f2a128a32a2c273d63eb1fdbf49ad64852fc38d15b34eaa3f7ca2f0d2b797", + "sha256:4cc382083afba7918e32d5ef12321421ef43d685b9a67cc452a6e6e18920890e", + "sha256:52fc9b0dbf54d43301a19b236b4a4614e610605f95e8c3f0f65c3a456ffd7d35", + "sha256:55b7cc10261c2786c41d9207193a85c1db1b725cf87936df40972aab466179b6", + "sha256:581f0a051ba7bafd03e17127735d92f4d286af941dacf94bcf823b101366249e", + "sha256:5834e1f8b71476a26df97d121c0c0ed3549d869124ed2433e02491553cb468c2", + "sha256:5e45fb0d70dda1623a7045bd00c9e036e6f1f6a85e4ef2c8ae602b1dfadf7550", + "sha256:61af9efa0733dc4ca462347becb82e8ef4945aba5135b1638bfc20fad64d4f0e", + "sha256:68fe0c4d22332d7ce53ad094622b27e67440dacefbaedd29e0794d26e247280c", + "sha256:72a44e9481afc7a5ee3291b09c419abab93b7e9c306c9ef9108cb76728ca58d2", + "sha256:7a74436c415843af2a769b36bf043b6ccbc0f8d784814ba3d42fc961cdb0a9dc", + "sha256:8597b6f9dc410bdafc8bb362dac1cbc9b4684a8310e16b1ff5eee8725d13dcd6", + "sha256:8c39987a1397a877217be1ac0fb1d8b9f662c6077b90ff3de2c05f235e6a8f96", + "sha256:8c3e3675e6e39dc59b8fe5c914a19d30029e36e9f99468dddffd432d8a7b1c93", + "sha256:8dc1fc25a1dedf2dd952909c8e5cb210791e5f2d9bc5e0e8ebc28dd42fed7562", + "sha256:8fdebb655bb1ba0122402352b0a4254812717a017d2dc49372a1d47e24073795", + "sha256:9165bcab15f2b6d90eedc5c20a7f8a03156b3773e5fb06a790b54ccecdb73385", + "sha256:94ebe84a035993bb7668f58a0ebf998174fb723a39e4ef9fce95baabb42b787f", + "sha256:9624a68b96c878c10437199d9a8b7d7e542feddda8d5ecff58fdc8e67b460848", + "sha256:96eec15e5ea7c0b6eb5bfffe990fc7c6bd833acf7e26704eb18387fb2f5fd087", + "sha256:97b94e14b88409c58cdf4a8eaf0e67dfd3ece7e9ce7140ea6ff48b0407a593ec", + "sha256:988e981aaab4f3955209e7e28c7794acdb690be1efa7f16f8ea5aba7ffdadacb", + "sha256:a8a31bfd98f846c3c284ba694c6365620b637debdd36e46e1859c897123aa232", + "sha256:a927b3034d0672f62fb2ef7ea3c9fc76d063c4b15ea852d1db2dc75fe2c09696", + "sha256:ace7d060432acde5532e26863e897ee684780337afb775107c0a90ae8dbccfd2", + "sha256:aec83c3ba24c723eac14225194b862af176d52292d271c98820199110e31141e", + "sha256:b44b70850f0073b5fcc0b31ede8b4e736860d70e2dbf55701e05d3227a154a67", + "sha256:b610fb5e27825b570554d01cec427b6620ce9bd21ff8ab775fc3a32f28bba63e", + "sha256:b810a2c7878cbdecca12feae2c2ae8af59bea016a78bc353c184fa1e09f76b68", + "sha256:bbf8a20266136507abf88b0df2328e6a9a7c7309e8daff124dda3803306a9fdb", + "sha256:bd4c06100bce70a20c4b81e599e5886cf504c9532951df65ad1133e508bf20be", + "sha256:c2444dc7cb9d8cc5ab88ebe792a8d75709d96eeef47f4c8fccb6df7c7bc5be71", + "sha256:c49b76a78c156979759d759339fb62eb0549515acfe4fd18bb151cc07366629c", + "sha256:c4a65474fd2b4c63e2c18ac67a0c6c66b82f4e73e2e4d940f837ed3d2fd9d4da", + "sha256:c5af2347d17ab0bd59366db8752d9e037982e259cacb2ba06f2c41c08af02c39", + "sha256:c668228833c5619f6618699a2c12be057711b0ea6396aeaece4ded94184304ea", + "sha256:c7b978c384e29d6c7372209cbf421d82286a807bbcdeb315427687f8371c340a", + "sha256:d048ad5d25b363ba1d19f92dcf29023988524bee6f9d952130b316c5802069cb", + "sha256:d3e1f3cf81f1f823e7874ae563457828e940d75573c8fbf0ee66818c8b6a9099", + "sha256:d47e9ef1a94cc7a536039e46738e17cce058ac1593b2eccdede8bf72e45f372a", + "sha256:da1e0a8caebf17976e2ffd00fa15f258e14749db5e014660f53114b676e68538", + "sha256:dc1b9b56f051209be458b87edb6856a449ad3f803315d87b2da4c93b43a6fe72", + "sha256:dc2e8fe41f3cac0660197d95216c42910c2b7e9c70d48e6d84e22f577d106fc1", + "sha256:dc92d2d2706d2b862ce0568b24987eba51e17e14b79a1abcd2edc39e48e743c8", + "sha256:dd64f3a4db121bc161644c9e10a9acdb836853155a108c2446db2f5ae1778c3d", + "sha256:e0f0a874231e2839abbf473256efffe577d6ee2e3bfa5b540479e892e47c172d", + "sha256:f7e1f9c5d1160d03b93fc4b68a0aeb82fe25563e12fbcdc8507f8434ab6f823c", + "sha256:fe82d13461418ca5e5a808a9e40f79c1879351fcaeddbede094028e74d836e86" + ], + "markers": "python_version >= '3.8'", + "version": "==0.22.0" }, "websockets": { "hashes": [ - "sha256:004280a140f220c812e65f36944a9ca92d766b6cc4560be652a0a3883a79ed8a", - "sha256:035233b7531fb92a76beefcbf479504db8c72eb3bff41da55aecce3a0f729e54", - "sha256:149e622dc48c10ccc3d2760e5f36753db9cacf3ad7bc7bbbfd7d9c819e286f23", - "sha256:163e7277e1a0bd9fb3c8842a71661ad19c6aa7bb3d6678dc7f89b17fbcc4aeb7", - "sha256:18503d2c5f3943e93819238bf20df71982d193f73dcecd26c94514f417f6b135", - "sha256:1971e62d2caa443e57588e1d82d15f663b29ff9dfe7446d9964a4b6f12c1e700", - "sha256:204e5107f43095012b00f1451374693267adbb832d29966a01ecc4ce1db26faf", - "sha256:2510c09d8e8df777177ee3d40cd35450dc169a81e747455cc4197e63f7e7bfe5", - "sha256:25c35bf84bf7c7369d247f0b8cfa157f989862c49104c5cf85cb5436a641d93e", - "sha256:2f85cf4f2a1ba8f602298a853cec8526c2ca42a9a4b947ec236eaedb8f2dc80c", - "sha256:308e20f22c2c77f3f39caca508e765f8725020b84aa963474e18c59accbf4c02", - "sha256:325b1ccdbf5e5725fdcb1b0e9ad4d2545056479d0eee392c291c1bf76206435a", - "sha256:327b74e915cf13c5931334c61e1a41040e365d380f812513a255aa804b183418", - "sha256:346bee67a65f189e0e33f520f253d5147ab76ae42493804319b5716e46dddf0f", - "sha256:38377f8b0cdeee97c552d20cf1865695fcd56aba155ad1b4ca8779a5b6ef4ac3", - "sha256:3c78383585f47ccb0fcf186dcb8a43f5438bd7d8f47d69e0b56f71bf431a0a68", - "sha256:4059f790b6ae8768471cddb65d3c4fe4792b0ab48e154c9f0a04cefaabcd5978", - "sha256:459bf774c754c35dbb487360b12c5727adab887f1622b8aed5755880a21c4a20", - "sha256:463e1c6ec853202dd3657f156123d6b4dad0c546ea2e2e38be2b3f7c5b8e7295", - "sha256:4676df3fe46956fbb0437d8800cd5f2b6d41143b6e7e842e60554398432cf29b", - "sha256:485307243237328c022bc908b90e4457d0daa8b5cf4b3723fd3c4a8012fce4c6", - "sha256:48a2ef1381632a2f0cb4efeff34efa97901c9fbc118e01951ad7cfc10601a9bb", - "sha256:4b889dbd1342820cc210ba44307cf75ae5f2f96226c0038094455a96e64fb07a", - "sha256:586a356928692c1fed0eca68b4d1c2cbbd1ca2acf2ac7e7ebd3b9052582deefa", - "sha256:58cf7e75dbf7e566088b07e36ea2e3e2bd5676e22216e4cad108d4df4a7402a0", - "sha256:5993260f483d05a9737073be197371940c01b257cc45ae3f1d5d7adb371b266a", - "sha256:5dd6da9bec02735931fccec99d97c29f47cc61f644264eb995ad6c0c27667238", - "sha256:5f2e75431f8dc4a47f31565a6e1355fb4f2ecaa99d6b89737527ea917066e26c", - "sha256:5f9fee94ebafbc3117c30be1844ed01a3b177bb6e39088bc6b2fa1dc15572084", - "sha256:61fc0dfcda609cda0fc9fe7977694c0c59cf9d749fbb17f4e9483929e3c48a19", - "sha256:624459daabeb310d3815b276c1adef475b3e6804abaf2d9d2c061c319f7f187d", - "sha256:62d516c325e6540e8a57b94abefc3459d7dab8ce52ac75c96cad5549e187e3a7", - "sha256:6548f29b0e401eea2b967b2fdc1c7c7b5ebb3eeb470ed23a54cd45ef078a0db9", - "sha256:6d2aad13a200e5934f5a6767492fb07151e1de1d6079c003ab31e1823733ae79", - "sha256:6d6855bbe70119872c05107e38fbc7f96b1d8cb047d95c2c50869a46c65a8e96", - "sha256:70c5be9f416aa72aab7a2a76c90ae0a4fe2755c1816c153c1a2bcc3333ce4ce6", - "sha256:730f42125ccb14602f455155084f978bd9e8e57e89b569b4d7f0f0c17a448ffe", - "sha256:7a43cfdcddd07f4ca2b1afb459824dd3c6d53a51410636a2c7fc97b9a8cf4842", - "sha256:7bd6abf1e070a6b72bfeb71049d6ad286852e285f146682bf30d0296f5fbadfa", - "sha256:7c1e90228c2f5cdde263253fa5db63e6653f1c00e7ec64108065a0b9713fa1b3", - "sha256:7c65ffa900e7cc958cd088b9a9157a8141c991f8c53d11087e6fb7277a03f81d", - "sha256:80c421e07973a89fbdd93e6f2003c17d20b69010458d3a8e37fb47874bd67d51", - "sha256:82d0ba76371769d6a4e56f7e83bb8e81846d17a6190971e38b5de108bde9b0d7", - "sha256:83f91d8a9bb404b8c2c41a707ac7f7f75b9442a0a876df295de27251a856ad09", - "sha256:87c6e35319b46b99e168eb98472d6c7d8634ee37750d7693656dc766395df096", - "sha256:8d23b88b9388ed85c6faf0e74d8dec4f4d3baf3ecf20a65a47b836d56260d4b9", - "sha256:9156c45750b37337f7b0b00e6248991a047be4aa44554c9886fe6bdd605aab3b", - "sha256:91a0fa841646320ec0d3accdff5b757b06e2e5c86ba32af2e0815c96c7a603c5", - "sha256:95858ca14a9f6fa8413d29e0a585b31b278388aa775b8a81fa24830123874678", - "sha256:95df24ca1e1bd93bbca51d94dd049a984609687cb2fb08a7f2c56ac84e9816ea", - "sha256:9b37c184f8b976f0c0a231a5f3d6efe10807d41ccbe4488df8c74174805eea7d", - "sha256:9b6f347deb3dcfbfde1c20baa21c2ac0751afaa73e64e5b693bb2b848efeaa49", - "sha256:9d75baf00138f80b48f1eac72ad1535aac0b6461265a0bcad391fc5aba875cfc", - "sha256:9ef8aa8bdbac47f4968a5d66462a2a0935d044bf35c0e5a8af152d58516dbeb5", - "sha256:a11e38ad8922c7961447f35c7b17bffa15de4d17c70abd07bfbe12d6faa3e027", - "sha256:a1b54689e38d1279a51d11e3467dd2f3a50f5f2e879012ce8f2d6943f00e83f0", - "sha256:a3b3366087c1bc0a2795111edcadddb8b3b59509d5db5d7ea3fdd69f954a8878", - "sha256:a569eb1b05d72f9bce2ebd28a1ce2054311b66677fcd46cf36204ad23acead8c", - "sha256:a7affedeb43a70351bb811dadf49493c9cfd1ed94c9c70095fd177e9cc1541fa", - "sha256:a9a396a6ad26130cdae92ae10c36af09d9bfe6cafe69670fd3b6da9b07b4044f", - "sha256:a9ab1e71d3d2e54a0aa646ab6d4eebfaa5f416fe78dfe4da2839525dc5d765c6", - "sha256:a9cd1af7e18e5221d2878378fbc287a14cd527fdd5939ed56a18df8a31136bb2", - "sha256:a9dcaf8b0cc72a392760bb8755922c03e17a5a54e08cca58e8b74f6902b433cf", - "sha256:b9d7439d7fab4dce00570bb906875734df13d9faa4b48e261c440a5fec6d9708", - "sha256:bcc03c8b72267e97b49149e4863d57c2d77f13fae12066622dc78fe322490fe6", - "sha256:c11d4d16e133f6df8916cc5b7e3e96ee4c44c936717d684a94f48f82edb7c92f", - "sha256:c1dca61c6db1166c48b95198c0b7d9c990b30c756fc2923cc66f68d17dc558fd", - "sha256:c518e84bb59c2baae725accd355c8dc517b4a3ed8db88b4bc93c78dae2974bf2", - "sha256:c7934fd0e920e70468e676fe7f1b7261c1efa0d6c037c6722278ca0228ad9d0d", - "sha256:c7e72ce6bda6fb9409cc1e8164dd41d7c91466fb599eb047cfda72fe758a34a7", - "sha256:c90d6dec6be2c7d03378a574de87af9b1efea77d0c52a8301dd831ece938452f", - "sha256:ceec59f59d092c5007e815def4ebb80c2de330e9588e101cf8bd94c143ec78a5", - "sha256:cf1781ef73c073e6b0f90af841aaf98501f975d306bbf6221683dd594ccc52b6", - "sha256:d04f13a1d75cb2b8382bdc16ae6fa58c97337253826dfe136195b7f89f661557", - "sha256:d6d300f8ec35c24025ceb9b9019ae9040c1ab2f01cddc2bcc0b518af31c75c14", - "sha256:d8dbb1bf0c0a4ae8b40bdc9be7f644e2f3fb4e8a9aca7145bfa510d4a374eeb7", - "sha256:de58647e3f9c42f13f90ac7e5f58900c80a39019848c5547bc691693098ae1bd", - "sha256:deeb929efe52bed518f6eb2ddc00cc496366a14c726005726ad62c2dd9017a3c", - "sha256:df01aea34b6e9e33572c35cd16bae5a47785e7d5c8cb2b54b2acdb9678315a17", - "sha256:e2620453c075abeb0daa949a292e19f56de518988e079c36478bacf9546ced23", - "sha256:e4450fc83a3df53dec45922b576e91e94f5578d06436871dce3a6be38e40f5db", - "sha256:e54affdeb21026329fb0744ad187cf812f7d3c2aa702a5edb562b325191fcab6", - "sha256:e9875a0143f07d74dc5e1ded1c4581f0d9f7ab86c78994e2ed9e95050073c94d", - "sha256:f1c3cf67185543730888b20682fb186fc8d0fa6f07ccc3ef4390831ab4b388d9", - "sha256:f48c749857f8fb598fb890a75f540e3221d0976ed0bf879cf3c7eef34151acee", - "sha256:f779498eeec470295a2b1a5d97aa1bc9814ecd25e1eb637bd9d1c73a327387f6" - ], - "markers": "python_version >= '3.8'", - "version": "==13.1" + "sha256:00700340c6c7ab788f176d118775202aadea7602c5cc6be6ae127761c16d6b0b", + "sha256:0bee75f400895aef54157b36ed6d3b308fcab62e5260703add87f44cee9c82a6", + "sha256:0e6e2711d5a8e6e482cacb927a49a3d432345dfe7dea8ace7b5790df5932e4df", + "sha256:12743ab88ab2af1d17dd4acb4645677cb7063ef4db93abffbf164218a5d54c6b", + "sha256:1a9d160fd080c6285e202327aba140fc9a0d910b09e423afff4ae5cbbf1c7205", + "sha256:1bf386089178ea69d720f8db6199a0504a406209a0fc23e603b27b300fdd6892", + "sha256:1df2fbd2c8a98d38a66f5238484405b8d1d16f929bb7a33ed73e4801222a6f53", + "sha256:1e4b3f8ea6a9cfa8be8484c9221ec0257508e3a1ec43c36acdefb2a9c3b00aa2", + "sha256:1f38a7b376117ef7aff996e737583172bdf535932c9ca021746573bce40165ed", + "sha256:23509452b3bc38e3a057382c2e941d5ac2e01e251acce7adc74011d7d8de434c", + "sha256:248d8e2446e13c1d4326e0a6a4e9629cb13a11195051a73acf414812700badbd", + "sha256:25eb766c8ad27da0f79420b2af4b85d29914ba0edf69f547cc4f06ca6f1d403b", + "sha256:27a5e9964ef509016759f2ef3f2c1e13f403725a5e6a1775555994966a66e931", + "sha256:2c71bd45a777433dd9113847af751aae36e448bc6b8c361a566cb043eda6ec30", + "sha256:2cb388a5bfb56df4d9a406783b7f9dbefb888c09b71629351cc6b036e9259370", + "sha256:2d225bb6886591b1746b17c0573e29804619c8f755b5598d875bb4235ea639be", + "sha256:2e5fc14ec6ea568200ea4ef46545073da81900a2b67b3e666f04adf53ad452ec", + "sha256:363f57ca8bc8576195d0540c648aa58ac18cf85b76ad5202b9f976918f4219cf", + "sha256:3c6cc1360c10c17463aadd29dd3af332d4a1adaa8796f6b0e9f9df1fdb0bad62", + "sha256:3d829f975fc2e527a3ef2f9c8f25e553eb7bc779c6665e8e1d52aa22800bb38b", + "sha256:3e3aa8c468af01d70332a382350ee95f6986db479ce7af14d5e81ec52aa2b402", + "sha256:3f61726cae9f65b872502ff3c1496abc93ffbe31b278455c418492016e2afc8f", + "sha256:423fc1ed29f7512fceb727e2d2aecb952c46aa34895e9ed96071821309951123", + "sha256:46e71dbbd12850224243f5d2aeec90f0aaa0f2dde5aeeb8fc8df21e04d99eff9", + "sha256:4d87be612cbef86f994178d5186add3d94e9f31cc3cb499a0482b866ec477603", + "sha256:5693ef74233122f8ebab026817b1b37fe25c411ecfca084b29bc7d6efc548f45", + "sha256:5aa9348186d79a5f232115ed3fa9020eab66d6c3437d72f9d2c8ac0c6858c558", + "sha256:5d873c7de42dea355d73f170be0f23788cf3fa9f7bed718fd2830eefedce01b4", + "sha256:5f6ffe2c6598f7f7207eef9a1228b6f5c818f9f4d53ee920aacd35cec8110438", + "sha256:604428d1b87edbf02b233e2c207d7d528460fa978f9e391bd8aaf9c8311de137", + "sha256:6350b14a40c95ddd53e775dbdbbbc59b124a5c8ecd6fbb09c2e52029f7a9f480", + "sha256:6e2df67b8014767d0f785baa98393725739287684b9f8d8a1001eb2839031447", + "sha256:6e96f5ed1b83a8ddb07909b45bd94833b0710f738115751cdaa9da1fb0cb66e8", + "sha256:6e9e7db18b4539a29cc5ad8c8b252738a30e2b13f033c2d6e9d0549b45841c04", + "sha256:70ec754cc2a769bcd218ed8d7209055667b30860ffecb8633a834dde27d6307c", + "sha256:7b645f491f3c48d3f8a00d1fce07445fab7347fec54a3e65f0725d730d5b99cb", + "sha256:7fa3d25e81bfe6a89718e9791128398a50dec6d57faf23770787ff441d851967", + "sha256:81df9cbcbb6c260de1e007e58c011bfebe2dafc8435107b0537f393dd38c8b1b", + "sha256:8572132c7be52632201a35f5e08348137f658e5ffd21f51f94572ca6c05ea81d", + "sha256:87b4aafed34653e465eb77b7c93ef058516cb5acf3eb21e42f33928616172def", + "sha256:8e332c210b14b57904869ca9f9bf4ca32f5427a03eeb625da9b616c85a3a506c", + "sha256:9893d1aa45a7f8b3bc4510f6ccf8db8c3b62120917af15e3de247f0780294b92", + "sha256:9edf3fc590cc2ec20dc9d7a45108b5bbaf21c0d89f9fd3fd1685e223771dc0b2", + "sha256:9fdf06fd06c32205a07e47328ab49c40fc1407cdec801d698a7c41167ea45113", + "sha256:a02413bc474feda2849c59ed2dfb2cddb4cd3d2f03a2fedec51d6e959d9b608b", + "sha256:a1d9697f3337a89691e3bd8dc56dea45a6f6d975f92e7d5f773bc715c15dde28", + "sha256:a571f035a47212288e3b3519944f6bf4ac7bc7553243e41eac50dd48552b6df7", + "sha256:ab3d732ad50a4fbd04a4490ef08acd0517b6ae6b77eb967251f4c263011a990d", + "sha256:ae0a5da8f35a5be197f328d4727dbcfafa53d1824fac3d96cdd3a642fe09394f", + "sha256:b067cb952ce8bf40115f6c19f478dc71c5e719b7fbaa511359795dfd9d1a6468", + "sha256:b2ee7288b85959797970114deae81ab41b731f19ebcd3bd499ae9ca0e3f1d2c8", + "sha256:b81f90dcc6c85a9b7f29873beb56c94c85d6f0dac2ea8b60d995bd18bf3e2aae", + "sha256:ba0cab91b3956dfa9f512147860783a1829a8d905ee218a9837c18f683239611", + "sha256:baa386875b70cbd81798fa9f71be689c1bf484f65fd6fb08d051a0ee4e79924d", + "sha256:bbe6013f9f791944ed31ca08b077e26249309639313fff132bfbf3ba105673b9", + "sha256:bea88d71630c5900690fcb03161ab18f8f244805c59e2e0dc4ffadae0a7ee0ca", + "sha256:befe90632d66caaf72e8b2ed4d7f02b348913813c8b0a32fae1cc5fe3730902f", + "sha256:c3181df4583c4d3994d31fb235dc681d2aaad744fbdbf94c4802485ececdecf2", + "sha256:c4e37d36f0d19f0a4413d3e18c0d03d0c268ada2061868c1e6f5ab1a6d575077", + "sha256:c588f6abc13f78a67044c6b1273a99e1cf31038ad51815b3b016ce699f0d75c2", + "sha256:cbe83a6bbdf207ff0541de01e11904827540aa069293696dd528a6640bd6a5f6", + "sha256:d554236b2a2006e0ce16315c16eaa0d628dab009c33b63ea03f41c6107958374", + "sha256:dbcf72a37f0b3316e993e13ecf32f10c0e1259c28ffd0a85cee26e8549595fbc", + "sha256:dc284bbc8d7c78a6c69e0c7325ab46ee5e40bb4d50e494d8131a07ef47500e9e", + "sha256:dff6cdf35e31d1315790149fee351f9e52978130cef6c87c4b6c9b3baf78bc53", + "sha256:e469d01137942849cff40517c97a30a93ae79917752b34029f0ec72df6b46399", + "sha256:eb809e816916a3b210bed3c82fb88eaf16e8afcf9c115ebb2bacede1797d2547", + "sha256:ed2fcf7a07334c77fc8a230755c2209223a7cc44fc27597729b8ef5425aa61a3", + "sha256:f44069528d45a933997a6fef143030d8ca8042f0dfaad753e2906398290e2870", + "sha256:f764ba54e33daf20e167915edc443b6f88956f37fb606449b4a5b10ba42235a5", + "sha256:fc4e7fa5414512b481a2483775a8e8be7803a35b30ca805afa4998a84f9fd9e8", + "sha256:ffefa1374cd508d633646d51a8e9277763a9b78ae71324183693959cf94635a7" + ], + "markers": "python_version >= '3.8'", + "version": "==12.0" } }, "nautobot": { diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index aa1e5c2..2339098 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -2,7 +2,7 @@ Expand the name of the chart. */}} {{- define "nautobot.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- default .Chart.Name .Release.Name | trunc 63 | trimSuffix "-" }} {{- end }} {{/* @@ -11,10 +11,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this If release name contains chart name it will be used as a full name. */}} {{- define "nautobot.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- if .Chart.Name }} +{{- .Chart.Name | trunc 63 | trimSuffix "-" }} {{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} +{{- $name := default .Chart.Name .Release.Name }} {{- if contains $name .Release.Name }} {{- .Release.Name | trunc 63 | trimSuffix "-" }} {{- else }} @@ -35,7 +35,7 @@ Common labels */}} {{- define "nautobot.labels" -}} helm.sh/chart: {{ include "nautobot.chart" . }} -app.kubernetes.io/part-of: nautobot +app.kubernetes.io/part-of: {{ .Chart.Name }} {{ include "nautobot.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} @@ -48,6 +48,7 @@ Selector labels */}} {{- define "nautobot.selectorLabels" -}} app.kubernetes.io/instance: {{ .Release.Name }} +app.kubernetes.io/name: {{ .Chart.Name }} {{- end }} {{/* diff --git a/templates/configmap.yaml b/templates/configmap.yaml index afb107b..6dac581 100644 --- a/templates/configmap.yaml +++ b/templates/configmap.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Values.config.name }} + name: nautobot-config labels: app.kubernetes.io/name: nautobot app.kubernetes.io/instance: {{ .Release.Name }} @@ -25,9 +25,9 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Values.config.celery.name }} + name: nautobot-celery-config labels: - app.kubernetes.io/name: celery + app.kubernetes.io/name: nautobot-celery-config app.kubernetes.io/instance: {{ .Release.Name }} data: .bashrc: |- diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 1ced708..b8ade07 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -1,533 +1,113 @@ -{{- if eq .Values.type "Deployment" }} --- apiVersion: apps/v1 kind: Deployment metadata: - name: {{ .Values.nameOverride }} + name: nautobot-celery labels: - app.kubernetes.io/component: primary - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: nautobot + app.kubernetes.io/instance: {{ .Release.Name}} + app.kubernetes.io/name: {{ .Chart.Name }} spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/component: primary app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: nautobot + app.kubernetes.io/name: {{ .Chart.Name}} template: metadata: - annotations: - app.kubernetes.io/component: primary - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: nautobot labels: - app.kubernetes.io/component: primary app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: nautobot - name: nautobot + app.kubernetes.io/name: {{ .Chart.Name }} spec: - initContainers: - - name: nautobot-init - args: - - 'cat /opt/.nautobot/init.sh > /bin/init.sh && chmod +x /bin/init.sh && /bin/init.sh' - command: - - /bin/bash - - '-c' - env: - - name: NAUTOBOT_DEBUG - value: 'True' - - name: NAUTOBOT_DB_ENGINE - value: {{ .Values.database.engine }} - - name: NAUTOBOT_DB_HOST - value: postgresql.postgresql.svc.cluster.local - - name: NAUTOBOT_DB_NAME - value: {{ .Values.database.database }} - - name: NAUTOBOT_DB_PASSWORD - valueFrom: - secretKeyRef: - name: secret.{{ .Values.database.name }} - key: password - - name: NAUTOBOT_DB_PORT - value: {{ .Values.database.port | quote }} - - name: NAUTOBOT_DB_TIMEOUT - value: {{ .Values.database.timeout | quote }} - - name: NAUTOBOT_DB_USER - valueFrom: - secretKeyRef: - name: secret.{{ .Values.database.name }} - key: username - - name: NAUTOBOT_ROOT - value: {{ .Values.config.root }} - - name: NAUTOBOT_REDIS_HOST - value: redis.redis.svc.cluster.local - - name: NAUTOBOT_REDIS_SCHEME - value: redis - - name: NAUTOBOT_SECRET_KEY - valueFrom: - secretKeyRef: - name: secret.superuser - key: secretKey - - name: NAUTOBOT_SUPERUSER_API_TOKEN - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: token - - name: NAUTOBOT_SUPERUSER_EMAIL - value: {{ .Values.superUser.email }} - - name: NAUTOBOT_SUPERUSER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: password - - name: NAUTOBOT_SUPERUSER_USERNAME - value: {{ .Values.superUser.username }} - - name: NAUTOBOT_TIME_ZONE - value: 'America/Los_Angeles' - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - volumeMounts: - - name: nautobot-pvc - mountPath: /opt/ - subPath: nautobot - - name: {{ .Values.config.name }} - mountPath: /opt/.nautobot - containers: - - name: {{ .Values.nameOverride }} - args: - - 'apk add --no-cache sudo && sudo -E -u nautobot /opt/nautobot/bin/nautobot-server start --ini /opt/nautobot/uwsgi.ini' - command: - - /bin/bash - - '-c' - env: - - name: NAUTOBOT_ALLOWED_HOSTS - value: {{ .Values.config.allowed_hosts | quote }} - - name: NAUTOBOT_CELERY_BROKER_URL - value: {{ .Values.config.celery.broker }} - - name: NAUTOBOT_CELERY_RESULT_BACKEND - value: {{ .Values.config.celery.results }} - - name: NAUTOBOT_CACHES_BACKEND - value: {{ .Values.config.caches_backend }} - - name: NAUTOBOT_CREATE_SUPERUSER - value: {{ .Values.superUser.create | quote }} - - name: NAUTOBOT_CORS_ALLOW_ALL_ORIGINS - value: 'True' - - name: NAUTOBOT_CELERY_TASK_DEFAULT_QUEUE - value: 'default' - - name: NAUTOBOT_DEBUG - value: 'True' - - name: NAUTOBOT_DB_ENGINE - value: {{ .Values.database.engine }} - - name: NAUTOBOT_DB_HOST - value: postgresql.postgresql.svc.cluster.local - - name: NAUTOBOT_DB_NAME - value: {{ .Values.database.database }} - - name: NAUTOBOT_DB_PASSWORD - valueFrom: - secretKeyRef: - name: secret.{{ .Values.database.name }} - key: password - - name: NAUTOBOT_DB_PORT - value: {{ .Values.database.port | quote }} - - name: NAUTOBOT_DB_TIMEOUT - value: {{ .Values.database.timeout | quote }} - - name: NAUTOBOT_DB_USER - valueFrom: - secretKeyRef: - name: secret.{{ .Values.database.name }} - key: username - - name: NAUTOBOT_ROOT - value: {{ .Values.config.root }} - - name: NAUTOBOT_REDIS_HOST - value: redis.redis.svc.cluster.local - - name: NAUTOBOT_REDIS_SCHEME - value: redis - - name: NAUTOBOT_SECRET_KEY - valueFrom: - secretKeyRef: - name: secret.superuser - key: secretKey - - name: NAUTOBOT_SUPERUSER_API_TOKEN - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: token - - name: NAUTOBOT_SUPERUSER_EMAIL - value: {{ .Values.superUser.email }} - - name: NAUTOBOT_SUPERUSER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: password - - name: NAUTOBOT_SUPERUSER_USERNAME - value: {{ .Values.superUser.username }} - - name: NAUTOBOT_TIME_ZONE - value: 'America/Los_Angeles' - - name: SOCIAL_AUTH_GITHUB_KEY - valueFrom: - secretKeyRef: - name: secret.github.sso - key: social_auth_github_key - - name: SOCIAL_AUTH_GITUB_SECRET - valueFrom: - secretKeyRef: - name: secret.github.sso - key: social_auth_github_secret - image: {{ .Values.image.repository }}:{{ .Values.image.tag }} - imagePullPolicy: Always - ports: - - containerPort: 8000 - name: nautobot - volumeMounts: - - mountPath: /opt - name: nautobot-pvc - subPath: nautobot - - mountPath: /opt/.nautobot - name: {{ .Values.config.name }} imagePullSecrets: - - name: secret.github.ghcr - volumes: - - name: {{ .Values.config.name}} - configMap: - name: {{ .Values.config.name }} - - name: nautobot-pvc - persistentVolumeClaim: - claimName: nautobot-pvc -{{ end }} ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: celery-worker - labels: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-worker - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - replicas: 1 - selector: - matchLabels: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-worker - app.kubernetes.io/part-of: {{ .Release.Name }} - template: - metadata: - annotations: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-worker - app.kubernetes.io/part-of: {{ .Release.Name }} - labels: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-worker - app.kubernetes.io/part-of: {{ .Release.Name }} - name: celery-worker - spec: - imagePullSecrets: - - name: secret.github.ghcr - initContainers: - - name: celery-worker-init - args: - - 'cat /opt/.celery/init.sh > /bin/init.sh && chmod +x /bin/init.sh && /bin/init.sh' - command: - - /bin/bash - - '-c' - env: - - name: NAUTOBOT_ALLOWED_HOSTS - value: {{ .Values.config.allowed_hosts | quote }} - - name: NAUTOBOT_CELERY_BROKER_URL - value: {{ .Values.config.celery.broker }} - - name: NAUTOBOT_CELERY_RESULT_BACKEND - value: {{ .Values.config.celery.results }} - - name: NAUTOBOT_CACHES_BACKEND - value: {{ .Values.config.caches_backend }} - - name: NAUTOBOT_CREATE_SUPERUSER - value: {{ .Values.superUser.create | quote }} - - name: NAUTOBOT_CORS_ALLOW_ALL_ORIGINS - value: 'True' - - name: NAUTOBOT_CELERY_TASK_DEFAULT_QUEUE - value: 'default' - - name: NAUTOBOT_DEBUG - value: 'True' - - name: NAUTOBOT_ROOT - value: {{ .Values.config.celery.root }} - image: "{{ .Values.config.celery.img.repository }}:{{ .Values.config.celery.img.tag }}" - volumeMounts: - - name: celery-worker - mountPath: /opt/ - subPath: celery - - name: {{ .Values.config.celery.name }} - mountPath: /opt/.celery + - name: ghcr containers: - - name: celery-worker + - name: nautobot-celery command: - - /bin/bash - - '-c' - args: - - 'apk add --no-cache sudo && sudo -E -u celery /opt/celery/bin/nautobot-server celery worker --loglevel DEBUG --queues celery-default,default,default-celery,jobs,tasks' - env: - - name: NAUTOBOT_ALLOWED_HOSTS - value: {{ .Values.config.allowed_hosts | quote }} - - name: NAUTOBOT_CELERY_BROKER_URL - value: {{ .Values.config.celery.broker }} - - name: NAUTOBOT_CELERY_RESULT_BACKEND - value: {{ .Values.config.celery.results }} - - name: NAUTOBOT_CACHES_BACKEND - value: {{ .Values.config.caches_backend }} - - name: NAUTOBOT_CREATE_SUPERUSER - value: {{ .Values.superUser.create | quote }} - - name: NAUTOBOT_CORS_ALLOW_ALL_ORIGINS - value: 'True' - - name: NAUTOBOT_CELERY_TASK_DEFAULT_QUEUE - value: 'default' - - name: NAUTOBOT_DEBUG - value: 'True' - - name: NAUTOBOT_DB_ENGINE - value: {{ .Values.database.engine }} - - name: NAUTOBOT_DB_HOST - value: postgresql.postgresql.svc.cluster.local - - name: NAUTOBOT_DB_NAME - value: {{ .Values.database.database }} - - name: NAUTOBOT_DB_PASSWORD - valueFrom: - secretKeyRef: - name: secret.{{ .Values.database.name }} - key: password - - name: NAUTOBOT_DB_PORT - value: {{ .Values.database.port | quote }} - - name: NAUTOBOT_DB_TIMEOUT - value: {{ .Values.database.timeout | quote }} - - name: NAUTOBOT_DB_USER - valueFrom: - secretKeyRef: - name: secret.{{ .Values.database.name }} - key: username - - name: NAUTOBOT_ROOT - value: {{ .Values.config.celery.root }} - - name: NAUTOBOT_REDIS_HOST - value: redis.redis.svc.cluster.local - - name: NAUTOBOT_REDIS_SCHEME - value: redis - - name: NAUTOBOT_SECRET_KEY - valueFrom: - secretKeyRef: - name: secret.superuser - key: secretKey - - name: NAUTOBOT_SUPERUSER_API_TOKEN - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: token - - name: NAUTOBOT_SUPERUSER_EMAIL - value: {{ .Values.superUser.email }} - - name: NAUTOBOT_SUPERUSER_USERNAME - value: {{ .Values.superUser.username }} - - name: NAUTOBOT_SUPERUSER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: password - - name: NAUTOBOT_TIME_ZONE - value: 'America/Los_Angeles' - - name: SOCIAL_AUTH_GITHUB_KEY - valueFrom: - secretKeyRef: - name: secret.github.sso - key: social_auth_github_key - - name: SOCIAL_AUTH_GITUB_SECRET - valueFrom: - secretKeyRef: - name: secret.github.sso - key: social_auth_github_secret - image: "{{ .Values.config.celery.img.repository }}:{{ .Values.config.celery.img.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + - /bin/sh + - >- + -c + - >- + while true; do sleep 3600; done + # command: + # - /opt/celery/bin/nautobot-server + # - celery + # - start + image: ghcr.io/edwardtheharris/helm-nautobot/celery:{{ .Values.image.tag }} ports: - - containerPort: 5673 - name: celery + - name: http + containerPort: 80 + protocol: TCP + - name: https + containerPort: 443 + protocol: TCP + - name: stat + containerPort: 1024 + protocol: TCP + resources: + requests: + cpu: 250m + memory: 128Mi volumeMounts: - - name: celery-worker - mountPath: /opt/ - subPath: celery - - name: {{ .Values.config.celery.name }} + - name: nautobot-celery-config mountPath: /opt/.celery + - name: nautobot-celery + mountPath: /opt/celery/ + subPath: celery volumes: - - name: {{ .Values.config.celery.name }} + - name: nautobot-celery-config configMap: - name: {{ .Values.config.celery.name }} - items: - - key: .bashrc - path: .bashrc - - key: reqs - path: 'reqs' - - key: init.sh - path: init.sh - - key: resolv.conf - path: resolv.conf - - name: celery-worker + name: nautobot-celery-config + - name: nautobot-celery persistentVolumeClaim: - claimName: celery-worker + claimName: celery + terminationGracePeriodSeconds: 60 + dnsPolicy: ClusterFirst + serviceAccountName: nautobot + serviceAccount: nautobot --- apiVersion: apps/v1 kind: Deployment metadata: - name: celery-beat + name: nautobot-celery-beat labels: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name}} + app.kubernetes.io/name: {{ .Chart.Name }} spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/component: scheduler app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: {{ .Release.Name }} + app.kubernetes.io/name: {{ .Chart.Name}} template: metadata: - annotations: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: {{ .Release.Name }} labels: - app.kubernetes.io/component: scheduler app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: {{ .Release.Name }} - name: celery-beat + app.kubernetes.io/name: {{ .Chart.Name }} spec: imagePullSecrets: - - name: secret.github.ghcr - initContainers: - - name: celery-beat-init - args: - - 'cat /opt/.celery/init.sh > /bin/init.sh && chmod +x /bin/init.sh && /bin/init.sh' - command: - - /bin/bash - - '-c' - env: - - name: NAUTOBOT_CELERY_TASK_DEFAULT_QUEUE - value: 'default' - - name: NAUTOBOT_DEBUG - value: 'True' - - name: NAUTOBOT_ROOT - value: {{ .Values.config.celery.root }} - image: "{{ .Values.config.celery.img.repository }}:{{ .Values.config.celery.img.tag }}" - volumeMounts: - - name: celery-beat - mountPath: /opt/ - subPath: celery - - name: {{ .Values.config.celery.name }} - mountPath: /opt/.celery + - name: ghcr containers: - - name: celery-beat - args: - - 'apk add --no-cache sudo && sudo -E -u celery /opt/celery/bin/nautobot-server celery beat --loglevel DEBUG' + - name: nautobot-celery-beat command: - - /bin/bash - - '-c' - env: - - name: NAUTOBOT_ALLOWED_HOSTS - value: {{ .Values.config.allowed_hosts | quote }} - - name: NAUTOBOT_CELERY_BROKER_URL - value: {{ .Values.config.celery.broker }} - - name: NAUTOBOT_CELERY_RESULT_BACKEND - value: {{ .Values.config.celery.results }} - - name: NAUTOBOT_CACHES_BACKEND - value: {{ .Values.config.caches_backend }} - - name: NAUTOBOT_CREATE_SUPERUSER - value: {{ .Values.superUser.create | quote }} - - name: NAUTOBOT_CORS_ALLOW_ALL_ORIGINS - value: 'True' - - name: NAUTOBOT_CELERY_TASK_DEFAULT_QUEUE - value: 'default' - - name: NAUTOBOT_DEBUG - value: 'True' - - name: NAUTOBOT_DB_ENGINE - value: {{ .Values.database.engine }} - - name: NAUTOBOT_DB_HOST - value: postgresql.postgresql.svc.cluster.local - - name: NAUTOBOT_DB_NAME - value: {{ .Values.database.database }} - - name: NAUTOBOT_DB_PASSWORD - valueFrom: - secretKeyRef: - name: secret.{{ .Values.database.name }} - key: password - - name: NAUTOBOT_DB_PORT - value: {{ .Values.database.port | quote }} - - name: NAUTOBOT_DB_TIMEOUT - value: {{ .Values.database.timeout | quote }} - - name: NAUTOBOT_DB_USER - valueFrom: - secretKeyRef: - name: secret.{{ .Values.database.name }} - key: username - - name: NAUTOBOT_ROOT - value: {{ .Values.config.celery.root }} - - name: NAUTOBOT_REDIS_HOST - value: redis.redis.svc.cluster.local - - name: NAUTOBOT_REDIS_SCHEME - value: redis - - name: NAUTOBOT_SECRET_KEY - valueFrom: - secretKeyRef: - name: secret.superuser - key: secretKey - - name: NAUTOBOT_SUPERUSER_API_TOKEN - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: token - - name: NAUTOBOT_SUPERUSER_EMAIL - value: {{ .Values.superUser.email }} - - name: NAUTOBOT_SUPERUSER_USERNAME - value: {{ .Values.superUser.username }} - - name: NAUTOBOT_SUPERUSER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: password - - name: NAUTOBOT_TIME_ZONE - value: 'America/Los_Angeles' - - name: SOCIAL_AUTH_GITHUB_KEY - valueFrom: - secretKeyRef: - name: secret.github.sso - key: social_auth_github_key - - name: SOCIAL_AUTH_GITUB_SECRET - valueFrom: - secretKeyRef: - name: secret.github.sso - key: social_auth_github_secret - image: "{{ .Values.config.celery.img.repository }}:{{ .Values.config.celery.img.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - containerPort: 5672 - name: celery-beat + - /bin/sh + - >- + -c + - >- + while true; do sleep 3600; done + # - /opt/celery/bin/nautobot-server + # - celery + # - beat + image: ghcr.io/edwardtheharris/helm-nautobot/celery:0.0.3 volumeMounts: - - name: celery-beat - mountPath: /opt/ + - name: nautobot-celery-beat + mountPath: /opt/celery/ subPath: celery - - name: {{ .Values.config.celery.name }} + - name: nautobot-celery-config mountPath: /opt/.celery volumes: - - name: {{ .Values.config.celery.name }} + - name: nautobot-celery-config configMap: - name: {{ .Values.config.celery.name }} - items: - - key: .bashrc - path: .bashrc - - key: reqs - path: 'reqs' - - key: init.sh - path: init.sh - - key: resolv.conf - path: resolv.conf - - name: celery-beat + name: nautobot-celery-config + - name: nautobot-celery-beat persistentVolumeClaim: claimName: celery-beat diff --git a/templates/pvc.yaml b/templates/pvc.yaml index 87f27ae..3f2a6ff 100644 --- a/templates/pvc.yaml +++ b/templates/pvc.yaml @@ -1,87 +1,24 @@ -{{- if eq .Values.type "Deployment" }} --- apiVersion: v1 kind: PersistentVolumeClaim metadata: - annotations: - name: {{ .Values.persistence.name }} - app.kubernetes.io/component: primary - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Values.persistence.name }} - volume.kubernetes.io/storage-provisioner: lvm.csi.metal-stack.io - finalizers: - - kubernetes.io/pvc-protection - labels: - app.kubernetes.io/component: primary - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Values.persistence.name }} - name: {{ .Values.persistence.name }} - namespace: {{ .Release.Name }} + name: celery spec: + storageClassName: csi-lvm-linear accessModes: - - ReadWriteMany - ReadWriteOnce - resources: - requests: - storage: {{ .Values.persistence.size }} - storageClassName: {{ .Values.persistence.storageClass }} - volumeMode: Filesystem -{{ end }} ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - annotations: - name: celery-beat - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: {{ .Release.Name }} - volume.kubernetes.io/storage-provisioner: lvm.csi.metal-stack.io - finalizers: - - kubernetes.io/pvc-protection - labels: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: {{ .Release.Name }} - name: celery-beat - namespace: {{ .Release.Name }} -spec: - accessModes: - - ReadWriteOnce - - ReadWriteMany resources: requests: storage: 10Gi - storageClassName: csi-driver-lvm-linear - volumeMode: Filesystem --- apiVersion: v1 kind: PersistentVolumeClaim metadata: - annotations: - name: celery-worker - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-worker - app.kubernetes.io/part-of: {{ .Release.Name }} - volume.kubernetes.io/storage-provisioner: lvm.csi.metal-stack.io - finalizers: - - kubernetes.io/pvc-protection - labels: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: celery-worker - app.kubernetes.io/part-of: {{ .Release.Name }} - name: celery-worker - namespace: {{ .Release.Name }} + name: celery-beat spec: + storageClassName: csi-lvm-linear accessModes: - ReadWriteOnce - - ReadWriteMany resources: requests: storage: 10Gi - storageClassName: csi-driver-lvm-linear - volumeMode: Filesystem diff --git a/templates/secrets.yaml b/templates/secret.yaml similarity index 60% rename from templates/secrets.yaml rename to templates/secret.yaml index 5047d2a..1b20219 100644 --- a/templates/secrets.yaml +++ b/templates/secret.yaml @@ -3,23 +3,23 @@ apiVersion: v1 kind: Secret metadata: labels: - app.kubernetes.io/name: {{ .Values.nameOverride }} + app.kubernetes.io/name: {{ .Chart.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - name: secret.{{ .Values.database.name }} - namespace: nautobot + name: {{ .Chart.Name }}-database type: Opaque data: - password: {{ .Values.database.password | b64enc }} - username: {{ .Values.database.username | b64enc }} + password: {{ .Values.postgresql.database.password | b64enc }} + username: {{ .Values.postgresql.database.password | b64enc }} + nbpassword: {{ .Values.database.password | b64enc }} + nbusername: {{ .Values.database.password | b64enc }} --- apiVersion: v1 kind: Secret metadata: labels: app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Values.nameOverride }} - name: {{ .Values.superUser.secret.name }} - namespace: nautobot + app.kubernetes.io/name: {{ .Chart.Name }}-superuser + name: {{ .Release.Name }}-superuser type: Opaque data: email: {{ .Values.superUser.email | b64enc | quote }} @@ -32,22 +32,20 @@ apiVersion: v1 kind: Secret metadata: labels: - app.kubernetes.io/name: {{ .Values.nameOverride }} + app.kubernetes.io/name: {{ .Chart.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - name: secret.github.ghcr - namespace: nautobot + name: ghcr data: - .dockerconfigjson: {{ .Values.image.secret.data }} + .dockerconfigjson: {{ .Values.secrets.ghcr }} type: kubernetes.io/dockerconfigjson --- apiVersion: v1 kind: Secret metadata: labels: - app.kubernetes.io/name: {{ .Values.nameOverride }} + app.kubernetes.io/name: {{ .Chart.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - name: secret.github.sso - namespace: nautobot + name: github-sso type: Opaque data: social_auth_github_key: {{ .Values.sso.social_auth_github_key | b64enc }} diff --git a/templates/service.yaml b/templates/service.yaml index 4b2b255..7227a0c 100644 --- a/templates/service.yaml +++ b/templates/service.yaml @@ -2,23 +2,26 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.nameOverride }} + name: {{ .Release.Name }} labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: nautobot + app.kubernetes.io/name: {{ .Chart.Name }} app.kubernetes.io/part-of: nautobot spec: - type: {{ .Values.service.type }} + type: LoadBalancer ports: - port: {{ .Values.service.port }} targetPort: {{ .Values.service.targetPort }} protocol: TCP name: nautobot + loadBalancerIP: 192.168.5.5 + externalIPs: + - 192.168.5.15 selector: app.kubernetes.io/component: primary app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: nautobot + app.kubernetes.io/name: {{ .Chart.Name }} --- apiVersion: v1 kind: Service @@ -28,7 +31,7 @@ metadata: app.kubernetes.io/component: scheduler app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: nautobot + app.kubernetes.io/part-of: {{ .Chart.Name }} spec: type: {{ .Values.service.type }} ports: @@ -61,4 +64,4 @@ spec: app.kubernetes.io/component: scheduler app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: celery-worker -{{ end }} +{{- end -}} diff --git a/templates/serviceaccount.yaml b/templates/serviceaccount.yaml index 705062a..0f15cac 100644 --- a/templates/serviceaccount.yaml +++ b/templates/serviceaccount.yaml @@ -12,3 +12,4 @@ metadata: {{- end }} automountServiceAccountToken: {{ .Values.serviceAccount.automount }} {{- end }} + diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml index 16de8ef..26248ce 100644 --- a/templates/statefulset.yaml +++ b/templates/statefulset.yaml @@ -1,93 +1,99 @@ -{{- if eq .Values.type "StatefulSet" -}} apiVersion: apps/v1 kind: StatefulSet metadata: annotations: app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Values.nameOverride }} + app.kubernetes.io/name: {{ .Chart.Name }} labels: app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernets.io/name: {{ .Values.nameOverride }} - name: {{ .Values.fullnameOverride }} + app.kubernets.io/name: {{ .Chart.Name }} + name: {{ .Chart.Name }} spec: selector: matchLabels: - app.kubernetes.io/name: {{ include "nautobot.name" . }} + app.kubernetes.io/name: {{ .Chart.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - serviceName: {{ .Values.nameOverride }} + serviceName: {{ .Release.Name }} replicas: {{ .Values.replicaCount }} template: metadata: - name: {{ include "nautobot.name" . }} + name: {{ .Chart.Name }} labels: - app.kubernetes.io/name: {{ include "nautobot.name" . }} + app.kubernetes.io/name: {{ .Chart.Name }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - initContainers: - - name: nautobot-init - args: - - 'cat /opt/.nautobot/init.sh > /bin/init.sh; chmod +x /bin/init.sh; /bin/init.sh' - command: - - /bin/bash - - '-c' - env: - - name: NAUTOBOT_DB_ENGINE - value: {{ .Values.database.engine }} - - name: NAUTOBOT_DB_HOST - value: postgresql.postgresql.svc.cluster.local - - name: NAUTOBOT_DB_NAME - value: {{ .Values.database.database }} - - name: NAUTOBOT_DB_PASSWORD - valueFrom: - secretKeyRef: - name: secret.{{ .Values.database.name }} - key: password - - name: NAUTOBOT_DB_PORT - value: {{ .Values.database.port | quote }} - - name: NAUTOBOT_DB_TIMEOUT - value: {{ .Values.database.timeout | quote }} - - name: NAUTOBOT_DB_USER - valueFrom: - secretKeyRef: - name: secret.{{ .Values.database.name }} - key: username - - name: NAUTOBOT_ROOT - value: /opt/nautobot - - name: NAUTOBOT_SUPERUSER_API_TOKEN - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: token - - name: NAUTOBOT_SUPERUSER_EMAIL - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: email - - name: NAUTOBOT_SUPERUSER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: password - - name: NAUTOBOT_SUPERUSER_USERNAME - valueFrom: - secretKeyRef: - name: {{ .Values.superUser.secret.name }} - key: username - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: Always - volumeMounts: - - name: {{ .Values.persistence.name }} - mountPath: /opt/ - subPath: nautobot - - name: nautobot-config - mountPath: /opt/.nautobot + nodeSelector: + {{ .Values.nodeSelector | toYaml | nindent 8 }} + # initContainers: + # - name: nautobot-init + # args: + # - 'cat /opt/.nautobot/init.sh > /bin/init.sh; chmod +x /bin/init.sh; /bin/init.sh' + # command: + # - /bin/bash + # - '-c' + # env: + # - name: NAUTOBOT_DB_ENGINE + # value: {{ .Values.database.engine }} + # - name: NAUTOBOT_DB_HOST + # value: postgresql.postgresql.svc.cluster.local + # - name: NAUTOBOT_DB_NAME + # value: {{ .Values.database.database }} + # - name: NAUTOBOT_DB_PASSWORD + # valueFrom: + # secretKeyRef: + # name: secret.{{ .Values.database.name }} + # key: password + # - name: NAUTOBOT_DB_PORT + # value: {{ .Values.database.port | quote }} + # - name: NAUTOBOT_DB_TIMEOUT + # value: {{ .Values.database.timeout | quote }} + # - name: NAUTOBOT_DB_USER + # valueFrom: + # secretKeyRef: + # name: secret.{{ .Values.database.name }} + # key: username + # - name: NAUTOBOT_ROOT + # value: /opt/nautobot + # - name: NAUTOBOT_SUPERUSER_API_TOKEN + # valueFrom: + # secretKeyRef: + # name: {{ .Values.superUser.secret.name }} + # key: token + # - name: NAUTOBOT_SUPERUSER_EMAIL + # valueFrom: + # secretKeyRef: + # name: {{ .Values.superUser.secret.name }} + # key: email + # - name: NAUTOBOT_SUPERUSER_PASSWORD + # valueFrom: + # secretKeyRef: + # name: {{ .Values.superUser.secret.name }} + # key: password + # - name: NAUTOBOT_SUPERUSER_USERNAME + # valueFrom: + # secretKeyRef: + # name: {{ .Values.superUser.secret.name }} + # key: username + # image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + # imagePullPolicy: Always + # volumeMounts: + # - name: {{ .Values.persistence.name }} + # mountPath: /opt/ + # subPath: nautobot + # - name: nautobot-config + # mountPath: /opt/.nautobot containers: - name: nautobot command: - - /opt/nautobot/bin/nautobot-server - - runserver - - '0.0.0.0:8000' - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + - /bin/sh + - >- + -c + - >- + while true; do sleep 3600; done + # - /opt/nautobot/bin/nautobot-server + # - runserver + # - '0.0.0.0:8000' + image: "ghcr.io/edwardtheharris/helm-nautobot/nautobot:0.0.3" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: 8000 @@ -118,8 +124,8 @@ spec: - name: NAUTOBOT_DB_PASSWORD valueFrom: secretKeyRef: - name: secret.{{ .Values.database.name }} - key: password + name: {{ .Chart.Name }}-database + key: nbpassword - name: NAUTOBOT_DB_PORT value: {{ .Values.database.port | quote }} - name: NAUTOBOT_DB_TIMEOUT @@ -127,8 +133,8 @@ spec: - name: NAUTOBOT_DB_USER valueFrom: secretKeyRef: - name: secret.{{ .Values.database.name }} - key: username + name: {{ .Chart.Name }}-database + key: nbusername - name: NAUTOBOT_ROOT value: /opt/nautobot - name: NAUTOBOT_REDIS_HOST @@ -138,12 +144,12 @@ spec: - name: NAUTOBOT_SECRET_KEY valueFrom: secretKeyRef: - name: secret.superuser + name: {{ .Release.Name }}-superuser key: secretKey - name: NAUTOBOT_SUPERUSER_API_TOKEN valueFrom: secretKeyRef: - name: {{ .Values.superUser.secret.name }} + name: {{ .Release.Name }}-superuser key: token - name: NAUTOBOT_SUPERUSER_EMAIL value: {{ .Values.superUser.email }} @@ -152,32 +158,30 @@ spec: - name: NAUTOBOT_SUPERUSER_PASSWORD valueFrom: secretKeyRef: - name: {{ .Values.superUser.secret.name }} + name: {{ .Release.Name }}-superuser key: password - name: NAUTOBOT_TIME_ZONE value: 'America/Los_Angeles' - - name: SOCIAL_AUTH_GITHUB_KEY - valueFrom: - secretKeyRef: - name: secret.github.sso - key: social_auth_github_key - - name: SOCIAL_AUTH_GITUB_SECRET - valueFrom: - secretKeyRef: - name: secret.github.sso - key: social_auth_github_secret + # - name: SOCIAL_AUTH_GITHUB_KEY + # valueFrom: + # secretKeyRef: + # name: secret.github.sso + # key: social_auth_github_key + # - name: SOCIAL_AUTH_GITUB_SECRET + # valueFrom: + # secretKeyRef: + # name: secret.github.sso + # key: social_auth_github_secret volumeMounts: - - name: {{ .Values.persistence.name }} - mountPath: /opt/ + - name: nautobot + mountPath: /opt/nautobot subPath: nautobot - - name: {{ .Values.config.name }} + - name: nautobot-config mountPath: /opt/.nautobot imagePullSecrets: - - name: secret.github.ghcr - securityContext: - fsGroup: 1000 + - name: ghcr volumes: - - name: {{ .Values.config.name }} + - name: nautobot-config configMap: name: nautobot-config items: @@ -191,14 +195,24 @@ spec: path: init.sh volumeClaimTemplates: - metadata: - name: {{ .Values.persistence.name }} + name: {{ .Release.Name }} spec: accessModes: - ReadWriteMany - ReadWriteOnce resources: requests: - storage: {{ .Values.persistence.size }} + storage: {{ .Values.resources.requests.storage }} storageClassName: {{ .Values.persistence.storageClass }} volumeMode: Filesystem -{{ end }} + # - metadata: + # name: {{ .Release.Name }}-celery + # spec: + # accessModes: + # - ReadWriteMany + # - ReadWriteOnce + # resources: + # requests: + # storage: {{ .Values.resources.requests.storage }} + # storageClassName: {{ .Values.persistence.storageClass }} + # volumeMode: Filesystem diff --git a/tests/deployment_test.yaml b/tests/deployment_test.yaml deleted file mode 100644 index 19ec422..0000000 --- a/tests/deployment_test.yaml +++ /dev/null @@ -1,219 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/helm-unittest/helm-unittest/main/schema/helm-testsuite.json -# Source: nautobot/templates/tests/deployment_test.yaml -release: - name: nautobot -suite: deployments -templates: -- templates/deployment.yaml -values: -- ../values.yaml - -tests: - -- it: Should create a Deployment named 'nautobot' with correct metadata and spec - asserts: - - equal: - path: metadata.name - value: nautobot - - equal: - path: metadata.labels - value: - app.kubernetes.io/component: primary - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: nautobot - - equal: - path: spec.replicas - value: 1 - - equal: - path: spec.selector.matchLabels - value: - app.kubernetes.io/component: primary - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: nautobot - documentIndex: 0 - -- it: Should create a 'nautobot' Deployment with correct init container - asserts: - - equal: - path: spec.template.spec.initContainers[0].name - value: nautobot-init - - equal: - path: spec.template.spec.initContainers[0].image - value: ghcr.io/edwardtheharris/helm-nautobot/nautobot:0.0.2 - - equal: - path: spec.template.spec.initContainers[0].command[0] - value: /bin/bash - - equal: - path: spec.template.spec.initContainers[0].command[1] - value: '-c' - - equal: - path: spec.template.spec.initContainers[0].env[0].name - value: NAUTOBOT_DEBUG - - equal: - path: spec.template.spec.initContainers[0].env[0].value - value: 'True' - documentIndex: 0 - -- it: Should create a 'nautobot' Deployment with correct container and environment variables - asserts: - - equal: - path: spec.template.spec.containers[0].name - value: nautobot - - equal: - path: spec.template.spec.containers[0].image - value: ghcr.io/edwardtheharris/helm-nautobot/nautobot:0.0.2 - - equal: - path: spec.template.spec.containers[0].command[0] - value: /bin/bash - - equal: - path: spec.template.spec.containers[0].command[1] - value: '-c' - - equal: - path: spec.template.spec.containers[0].args[0] - value: 'apk add --no-cache sudo && sudo -E -u nautobot /opt/nautobot/bin/nautobot-server start --ini /opt/nautobot/uwsgi.ini' - - equal: - path: spec.template.spec.containers[0].env[0].name - value: NAUTOBOT_ALLOWED_HOSTS - - equal: - path: spec.template.spec.containers[0].env[0].value - value: "*" - - equal: - path: spec.template.spec.containers[0].env[10].name - value: NAUTOBOT_DB_NAME - documentIndex: 0 - -- it: Should create a Deployment named 'celery-worker' with correct metadata and spec - asserts: - - equal: - path: metadata.name - value: celery-worker - - equal: - path: metadata.labels - value: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: celery-worker - app.kubernetes.io/part-of: nautobot - - equal: - path: spec.replicas - value: 1 - - equal: - path: spec.selector.matchLabels - value: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: celery-worker - app.kubernetes.io/part-of: nautobot - documentIndex: 1 - -- it: Should create a 'celery-worker' Deployment with correct init container - asserts: - - equal: - path: spec.template.spec.initContainers[0].name - value: celery-worker-init - - equal: - path: spec.template.spec.initContainers[0].image - value: ghcr.io/edwardtheharris/helm-nautobot/celery:0.0.2 - - equal: - path: spec.template.spec.initContainers[0].command[0] - value: /bin/bash - - equal: - path: spec.template.spec.initContainers[0].command[1] - value: '-c' - - equal: - path: spec.template.spec.initContainers[0].env[0].name - value: NAUTOBOT_ALLOWED_HOSTS - - equal: - path: spec.template.spec.initContainers[0].env[0].value - value: "*" - documentIndex: 1 - -- it: Should create a 'celery-worker' Deployment with correct container and environment variables - asserts: - - equal: - path: spec.template.spec.containers[0].name - value: celery-worker - - equal: - path: spec.template.spec.containers[0].image - value: ghcr.io/edwardtheharris/helm-nautobot/celery:0.0.2 - - equal: - path: spec.template.spec.containers[0].command[0] - value: /bin/bash - - equal: - path: spec.template.spec.containers[0].command[1] - value: '-c' - - equal: - path: spec.template.spec.containers[0].args[0] - value: 'apk add --no-cache sudo && sudo -E -u celery /opt/celery/bin/nautobot-server celery worker --loglevel DEBUG --queues celery-default,default,default-celery,jobs,tasks' - - equal: - path: spec.template.spec.containers[0].env[10].name - value: NAUTOBOT_DB_NAME - documentIndex: 1 - -- it: Should create a Deployment named 'celery-beat' with correct metadata and spec - asserts: - - equal: - path: metadata.name - value: celery-beat - - equal: - path: metadata.labels - value: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: nautobot - - equal: - path: spec.replicas - value: 1 - - equal: - path: spec.selector.matchLabels - value: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: nautobot - documentIndex: 2 - -- it: Should create a 'celery-beat' Deployment with correct init container - asserts: - - equal: - path: spec.template.spec.initContainers[0].name - value: celery-beat-init - - equal: - path: spec.template.spec.initContainers[0].image - value: ghcr.io/edwardtheharris/helm-nautobot/celery:0.0.2 - - equal: - path: spec.template.spec.initContainers[0].command[0] - value: /bin/bash - - equal: - path: spec.template.spec.initContainers[0].command[1] - value: '-c' - - equal: - path: spec.template.spec.initContainers[0].env[0].name - value: NAUTOBOT_CELERY_TASK_DEFAULT_QUEUE - - equal: - path: spec.template.spec.initContainers[0].env[0].value - value: 'default' - documentIndex: 2 - -- it: Should create a 'celery-beat' Deployment with correct container and environment variables - asserts: - - equal: - path: spec.template.spec.containers[0].name - value: celery-beat - - equal: - path: spec.template.spec.containers[0].image - value: ghcr.io/edwardtheharris/helm-nautobot/celery:0.0.2 - - equal: - path: spec.template.spec.containers[0].command[0] - value: /bin/bash - - equal: - path: spec.template.spec.containers[0].command[1] - value: '-c' - - equal: - path: spec.template.spec.containers[0].args[0] - value: 'apk add --no-cache sudo && sudo -E -u celery /opt/celery/bin/nautobot-server celery beat --loglevel DEBUG' - - equal: - path: spec.template.spec.containers[0].env[10].name - value: NAUTOBOT_DB_NAME - documentIndex: 2 diff --git a/tests/pvc_test.yaml b/tests/pvc_test.yaml deleted file mode 100644 index 3f1b37c..0000000 --- a/tests/pvc_test.yaml +++ /dev/null @@ -1,147 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/helm-unittest/helm-unittest/main/schema/helm-testsuite.json -# Source: nautobot/templates/tests/pvc_test.yaml -release: - name: nautobot -suite: pvc -templates: -- templates/pvc.yaml -values: -- ../values.yaml - -tests: - -- it: Should create a PVC named 'nautobot-pvc' with correct metadata and spec - asserts: - - equal: - path: metadata.name - value: nautobot-pvc - - equal: - path: metadata.namespace - value: nautobot - - equal: - path: metadata.annotations.name - value: nautobot-pvc - - equal: - path: metadata.annotations - value: - app.kubernetes.io/component: primary - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: nautobot-pvc - name: nautobot-pvc - volume.kubernetes.io/storage-provisioner: lvm.csi.metal-stack.io - - equal: - path: metadata.labels - value: - app.kubernetes.io/component: primary - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: nautobot-pvc - - equal: - path: metadata.finalizers[0] - value: kubernetes.io/pvc-protection - - equal: - path: spec.accessModes - value: - - ReadWriteMany - - ReadWriteOnce - - equal: - path: spec.resources.requests.storage - value: "10Gi" - - equal: - path: spec.storageClassName - value: csi-driver-lvm-linear - - equal: - path: spec.volumeMode - value: Filesystem - documentIndex: 0 - -- it: Should create a PVC named 'celery-beat' with correct metadata and spec - asserts: - - equal: - path: metadata.name - value: celery-beat - - equal: - path: metadata.namespace - value: nautobot - - equal: - path: metadata.annotations.name - value: celery-beat - - equal: - path: metadata.annotations - value: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: nautobot - name: celery-beat - volume.kubernetes.io/storage-provisioner: lvm.csi.metal-stack.io - - equal: - path: metadata.labels - value: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: celery-beat - app.kubernetes.io/part-of: nautobot - - equal: - path: metadata.finalizers[0] - value: kubernetes.io/pvc-protection - - equal: - path: spec.accessModes - value: - - ReadWriteOnce - - ReadWriteMany - - equal: - path: spec.resources.requests.storage - value: "10Gi" - - equal: - path: spec.storageClassName - value: csi-driver-lvm-linear - - equal: - path: spec.volumeMode - value: Filesystem - documentIndex: 1 - -- it: Should create a PVC named 'celery-worker' with correct metadata and spec - asserts: - - equal: - path: metadata.name - value: celery-worker - - equal: - path: metadata.namespace - value: nautobot - - equal: - path: metadata.annotations.name - value: celery-worker - - equal: - path: metadata.annotations - value: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: celery-worker - app.kubernetes.io/part-of: nautobot - name: celery-worker - volume.kubernetes.io/storage-provisioner: lvm.csi.metal-stack.io - - equal: - path: metadata.labels - value: - app.kubernetes.io/component: scheduler - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: celery-worker - app.kubernetes.io/part-of: nautobot - - equal: - path: metadata.finalizers[0] - value: kubernetes.io/pvc-protection - - equal: - path: spec.accessModes - value: - - ReadWriteOnce - - ReadWriteMany - - equal: - path: spec.resources.requests.storage - value: "10Gi" - - equal: - path: spec.storageClassName - value: csi-driver-lvm-linear - - equal: - path: spec.volumeMode - value: Filesystem - documentIndex: 2 diff --git a/values.yaml b/values.yaml index 2c84bc5..96507ba 100644 --- a/values.yaml +++ b/values.yaml @@ -11,18 +11,11 @@ # ```{literalinclude} /values.yaml # :caption: affinity # :language: yaml -# :start-at: "affinity:\n" +# :start-at: "affinity: {}\n" # :end-before: "###\n" # ``` -affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/os - operator: In - values: - - linux +affinity: {} + ### # ```{rubric} Autoscaling @@ -61,7 +54,7 @@ config: allowed_hosts: "*" caches_backend: django_redis.cache.RedisCache celery: - broker: 'redis://redis.redis.svc.cluster.local:6379/0' + broker: 'redis://redis.breeze-blocks.net:6379/0' livenessProbe: exec: command: @@ -88,44 +81,17 @@ config: name: nautobot-config root: /opt/nautobot -### -# ```{rubric} Database -# ``` -# --- -# Configure a relational database connection, MySQL and PostgreSQL are -# supported. -# -# ```{literalinclude} /values.yaml -# :caption: database -# :language: yaml -# :start-at: "database:\n" -# :end-before: "###\n" -# ``` database: database: nautobot engine: django.db.backends.postgresql - host: postgresql.postgresql.svc.cluster.local - name: postgres + host: pg.breeze-blocks.net + name: nautobot password: "" port: '5432' - secretfile: secrets/secrets.yaml + secretfile: secrets/values.yaml timeout: '300' username: "" -### -# ```{rubric} Full Name Override -# ``` -# --- -# Override the full name of the release. -# -# ```{literalinclude} /values.yaml -# :caption: fullname override -# :language: yaml -# :start-at: "fullnameOverride: \"nautobot\"\n" -# :end-before: "###\n" -# ``` -fullnameOverride: "nautobot" - ### # ```{rubric} Container image settings # ``` @@ -142,7 +108,7 @@ image: pullPolicy: Always repository: ghcr.io/edwardtheharris/helm-nautobot/nautobot # Overrides the image tag whose default is the chart appVersion. - tag: '0.0.2' + tag: '0.0.3' secret: name: ghcr data: '' @@ -189,10 +155,10 @@ ingress: className: "nginx" enabled: true hosts: - - host: nautobot.svc.cluster.local + - host: nautobot.breeze-blocks.net paths: - path: / - pathType: ImplementationSpecific + pathType: Prefix tls: [] ### @@ -224,20 +190,6 @@ livenessProbe: # When the probe times out timeoutSeconds: 5 -### -# ```{rubric} Name Override -# ``` -# --- -# Override the release name, but not quite all the way. -# -# ```{literalinclude} /values.yaml -# :caption: name override -# :language: yaml -# :start-at: "nameOverride: \"nautobot\"\n" -# :end-before: "###\n" -# ``` -nameOverride: "nautobot" - ### # ```{rubric} Node Selector # ``` @@ -251,7 +203,7 @@ nameOverride: "nautobot" # :end-before: "###\n" # ``` nodeSelector: - kubernetes.io/os: linux + kubernetes.io/hostname: k8s05.breeze-blocks.net ### # ```{rubric} Persistence Configuration @@ -266,9 +218,8 @@ nodeSelector: # :end-before: "###\n" # ``` persistence: - name: nautobot-pvc - size: 10Gi - storageClass: csi-driver-lvm-linear + name: nautobot + storageClass: csi-lvm-linear ### # ```{rubric} Pod Annotations @@ -297,7 +248,7 @@ podAnnotations: {} # :end-before: "###\n" # ``` podLabels: - app: nautobot + app.kubernetes.io/name: nautobot ### # ```{rubric} Pod Security Context @@ -320,6 +271,68 @@ podLabels: # ``` podSecurityContext: {} +### +# ```{rubric} PostgreSQL settings +# ``` +# --- +# Enable and configure PostgreSQL. +# +# ```{literalinclude} /values.yaml +# :caption: postgresql as a dependency +# :language: yaml +# :start-at: "postgresql:\n" +# :end-before: "###\n" +# ``` +# +# ```{code-block} yaml +# :caption: postgresql chart settings +# +# podSecurityContext: +# fsGroup: 1000 +# labels: +# name: postgresql +# app.kubernetes.io/name: nautobot +# nameOverride: postgresql +# persistence: +# name: postgresql +# database: +# database: nautobot +# engine: django.db.backends.postgresql +# host: postgresql.nautobot.svc.cluster.local +# name: nautobot +# password: "" +# port: '5432' +# secretfile: secrets/values.yaml +# timeout: '300' +# username: "" +# ``` +postgresql: + enabled: false + +### +# ```{rubric} Redis +# ``` +# --- +# Enable and configure Redis. +# +# ```{literalinclude} /values.yaml +# :caption: redis +# :language: yaml +# :start-at: "redis:\n" +# :end-before: "###\n" +# ``` +# +# ```{code-block} yaml +# labels: +# name: redis +# app.kubernetes.io/name: nautobot +# nameOverride: redis +# persistence: +# name: redis +# ``` +redis: + enabled: false + ### # ```{rubric} Replica Count # ``` @@ -329,9 +342,11 @@ podSecurityContext: {} # ```{literalinclude} /values.yaml # :caption: replicas # :language: yaml -# :start-at: "replicaCount: 1\n" +# :start-at: "replicaCount: 3\n" # :end-before: "###\n" # ``` +# +# ```{code-block} yaml # readinessProbe: # exec: # command: @@ -343,7 +358,8 @@ podSecurityContext: {} # periodSeconds: 5 # How often to perform the probe # successThreshold: 1 # Minimum consecutive successes for the probe to be considered successful # timeoutSeconds: 1 # When the probe times out -replicaCount: 1 +# ``` +replicaCount: '1' ### # ```{rubric} Resource Requests and Limits @@ -378,6 +394,11 @@ resources: limits: cpu: 2 memory: 4096Mi + storage: 20Gi + requests: + cpu: 1 + memory: 2048Mi + storage: 5Gi ### # ```{rubric} Security Context @@ -392,6 +413,8 @@ resources: # :end-before: "###\n" # ``` securityContext: {} +secrets: + ghcr: bm90Z2h0b2tlbg== ### # ```{rubric} Service @@ -419,7 +442,10 @@ service: enabled: true port: 8000 targetPort: 8000 - type: ClusterIP + type: LoadBalancer + loadBalancerIP: 192.168.5.5 + externalIPs: + - 192.168.5.15 ### # ```{rubric} Service Account @@ -436,7 +462,7 @@ service: serviceAccount: # Annotations to add to the service account annotations: - sa.kubernetes.io/name: nautobot + app.kubernetes.io/name: nautobot # Automatically mount a ServiceAccount's API credentials? automount: true # Specifies whether a service account should be created @@ -477,6 +503,7 @@ superUser: create: true email: nautobot@nautobot.svc.cluster.local password: "" + name: "" secret: name: secret.superuser secretKey: '57evlrs^0pmu5#ys=9t6==lf6hdz&$1)qq-(%f1noo_b+nsy@f' @@ -509,7 +536,7 @@ tolerations: [] # :start-at: "type: Deployment\n" # :end-before: "###\n" # ``` -type: Deployment +type: StatefulSet ### # ```{rubric} Volume Mounts