diff --git a/.python-version b/.python-version index 78c9a28e..92536a9e 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.9.12 +3.12.0 diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 00000000..8f5f78a6 --- /dev/null +++ b/.tool-versions @@ -0,0 +1,2 @@ +python 3.12.0 +minikube 1.31.2 diff --git a/bin/setup_venv.sh b/bin/setup_venv.sh index fbce414e..3204d456 100755 --- a/bin/setup_venv.sh +++ b/bin/setup_venv.sh @@ -201,7 +201,7 @@ pip3 install pipenv pip3 install wheel # `pipenv sync` uses only the information in the `Pipfile.lock` ensuring repeatable builds -PIPENV_VERBOSITY=-1 PIPENV_PIPFILE="${script_dir}/../pulumi/python/Pipfile" pipenv sync --dev +PIPENV_VERBOSITY=-1 PIPENV_PIPFILE="${script_dir}/../pulumi/python/Pipfile" pipenv sync # Install node.js into virtual environment so that it can be used by Python # modules that make call outs to it. @@ -211,10 +211,7 @@ else echo "Node.js version $("${VIRTUAL_ENV}/bin/node" --version) is already installed" fi -# Install general package requirements -# `pipenv sync` uses only the information in the `Pipfile.lock` ensuring repeatable builds -PIPENV_VERBOSITY=-1 PIPENV_PIPFILE="${script_dir}/../pulumi/python/Pipfile" pipenv sync - +echo "Installing local utilities Python module for MARA" # Install local common utilities module pip3 install "${script_dir}/../pulumi/python/utility/kic-pulumi-utils" @@ -270,7 +267,7 @@ fi # if [ ! -x "${VIRTUAL_ENV}/bin/kubectl" ]; then echo "Downloading kubectl into virtual environment" - KUBECTL_VERSION="v1.24.3" + KUBECTL_VERSION="v1.27.4" ${download_cmd} "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${OS}/${ARCH}/kubectl" >"${VIRTUAL_ENV}/bin/kubectl" KUBECTL_CHECKSUM="$(${download_cmd} "https://dl.k8s.io/${KUBECTL_VERSION}/bin/${OS}/${ARCH}/kubectl.sha256")" echo "${KUBECTL_CHECKSUM} ${VIRTUAL_ENV}/bin/kubectl" | ${sha256sum_cmd} @@ -278,7 +275,7 @@ if [ ! -x "${VIRTUAL_ENV}/bin/kubectl" ]; then else echo "kubectl is already installed, but will overwrite to ensure correct version" echo "Downloading kubectl into virtual environment" - KUBECTL_VERSION="v1.24.3" + KUBECTL_VERSION="v1.27.4" ${download_cmd} "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${OS}/${ARCH}/kubectl" >"${VIRTUAL_ENV}/bin/kubectl" KUBECTL_CHECKSUM="$(${download_cmd} "https://dl.k8s.io/${KUBECTL_VERSION}/bin/${OS}/${ARCH}/kubectl.sha256")" echo "${KUBECTL_CHECKSUM} ${VIRTUAL_ENV}/bin/kubectl" | ${sha256sum_cmd} diff --git a/pulumi/python/Pipfile b/pulumi/python/Pipfile index 482308e4..effcf122 100644 --- a/pulumi/python/Pipfile +++ b/pulumi/python/Pipfile @@ -4,29 +4,22 @@ verify_ssl = true name = "pypi" [packages] -awscli = "~=1.25.35" -grpcio = "==1.43.0" -fart = "~=0.1.5" -lolcat = "~=1.4" -passlib = "~=1.7.4" -pulumi-aws = ">=4.39.0" -pulumi-docker = "==3.1.0" -pulumi-eks = ">=0.41.2" -pulumi-kubernetes = "==3.20.1" -pycryptodome = "~=3.14.0" -requests = "~=2.27.1" -setuptools-git-versioning = "==1.9.2" -yamlreader = "==3.0.4" -pulumi-digitalocean = "==4.12.0" -pulumi-linode = "==3.7.1" -linode-cli = "~=5.17.2" -pulumi = "~=3.36.0" -PyYAML = "~=5.4.1" -nodeenv = "~=1.6.0" - -[dev-packages] -wheel = "~=0.37.1" -nodeenv = "~=1.6.0" +pulumi = "*" +fart = "*" +lolcat = "*" +passlib = "*" +pulumi-docker = "*" +pulumi-kubernetes = "*" +setuptools-git-versioning = "*" +pyyaml = "*" +wheel = "*" +nodeenv = "*" +pulumi-digitalocean = "*" +pulumi-linode = "*" +linode-cli = "*" +pulumi-aws = "*" +pulumi-eks = "*" +awscli = "*" [requires] -python_version = "3.9" +python_version = "3.12" diff --git a/pulumi/python/Pipfile.lock b/pulumi/python/Pipfile.lock index f5f99156..4941b30e 100644 --- a/pulumi/python/Pipfile.lock +++ b/pulumi/python/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "177455c15d31187879995d736c67fd353a973ace31fd79906ad499f668a09900" + "sha256": "3e247b1bd3ede347e71e2e3635ada0183b2009904d21082bd3c80e67c8e67aec" }, "pipfile-spec": 6, "requires": { - "python_version": "3.9" + "python_version": "3.12" }, "sources": [ { @@ -18,50 +18,139 @@ "default": { "arpeggio": { "hashes": [ - "sha256:bfe349f252f82f82d84cb886f1d5081d1a31451e6045275e9f90b65d0daa06f1", - "sha256:fed68a1cb7f529cbd4d725597cc811b7506885fcdef17d4cdcf564341a1e210b" + "sha256:c790b2b06e226d2dd468e4fbfb5b7f506cec66416031fde1441cf1de2a0ba700", + "sha256:f7c8ae4f4056a89e020c24c7202ac8df3e2bc84e416746f20b0da35bb1de0250" ], - "version": "==1.10.2" + "version": "==2.0.2" }, "attrs": { "hashes": [ - "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4", - "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd" + "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04", + "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==21.4.0" + "markers": "python_version >= '3.7'", + "version": "==23.1.0" }, "awscli": { "hashes": [ - "sha256:1b3adbc9cfb9aad7d0f6abc4cb0a5b95eb640afb77486885d3c4ff0cbc28f494", - "sha256:8883c357165a1e1866636c19a264876e9a3938af4f25425d587255698162535f" + "sha256:1c1df34b4bd68b853b37fab9bad153852820769e0fa0664988cfe6cf379c3e49", + "sha256:eb795bfbe27997b4acc7501d261334e5aa2f01b82ed85f2ae724d0c843dc4e75" ], "index": "pypi", - "version": "==1.25.35" + "markers": "python_version >= '3.7'", + "version": "==1.29.58" }, "botocore": { "hashes": [ - "sha256:9949d61959476b5a34408881bdb98f54b0642238ffb217c5260124ec58fb0c72", - "sha256:d2e708dd766b21c8e20a57ce1a90e98d324f871f81215efbc2dddaa42d13c551" + "sha256:002f8bdca8efde50ae7267f342bc1d03a71d76024ce3949e4ffdd1151581c53e", + "sha256:83a3ca4d9247fdbde76c654137e6ab648bd976f652ce2354def1715c838af505" ], "markers": "python_version >= '3.7'", - "version": "==1.27.35" + "version": "==1.31.58" }, "certifi": { "hashes": [ - "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d", - "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412" + "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082", + "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9" ], "markers": "python_version >= '3.6'", - "version": "==2022.6.15" + "version": "==2023.7.22" }, "charset-normalizer": { "hashes": [ - "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", - "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" - ], - "markers": "python_version >= '3'", - "version": "==2.0.12" + "sha256:02673e456dc5ab13659f85196c534dc596d4ef260e4d86e856c3b2773ce09843", + "sha256:02af06682e3590ab952599fbadac535ede5d60d78848e555aa58d0c0abbde786", + "sha256:03680bb39035fbcffe828eae9c3f8afc0428c91d38e7d61aa992ef7a59fb120e", + "sha256:0570d21da019941634a531444364f2482e8db0b3425fcd5ac0c36565a64142c8", + "sha256:09c77f964f351a7369cc343911e0df63e762e42bac24cd7d18525961c81754f4", + "sha256:0d3d5b7db9ed8a2b11a774db2bbea7ba1884430a205dbd54a32d61d7c2a190fa", + "sha256:1063da2c85b95f2d1a430f1c33b55c9c17ffaf5e612e10aeaad641c55a9e2b9d", + "sha256:12ebea541c44fdc88ccb794a13fe861cc5e35d64ed689513a5c03d05b53b7c82", + "sha256:153e7b6e724761741e0974fc4dcd406d35ba70b92bfe3fedcb497226c93b9da7", + "sha256:15b26ddf78d57f1d143bdf32e820fd8935d36abe8a25eb9ec0b5a71c82eb3895", + "sha256:1872d01ac8c618a8da634e232f24793883d6e456a66593135aeafe3784b0848d", + "sha256:187d18082694a29005ba2944c882344b6748d5be69e3a89bf3cc9d878e548d5a", + "sha256:1b2919306936ac6efb3aed1fbf81039f7087ddadb3160882a57ee2ff74fd2382", + "sha256:232ac332403e37e4a03d209a3f92ed9071f7d3dbda70e2a5e9cff1c4ba9f0678", + "sha256:23e8565ab7ff33218530bc817922fae827420f143479b753104ab801145b1d5b", + "sha256:24817cb02cbef7cd499f7c9a2735286b4782bd47a5b3516a0e84c50eab44b98e", + "sha256:249c6470a2b60935bafd1d1d13cd613f8cd8388d53461c67397ee6a0f5dce741", + "sha256:24a91a981f185721542a0b7c92e9054b7ab4fea0508a795846bc5b0abf8118d4", + "sha256:2502dd2a736c879c0f0d3e2161e74d9907231e25d35794584b1ca5284e43f596", + "sha256:250c9eb0f4600361dd80d46112213dff2286231d92d3e52af1e5a6083d10cad9", + "sha256:278c296c6f96fa686d74eb449ea1697f3c03dc28b75f873b65b5201806346a69", + "sha256:2935ffc78db9645cb2086c2f8f4cfd23d9b73cc0dc80334bc30aac6f03f68f8c", + "sha256:2f4a0033ce9a76e391542c182f0d48d084855b5fcba5010f707c8e8c34663d77", + "sha256:30a85aed0b864ac88309b7d94be09f6046c834ef60762a8833b660139cfbad13", + "sha256:380c4bde80bce25c6e4f77b19386f5ec9db230df9f2f2ac1e5ad7af2caa70459", + "sha256:3ae38d325b512f63f8da31f826e6cb6c367336f95e418137286ba362925c877e", + "sha256:3b447982ad46348c02cb90d230b75ac34e9886273df3a93eec0539308a6296d7", + "sha256:3debd1150027933210c2fc321527c2299118aa929c2f5a0a80ab6953e3bd1908", + "sha256:4162918ef3098851fcd8a628bf9b6a98d10c380725df9e04caf5ca6dd48c847a", + "sha256:468d2a840567b13a590e67dd276c570f8de00ed767ecc611994c301d0f8c014f", + "sha256:4cc152c5dd831641e995764f9f0b6589519f6f5123258ccaca8c6d34572fefa8", + "sha256:542da1178c1c6af8873e143910e2269add130a299c9106eef2594e15dae5e482", + "sha256:557b21a44ceac6c6b9773bc65aa1b4cc3e248a5ad2f5b914b91579a32e22204d", + "sha256:5707a746c6083a3a74b46b3a631d78d129edab06195a92a8ece755aac25a3f3d", + "sha256:588245972aca710b5b68802c8cad9edaa98589b1b42ad2b53accd6910dad3545", + "sha256:5adf257bd58c1b8632046bbe43ee38c04e1038e9d37de9c57a94d6bd6ce5da34", + "sha256:619d1c96099be5823db34fe89e2582b336b5b074a7f47f819d6b3a57ff7bdb86", + "sha256:63563193aec44bce707e0c5ca64ff69fa72ed7cf34ce6e11d5127555756fd2f6", + "sha256:67b8cc9574bb518ec76dc8e705d4c39ae78bb96237cb533edac149352c1f39fe", + "sha256:6a685067d05e46641d5d1623d7c7fdf15a357546cbb2f71b0ebde91b175ffc3e", + "sha256:70f1d09c0d7748b73290b29219e854b3207aea922f839437870d8cc2168e31cc", + "sha256:750b446b2ffce1739e8578576092179160f6d26bd5e23eb1789c4d64d5af7dc7", + "sha256:7966951325782121e67c81299a031f4c115615e68046f79b85856b86ebffc4cd", + "sha256:7b8b8bf1189b3ba9b8de5c8db4d541b406611a71a955bbbd7385bbc45fcb786c", + "sha256:7f5d10bae5d78e4551b7be7a9b29643a95aded9d0f602aa2ba584f0388e7a557", + "sha256:805dfea4ca10411a5296bcc75638017215a93ffb584c9e344731eef0dcfb026a", + "sha256:81bf654678e575403736b85ba3a7867e31c2c30a69bc57fe88e3ace52fb17b89", + "sha256:82eb849f085624f6a607538ee7b83a6d8126df6d2f7d3b319cb837b289123078", + "sha256:85a32721ddde63c9df9ebb0d2045b9691d9750cb139c161c80e500d210f5e26e", + "sha256:86d1f65ac145e2c9ed71d8ffb1905e9bba3a91ae29ba55b4c46ae6fc31d7c0d4", + "sha256:86f63face3a527284f7bb8a9d4f78988e3c06823f7bea2bd6f0e0e9298ca0403", + "sha256:8eaf82f0eccd1505cf39a45a6bd0a8cf1c70dcfc30dba338207a969d91b965c0", + "sha256:93aa7eef6ee71c629b51ef873991d6911b906d7312c6e8e99790c0f33c576f89", + "sha256:96c2b49eb6a72c0e4991d62406e365d87067ca14c1a729a870d22354e6f68115", + "sha256:9cf3126b85822c4e53aa28c7ec9869b924d6fcfb76e77a45c44b83d91afd74f9", + "sha256:9fe359b2e3a7729010060fbca442ca225280c16e923b37db0e955ac2a2b72a05", + "sha256:a0ac5e7015a5920cfce654c06618ec40c33e12801711da6b4258af59a8eff00a", + "sha256:a3f93dab657839dfa61025056606600a11d0b696d79386f974e459a3fbc568ec", + "sha256:a4b71f4d1765639372a3b32d2638197f5cd5221b19531f9245fcc9ee62d38f56", + "sha256:aae32c93e0f64469f74ccc730a7cb21c7610af3a775157e50bbd38f816536b38", + "sha256:aaf7b34c5bc56b38c931a54f7952f1ff0ae77a2e82496583b247f7c969eb1479", + "sha256:abecce40dfebbfa6abf8e324e1860092eeca6f7375c8c4e655a8afb61af58f2c", + "sha256:abf0d9f45ea5fb95051c8bfe43cb40cda383772f7e5023a83cc481ca2604d74e", + "sha256:ac71b2977fb90c35d41c9453116e283fac47bb9096ad917b8819ca8b943abecd", + "sha256:ada214c6fa40f8d800e575de6b91a40d0548139e5dc457d2ebb61470abf50186", + "sha256:b09719a17a2301178fac4470d54b1680b18a5048b481cb8890e1ef820cb80455", + "sha256:b1121de0e9d6e6ca08289583d7491e7fcb18a439305b34a30b20d8215922d43c", + "sha256:b3b2316b25644b23b54a6f6401074cebcecd1244c0b8e80111c9a3f1c8e83d65", + "sha256:b3d9b48ee6e3967b7901c052b670c7dda6deb812c309439adaffdec55c6d7b78", + "sha256:b5bcf60a228acae568e9911f410f9d9e0d43197d030ae5799e20dca8df588287", + "sha256:b8f3307af845803fb0b060ab76cf6dd3a13adc15b6b451f54281d25911eb92df", + "sha256:c2af80fb58f0f24b3f3adcb9148e6203fa67dd3f61c4af146ecad033024dde43", + "sha256:c350354efb159b8767a6244c166f66e67506e06c8924ed74669b2c70bc8735b1", + "sha256:c5a74c359b2d47d26cdbbc7845e9662d6b08a1e915eb015d044729e92e7050b7", + "sha256:c71f16da1ed8949774ef79f4a0260d28b83b3a50c6576f8f4f0288d109777989", + "sha256:d47ecf253780c90ee181d4d871cd655a789da937454045b17b5798da9393901a", + "sha256:d7eff0f27edc5afa9e405f7165f85a6d782d308f3b6b9d96016c010597958e63", + "sha256:d97d85fa63f315a8bdaba2af9a6a686e0eceab77b3089af45133252618e70884", + "sha256:db756e48f9c5c607b5e33dd36b1d5872d0422e960145b08ab0ec7fd420e9d649", + "sha256:dc45229747b67ffc441b3de2f3ae5e62877a282ea828a5bdb67883c4ee4a8810", + "sha256:e0fc42822278451bc13a2e8626cf2218ba570f27856b536e00cfa53099724828", + "sha256:e39c7eb31e3f5b1f88caff88bcff1b7f8334975b46f6ac6e9fc725d829bc35d4", + "sha256:e46cd37076971c1040fc8c41273a8b3e2c624ce4f2be3f5dfcb7a430c1d3acc2", + "sha256:e5c1502d4ace69a179305abb3f0bb6141cbe4714bc9b31d427329a95acfc8bdd", + "sha256:edfe077ab09442d4ef3c52cb1f9dab89bff02f4524afc0acf2d46be17dc479f5", + "sha256:effe5406c9bd748a871dbcaf3ac69167c38d72db8c9baf3ff954c344f31c4cbe", + "sha256:f0d1e3732768fecb052d90d62b220af62ead5748ac51ef61e7b32c266cac9293", + "sha256:f5969baeaea61c97efa706b9b107dcba02784b1601c74ac84f2a532ea079403e", + "sha256:f8888e31e3a85943743f8fc15e71536bda1c81d5aa36d014a3c0c44481d7db6e", + "sha256:fc52b79d83a3fe3a360902d3f5d79073a993597d48114c29485e9431092905d8" + ], + "markers": "python_full_version >= '3.7.0'", + "version": "==3.3.0" }, "colorama": { "hashes": [ @@ -73,11 +162,11 @@ }, "dill": { "hashes": [ - "sha256:33501d03270bbe410c72639b350e941882a8b0fd55357580fbc873fba0c59302", - "sha256:d75e41f3eff1eee599d738e76ba8f4ad98ea229db8b085318aa2b3333a208c86" + "sha256:76b122c08ef4ce2eedcd4d1abd8e641114bfc6c2867f49f3c41facf65bf19f5e", + "sha256:cc1c8b182eb3013e24bd475ff2e9295af86c1a38eb1aff128dac8962a9ce3c03" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'", - "version": "==0.3.5.1" + "markers": "python_version >= '3.7'", + "version": "==0.3.7" }, "docutils": { "hashes": [ @@ -97,61 +186,62 @@ }, "grpcio": { "hashes": [ - "sha256:0110310eff07bb69782f53b7a947490268c4645de559034c43c0a635612e250f", - "sha256:01f4b887ed703fe82ebe613e1d2dadea517891725e17e7a6134dcd00352bd28c", - "sha256:04239e8f71db832c26bbbedb4537b37550a39d77681d748ab4678e58dd6455d6", - "sha256:08cf25f2936629db062aeddbb594bd76b3383ab0ede75ef0461a3b0bc3a2c150", - "sha256:0aa8285f284338eb68962fe1a830291db06f366ea12f213399b520c062b01f65", - "sha256:0e731f660e1e68238f56f4ce11156f02fd06dc58bc7834778d42c0081d4ef5ad", - "sha256:0edbfeb6729aa9da33ce7e28fb7703b3754934115454ae45e8cc1db601756fd3", - "sha256:124e718faf96fe44c98b05f3f475076be8b5198bb4c52a13208acf88a8548ba9", - "sha256:138f57e3445d4a48d9a8a5af1538fdaafaa50a0a3c243f281d8df0edf221dc02", - "sha256:17b75f220ee6923338155b4fcef4c38802b9a57bc57d112c9599a13a03e99f8d", - "sha256:1898f999383baac5fcdbdef8ea5b1ef204f38dc211014eb6977ac6e55944d738", - "sha256:1f16725a320460435a8a5339d8b06c4e00d307ab5ad56746af2e22b5f9c50932", - "sha256:2f96142d0abc91290a63ba203f01649e498302b1b6007c67bad17f823ecde0cf", - "sha256:31e6e489ccd8f08884b9349a39610982df48535881ec34f05a11c6e6b6ebf9d0", - "sha256:45401d00f2ee46bde75618bf33e9df960daa7980e6e0e7328047191918c98504", - "sha256:47b6821238d8978014d23b1132713dac6c2d72cbb561cf257608b1673894f90a", - "sha256:4b4a7152187a49767a47d1413edde2304c96f41f7bc92cc512e230dfd0fba095", - "sha256:50cfb7e1067ee5e00b8ab100a6b7ea322d37ec6672c0455106520b5891c4b5f5", - "sha256:5449ae564349e7a738b8c38583c0aad954b0d5d1dd3cea68953bfc32eaee11e3", - "sha256:577e024c8dd5f27cd98ba850bc4e890f07d4b5942e5bc059a3d88843a2f48f66", - "sha256:57f1aeb65ed17dfb2f6cd717cc109910fe395133af7257a9c729c0b9604eac10", - "sha256:594aaa0469f4fca7773e80d8c27bf1298e7bbce5f6da0f084b07489a708f16ab", - "sha256:6620a5b751b099b3b25553cfc03dfcd873cda06f9bb2ff7e9948ac7090e20f05", - "sha256:6e463b4aa0a6b31cf2e57c4abc1a1b53531a18a570baeed39d8d7b65deb16b7e", - "sha256:735d9a437c262ab039d02defddcb9f8f545d7009ae61c0114e19dda3843febe5", - "sha256:772b943f34374744f70236bbbe0afe413ed80f9ae6303503f85e2b421d4bca92", - "sha256:77ef653f966934b3bfdd00e4f2064b68880eb40cf09b0b99edfa5ee22a44f559", - "sha256:80398e9fb598060fa41050d1220f5a2440fe74ff082c36dda41ac3215ebb5ddd", - "sha256:8b2b9dc4d7897566723b77422e11c009a0ebd397966b165b21b89a62891a9fdf", - "sha256:a4b4543e13acb4806917d883d0f70f21ba93b29672ea81f4aaba14821aaf9bb0", - "sha256:a4e786a8ee8b30b25d70ee52cda6d1dbba2a8ca2f1208d8e20ed8280774f15c8", - "sha256:ade8b79a6b6aea68adb9d4bfeba5d647667d842202c5d8f3ba37ac1dc8e5c09c", - "sha256:af78ac55933811e6a25141336b1f2d5e0659c2f568d44d20539b273792563ca7", - "sha256:af9c3742f6c13575c0d4147a8454da0ff5308c4d9469462ff18402c6416942fe", - "sha256:b8cc936a29c65ab39714e1ba67a694c41218f98b6e2a64efb83f04d9abc4386b", - "sha256:bdf41550815a831384d21a498b20597417fd31bd084deb17d31ceb39ad9acc79", - "sha256:c354017819201053d65212befd1dcb65c2d91b704d8977e696bae79c47cd2f82", - "sha256:c36f418c925a41fccada8f7ae9a3d3e227bfa837ddbfddd3d8b0ac252d12dda9", - "sha256:cbc9b83211d905859dcf234ad39d7193ff0f05bfc3269c364fb0d114ee71de59", - "sha256:e95b5d62ec26d0cd0b90c202d73e7cb927c369c3358e027225239a4e354967dc", - "sha256:f11d05402e0ac3a284443d8a432d3dfc76a6bd3f7b5858cddd75617af2d7bd9b", - "sha256:fa26a8bbb3fe57845acb1329ff700d5c7eaf06414c3e15f4cb8923f3a466ef64", - "sha256:fb7229fa2a201a0c377ff3283174ec966da8f9fd7ffcc9a92f162d2e7fc9025b", - "sha256:fdac966699707b5554b815acc272d81e619dd0999f187cd52a61aef075f870ee" + "sha256:06e84ad9ae7668a109e970c7411e7992751a116494cba7c4fb877656527f9a57", + "sha256:0ff789ae7d8ddd76d2ac02e7d13bfef6fc4928ac01e1dcaa182be51b6bcc0aaa", + "sha256:10954662f77dc36c9a1fb5cc4a537f746580d6b5734803be1e587252682cda8d", + "sha256:139f66656a762572ae718fa0d1f2dce47c05e9fbf7a16acd704c354405b97df9", + "sha256:1c31e52a04e62c8577a7bf772b3e7bed4df9c9e0dd90f92b6ffa07c16cab63c9", + "sha256:33971197c47965cc1d97d78d842163c283e998223b151bab0499b951fd2c0b12", + "sha256:345356b307cce5d14355e8e055b4ca5f99bc857c33a3dc1ddbc544fca9cd0475", + "sha256:373b48f210f43327a41e397391715cd11cfce9ded2fe76a5068f9bacf91cc226", + "sha256:3ccb621749a81dc7755243665a70ce45536ec413ef5818e013fe8dfbf5aa497b", + "sha256:42a3bbb2bc07aef72a7d97e71aabecaf3e4eb616d39e5211e2cfe3689de860ca", + "sha256:42e63904ee37ae46aa23de50dac8b145b3596f43598fa33fe1098ab2cbda6ff5", + "sha256:4eb37dd8dd1aa40d601212afa27ca5be255ba792e2e0b24d67b8af5e012cdb7d", + "sha256:51173e8fa6d9a2d85c14426bdee5f5c4a0654fd5fddcc21fe9d09ab0f6eb8b35", + "sha256:5144feb20fe76e73e60c7d73ec3bf54f320247d1ebe737d10672480371878b48", + "sha256:5344be476ac37eb9c9ad09c22f4ea193c1316bf074f1daf85bddb1b31fda5116", + "sha256:6108e5933eb8c22cd3646e72d5b54772c29f57482fd4c41a0640aab99eb5071d", + "sha256:6a007a541dff984264981fbafeb052bfe361db63578948d857907df9488d8774", + "sha256:6ee26e9dfb3996aff7c870f09dc7ad44a5f6732b8bdb5a5f9905737ac6fd4ef1", + "sha256:750de923b456ca8c0f1354d6befca45d1f3b3a789e76efc16741bd4132752d95", + "sha256:7c5ede2e2558f088c49a1ddda19080e4c23fb5d171de80a726b61b567e3766ed", + "sha256:830215173ad45d670140ff99aac3b461f9be9a6b11bee1a17265aaaa746a641a", + "sha256:8391cea5ce72f4a12368afd17799474015d5d3dc00c936a907eb7c7eaaea98a5", + "sha256:8940d6de7068af018dfa9a959a3510e9b7b543f4c405e88463a1cbaa3b2b379a", + "sha256:89a49cc5ad08a38b6141af17e00d1dd482dc927c7605bc77af457b5a0fca807c", + "sha256:900bc0096c2ca2d53f2e5cebf98293a7c32f532c4aeb926345e9747452233950", + "sha256:97e0efaebbfd222bcaac2f1735c010c1d3b167112d9d237daebbeedaaccf3d1d", + "sha256:9e04d4e4cfafa7c5264e535b5d28e786f0571bea609c3f0aaab13e891e933e9c", + "sha256:a4c60abd950d6de3e4f1ddbc318075654d275c29c846ab6a043d6ed2c52e4c8c", + "sha256:a6ff459dac39541e6a2763a4439c4ca6bc9ecb4acc05a99b79246751f9894756", + "sha256:a72797549935c9e0b9bc1def1768c8b5a709538fa6ab0678e671aec47ebfd55e", + "sha256:af4063ef2b11b96d949dccbc5a987272f38d55c23c4c01841ea65a517906397f", + "sha256:b975b85d1d5efc36cf8b237c5f3849b64d1ba33d6282f5e991f28751317504a1", + "sha256:bf0b9959e673505ee5869950642428046edb91f99942607c2ecf635f8a4b31c9", + "sha256:c0c85c5cbe8b30a32fa6d802588d55ffabf720e985abe9590c7c886919d875d4", + "sha256:c3f3237a57e42f79f1e560726576aedb3a7ef931f4e3accb84ebf6acc485d316", + "sha256:c3fa3ab0fb200a2c66493828ed06ccd1a94b12eddbfb985e7fd3e5723ff156c6", + "sha256:c435f5ce1705de48e08fcbcfaf8aee660d199c90536e3e06f2016af7d6a938dd", + "sha256:c90da4b124647547a68cf2f197174ada30c7bb9523cb976665dfd26a9963d328", + "sha256:cbdf2c498e077282cd427cfd88bdce4668019791deef0be8155385ab2ba7837f", + "sha256:d1fbad1f9077372b6587ec589c1fc120b417b6c8ad72d3e3cc86bbbd0a3cee93", + "sha256:d39f5d4af48c138cb146763eda14eb7d8b3ccbbec9fe86fb724cd16e0e914c64", + "sha256:ddb4a6061933bd9332b74eac0da25f17f32afa7145a33a0f9711ad74f924b1b8", + "sha256:ded637176addc1d3eef35331c39acc598bac550d213f0a1bedabfceaa2244c87", + "sha256:f20fd21f7538f8107451156dd1fe203300b79a9ddceba1ee0ac8132521a008ed", + "sha256:fda2783c12f553cdca11c08e5af6eecbd717280dc8fbe28a110897af1c15a88c" ], - "index": "pypi", - "version": "==1.43.0" + "markers": "python_version >= '3.7'", + "version": "==1.56.2" }, "idna": { "hashes": [ - "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", - "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" + "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4", + "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2" ], - "markers": "python_version >= '3'", - "version": "==3.3" + "markers": "python_version >= '3.5'", + "version": "==3.4" }, "jmespath": { "hashes": [ @@ -163,10 +253,12 @@ }, "linode-cli": { "hashes": [ - "sha256:42ac2d112c1ab35aa0c5a37fdbe4d782b7100602b1a0410e11732457c9910403" + "sha256:69bd9263855ec9e715d0994c916c5fc285122858f8805af12bbc5336af26a73b", + "sha256:bb3f4f0dbaf1a61d378d37a759f179694706a742e381813193ff1216f1a1df76" ], "index": "pypi", - "version": "==5.17.2" + "markers": "python_version >= '3.7'", + "version": "==5.44.1" }, "lolcat": { "hashes": [ @@ -176,29 +268,53 @@ "index": "pypi", "version": "==1.4" }, + "markdown-it-py": { + "hashes": [ + "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1", + "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb" + ], + "markers": "python_version >= '3.8'", + "version": "==3.0.0" + }, + "mdurl": { + "hashes": [ + "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", + "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba" + ], + "markers": "python_version >= '3.7'", + "version": "==0.1.2" + }, "nodeenv": { "hashes": [ - "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b", - "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7" + "sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2", + "sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec" ], "index": "pypi", - "version": "==1.6.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'", + "version": "==1.8.0" + }, + "openapi3": { + "hashes": [ + "sha256:0d8fd34f304b61bc64b1f48ed6c6dbcc03ca04a29bcfa84e40ec5d87648e4399", + "sha256:a21a490573d89ca69ada7cbe585adb2fca4964257f6f3a1df531f12815455d2c" + ], + "version": "==1.8.2" }, "packaging": { "hashes": [ - "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb", - "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522" + "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5", + "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7" ], - "markers": "python_version >= '3.6'", - "version": "==21.3" + "markers": "python_version >= '3.7'", + "version": "==23.2" }, "parver": { "hashes": [ - "sha256:41a548c51b006a2f2522b54293cbfd2514bffa10774ece8430c9964a20cbd8b4", - "sha256:c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3" + "sha256:c66d3347a4858643875ef959d8ba7a269d5964bfb690b0dd998b8f39da930be2", + "sha256:d4a3dbb93c53373ee9a0ba055e4858c44169b204b912e49d003ead95db9a9bca" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==0.3.1" + "markers": "python_version >= '3.7'", + "version": "==0.4" }, "passlib": { "hashes": [ @@ -210,134 +326,95 @@ }, "protobuf": { "hashes": [ - "sha256:174bc835cc639c82164bbce4e28e2af5aa7821285d7fde3162afbe5e226a5a73", - "sha256:382c01e2ce14dcc3b4d25b8839f2139cc09c8a4006ad678579dc4080f6be1b29", - "sha256:5330df7650785c7ffdd1199c04933668d5e2dfefb62250e2b03ec1c1d20e7c2e", - "sha256:64fd63629f8952d58a41150b242f1c1c30c5062c9b0de8e420c6d3b360ec5d89", - "sha256:75aaa6d76a76a6f41f02645f6ebd255d738e9bb14c4d9d8269c676e65d0e0c7c", - "sha256:7dfc160de830b96b2c92c10d8f60e582e92252701bf6640ae75dfdecf6fdeb7a", - "sha256:8a2b4976872b71ea56cd3d55d320751d36a53f10220cc6075517806076cf4829", - "sha256:9130759e719bee1e6d05ca6a3037f7eff66d7a7ff6ba25871917dc40e8f3fbb6", - "sha256:9f510e743462899b1e296ac19bbaf4212d3106cdc51260ecde59ee6063f743f9", - "sha256:cebfd1fb899180c0523955d5cae0e764210961b12dfc39fd96af8fc81fe71ac7", - "sha256:d367e7385cd808ad33b580155bf9694881dd711c4271fe7b6f4e5270a01980b7", - "sha256:dec4cb439e25058518e2cd469c5eb0f4e634b113eb0b1343b55ba9303ab1ad38", - "sha256:df5a126706bd1d5072a6a0f6895c633ede67ea6cd679b4268eecce6b438bbe69", - "sha256:fa22e2413f6fd98ec1b388686aadef5420ea8205e37b35cad825adea7c019625" + "sha256:067f750169bc644da2e1ef18c785e85071b7c296f14ac53e0900e605da588719", + "sha256:12e9ad2ec079b833176d2921be2cb24281fa591f0b119b208b788adc48c2561d", + "sha256:1b182c7181a2891e8f7f3a1b5242e4ec54d1f42582485a896e4de81aa17540c2", + "sha256:20651f11b6adc70c0f29efbe8f4a94a74caf61b6200472a9aea6e19898f9fcf4", + "sha256:2da777d34b4f4f7613cdf85c70eb9a90b1fbef9d36ae4a0ccfe014b0b07906f1", + "sha256:3d42e9e4796a811478c783ef63dc85b5a104b44aaaca85d4864d5b886e4b05e3", + "sha256:6e514e8af0045be2b56e56ae1bb14f43ce7ffa0f68b1c793670ccbe2c4fc7d2b", + "sha256:b0271a701e6782880d65a308ba42bc43874dabd1a0a0f41f72d2dac3b57f8e76", + "sha256:ba53c2f04798a326774f0e53b9c759eaef4f6a568ea7072ec6629851c8435959", + "sha256:e29d79c913f17a60cf17c626f1041e5288e9885c8579832580209de8b75f2a52", + "sha256:f631bb982c5478e0c1c70eab383af74a84be66945ebf5dd6b06fc90079668d0b", + "sha256:f6ccbcf027761a2978c1406070c3788f6de4a4b2cc20800cc03d52df716ad675", + "sha256:f6f8dc65625dadaad0c8545319c2e2f0424fede988368893ca3844261342c11a" ], "markers": "python_version >= '3.7'", - "version": "==4.21.3" + "version": "==4.24.3" }, "pulumi": { "hashes": [ - "sha256:86acb1e0921619d49123d1a4ce43bfa7dc2dae9723266e21c24a11632f3231d9" + "sha256:db1923170e91badf7d781426d14132a3bec6be827a75d1c535d8be987dc579e1" ], "index": "pypi", - "version": "==3.36.0" + "markers": "python_version >= '3.7'", + "version": "==3.86.0" }, "pulumi-aws": { "hashes": [ - "sha256:e82655bd961447167e1bb2839032e93ba73c37cf2f048ed2447de67dc73e9fd5" + "sha256:98bedf49a63b6a44b107d7f3a8b38f14bd69a00e928f87e4be39149048f72597" ], "index": "pypi", - "version": "==5.10.0" + "markers": "python_version >= '3.7'", + "version": "==5.42.0" }, "pulumi-digitalocean": { "hashes": [ - "sha256:ad2f7903de6fded33ef43f35327b331aedac26eaf9c4222c1402b662b9487f8f" + "sha256:e7764ee66ee92d57b5a5afeb7061fb3f0b316b4a6f7f061770eae01f9fe811ba" ], "index": "pypi", - "version": "==4.12.0" + "markers": "python_version >= '3.7'", + "version": "==4.22.0" }, "pulumi-docker": { "hashes": [ - "sha256:0c5edb04448994de6cffb702146085856354efddbe78b0b38fa6a666428f0408" + "sha256:f6693ede0b54b16dbea3ecf02602d358774bb764f0cc6949886bb2eb33797be5" ], "index": "pypi", - "version": "==3.1.0" + "markers": "python_version >= '3.7'", + "version": "==4.4.1" }, "pulumi-eks": { "hashes": [ - "sha256:d8f7dafa71eaaab4d8f115691c80fe63df5ac5df07df643c3977f2dc1e9b0cf4" + "sha256:a09f79d7f2c657dedba58f3dd9fd38e550bbba06d533f5ef6c2f5d44abbcb7cd" ], "index": "pypi", - "version": "==0.41.2" + "markers": "python_version >= '3.7'", + "version": "==1.0.3" }, "pulumi-kubernetes": { "hashes": [ - "sha256:4fe4fcc19be7f3834e06e2baecafaa2bc3fcd7d3af192d7d7d67986c6699096a" + "sha256:8a7804ec2f2f0da86c153312d63a4ea34af200b24601e58c3c54b81807204ec1" ], "index": "pypi", - "version": "==3.20.1" + "markers": "python_version >= '3.7'", + "version": "==3.30.2" }, "pulumi-linode": { "hashes": [ - "sha256:460425bba8f2dee89c3c5528dce5dd2a7294fd18eb5e6b4e039194a0904c6208" + "sha256:31e55f3ccc79d05210ea3c955d4b8aadd71beca17c095a579352d31b16431e1a", + "sha256:d036b4138b99c76a15f1a262d21a09796eba95127459758858ce7dbfc7039d56" ], "index": "pypi", - "version": "==3.7.1" + "markers": "python_version >= '3.7'", + "version": "==4.7.0" }, "pyasn1": { "hashes": [ - "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359", - "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576", - "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf", - "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7", - "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d", - "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00", - "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8", - "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86", - "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12", - "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776", - "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba", - "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2", - "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3" - ], - "version": "==0.4.8" - }, - "pycryptodome": { - "hashes": [ - "sha256:028dcbf62d128b4335b61c9fbb7dd8c376594db607ef36d5721ee659719935d5", - "sha256:12ef157eb1e01a157ca43eda275fa68f8db0dd2792bc4fe00479ab8f0e6ae075", - "sha256:2562de213960693b6d657098505fd4493c45f3429304da67efcbeb61f0edfe89", - "sha256:27e92c1293afcb8d2639baf7eb43f4baada86e4de0f1fb22312bfc989b95dae2", - "sha256:36e3242c4792e54ed906c53f5d840712793dc68b726ec6baefd8d978c5282d30", - "sha256:50a5346af703330944bea503106cd50c9c2212174cfcb9939db4deb5305a8367", - "sha256:53dedbd2a6a0b02924718b520a723e88bcf22e37076191eb9b91b79934fb2192", - "sha256:69f05aaa90c99ac2f2af72d8d7f185f729721ad7c4be89e9e3d0ab101b0ee875", - "sha256:75a3a364fee153e77ed889c957f6f94ec6d234b82e7195b117180dcc9fc16f96", - "sha256:766a8e9832128c70012e0c2b263049506cbf334fb21ff7224e2704102b6ef59e", - "sha256:7fb90a5000cc9c9ff34b4d99f7f039e9c3477700e309ff234eafca7b7471afc0", - "sha256:893f32210de74b9f8ac869ed66c97d04e7d351182d6d39ebd3b36d3db8bda65d", - "sha256:8b5c28058102e2974b9868d72ae5144128485d466ba8739abd674b77971454cc", - "sha256:924b6aad5386fb54f2645f22658cb0398b1f25bc1e714a6d1522c75d527deaa5", - "sha256:9924248d6920b59c260adcae3ee231cd5af404ac706ad30aa4cd87051bf09c50", - "sha256:9ec761a35dbac4a99dcbc5cd557e6e57432ddf3e17af8c3c86b44af9da0189c0", - "sha256:a36ab51674b014ba03da7f98b675fcb8eabd709a2d8e18219f784aba2db73b72", - "sha256:aae395f79fa549fb1f6e3dc85cf277f0351e15a22e6547250056c7f0c990d6a5", - "sha256:c880a98376939165b7dc504559f60abe234b99e294523a273847f9e7756f4132", - "sha256:ce7a875694cd6ccd8682017a7c06c6483600f151d8916f2b25cf7a439e600263", - "sha256:d1b7739b68a032ad14c5e51f7e4e1a5f92f3628bba024a2bda1f30c481fc85d8", - "sha256:dcd65355acba9a1d0fc9b923875da35ed50506e339b35436277703d7ace3e222", - "sha256:e04e40a7f8c1669195536a37979dd87da2c32dbdc73d6fe35f0077b0c17c803b", - "sha256:e0c04c41e9ade19fbc0eff6aacea40b831bfcb2c91c266137bcdfd0d7b2f33ba", - "sha256:e24d4ec4b029611359566c52f31af45c5aecde7ef90bf8f31620fd44c438efe7", - "sha256:e64738207a02a83590df35f59d708bf1e7ea0d6adce712a777be2967e5f7043c", - "sha256:ea56a35fd0d13121417d39a83f291017551fa2c62d6daa6b04af6ece7ed30d84", - "sha256:f2772af1c3ef8025c85335f8b828d0193fa1e43256621f613280e2c81bfad423", - "sha256:f403a3e297a59d94121cb3ee4b1cf41f844332940a62d71f9e4a009cc3533493", - "sha256:f572a3ff7b6029dd9b904d6be4e0ce9e309dcb847b03e3ac8698d9d23bb36525" + "sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57", + "sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde" ], - "index": "pypi", - "version": "==3.14.1" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", + "version": "==0.5.0" }, - "pyparsing": { + "pygments": { "hashes": [ - "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb", - "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc" + "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692", + "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29" ], - "markers": "python_full_version >= '3.6.8'", - "version": "==3.0.9" + "markers": "python_version >= '3.7'", + "version": "==2.16.1" }, "pyperclip": { "hashes": [ @@ -350,51 +427,81 @@ "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86", "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==2.8.2" }, "pyyaml": { "hashes": [ - "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf", - "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696", - "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393", - "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77", - "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922", - "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5", - "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8", - "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10", - "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc", - "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018", - "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e", - "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253", - "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347", - "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183", - "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541", - "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb", - "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185", - "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc", - "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db", - "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa", - "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46", - "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122", - "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b", - "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63", - "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df", - "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc", - "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247", - "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", - "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" + "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5", + "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc", + "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df", + "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741", + "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206", + "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27", + "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595", + "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62", + "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98", + "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696", + "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290", + "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9", + "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d", + "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6", + "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867", + "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47", + "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486", + "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6", + "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3", + "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007", + "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938", + "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0", + "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c", + "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735", + "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d", + "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28", + "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4", + "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba", + "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8", + "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5", + "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd", + "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3", + "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0", + "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515", + "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c", + "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c", + "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924", + "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34", + "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43", + "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859", + "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673", + "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54", + "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a", + "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b", + "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab", + "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa", + "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c", + "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585", + "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d", + "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f" ], "index": "pypi", - "version": "==5.4.1" + "markers": "python_version >= '3.6'", + "version": "==6.0.1" }, "requests": { "hashes": [ - "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61", - "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d" + "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f", + "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1" ], - "index": "pypi", - "version": "==2.27.1" + "markers": "python_version >= '3.7'", + "version": "==2.31.0" + }, + "rich": { + "hashes": [ + "sha256:2b38e2fe9ca72c9a00170a1a2d20c63c790d0e10ef1fe35eba76e1e7b1d7d245", + "sha256:5c14d22737e6d5084ef4771b62d5d4363165b403455a30a1c8ca39dc7b644bef" + ], + "markers": "python_full_version >= '3.7.0'", + "version": "==13.6.0" }, "rsa": { "hashes": [ @@ -406,11 +513,11 @@ }, "s3transfer": { "hashes": [ - "sha256:06176b74f3a15f61f1b4f25a1fc29a4429040b7647133a463da8fa5bd28d5ecd", - "sha256:2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947" + "sha256:10d6923c6359175f264811ef4bf6161a3156ce8e350e705396a7557d6293c33a", + "sha256:fd3889a66f5fe17299fe75b82eae6cf722554edca744ca5d5fe308b104883d2e" ], "markers": "python_version >= '3.7'", - "version": "==0.6.0" + "version": "==0.7.0" }, "semver": { "hashes": [ @@ -422,76 +529,46 @@ }, "setuptools": { "hashes": [ - "sha256:0d33c374d41c7863419fc8f6c10bfe25b7b498aa34164d135c622e52580c6b16", - "sha256:c04b44a57a6265fe34a4a444e965884716d34bae963119a76353434d6f18e450" + "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87", + "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a" ], - "markers": "python_version >= '3.7'", - "version": "==63.2.0" + "markers": "python_version >= '3.8'", + "version": "==68.2.2" }, "setuptools-git-versioning": { "hashes": [ - "sha256:3cee8ff9e73d2092f9e281a324a0a62c21e0cc66c233597c3d679f0b9cab0e40", - "sha256:66acb4f5896956e5d2aec2250b1e41342a0bf3228e577d54171d9a06d5f8637b" + "sha256:0c7a5a3e138c85385c8296e248673652173535f33889010f9213497635300cf3", + "sha256:af9ad1e8103b5abb5b128c2db4fef99407328ac9c12f65d3ff9550c4bb39ad1c" ], "index": "pypi", - "version": "==1.9.2" + "markers": "python_version >= '3.7'", + "version": "==1.13.5" }, "six": { "hashes": [ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==1.16.0" }, - "terminaltables": { - "hashes": [ - "sha256:ba6eca5cb5ba02bba4c9f4f985af80c54ec3dccf94cfcd190154386255e47543", - "sha256:e4fdc4179c9e4aab5f674d80f09d76fa436b96fdc698a8505e0a36bf0804a874" - ], - "markers": "python_version >= '2.6'", - "version": "==3.1.10" - }, - "toml": { - "hashes": [ - "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", - "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" - ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==0.10.2" - }, "urllib3": { "hashes": [ - "sha256:8298d6d56d39be0e3bc13c1c97d133f9b45d797169a0e11cdd0e0489d786f7ec", - "sha256:879ba4d1e89654d9769ce13121e0f94310ea32e8d2f8cf587b77c08bbcdb30d6" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_version < '4'", - "version": "==1.26.10" - }, - "yamlreader": { - "hashes": [ - "sha256:765688036d57104ac26e4500ab088d42f4f2d06687ce3daa26543d7ae38c2470" - ], - "index": "pypi", - "version": "==3.0.4" - } - }, - "develop": { - "nodeenv": { - "hashes": [ - "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b", - "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7" + "sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21", + "sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b" ], - "index": "pypi", - "version": "==1.6.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", + "version": "==1.26.17" }, "wheel": { "hashes": [ - "sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a", - "sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4" + "sha256:0c5ac5ff2afb79ac23ab82bab027a0be7b5dbcf2e54dc50efe4bf507de1f7985", + "sha256:75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8" ], "index": "pypi", - "version": "==0.37.1" + "markers": "python_version >= '3.7'", + "version": "==0.41.2" } - } + }, + "develop": {} } diff --git a/pulumi/python/kubernetes/applications/sirius/__main__.py b/pulumi/python/kubernetes/applications/sirius/__main__.py index 06736fca..0167ee9f 100644 --- a/pulumi/python/kubernetes/applications/sirius/__main__.py +++ b/pulumi/python/kubernetes/applications/sirius/__main__.py @@ -148,7 +148,7 @@ def add_namespace(obj): # # Create the namespace for Bank of Sirius # -ns = k8s.core.v1.Namespace(resource_name='bos', +ns = k8s.core.v1.Namespace('bos', metadata={'name': 'bos'}, opts=pulumi.ResourceOptions(provider=k8s_provider)) diff --git a/pulumi/python/kubernetes/certmgr/__main__.py b/pulumi/python/kubernetes/certmgr/__main__.py index 25ce6e7d..2736a53a 100644 --- a/pulumi/python/kubernetes/certmgr/__main__.py +++ b/pulumi/python/kubernetes/certmgr/__main__.py @@ -30,7 +30,7 @@ def add_namespace(obj): k8s_provider = k8s.Provider(resource_name=f'ingress-controller', kubeconfig=kubeconfig) -ns = k8s.core.v1.Namespace(resource_name='cert-manager', +ns = k8s.core.v1.Namespace('cert-manager', metadata={'name': 'cert-manager'}, opts=pulumi.ResourceOptions(provider=k8s_provider)) diff --git a/pulumi/python/kubernetes/logagent/__main__.py b/pulumi/python/kubernetes/logagent/__main__.py index 4b022311..2aa540e9 100644 --- a/pulumi/python/kubernetes/logagent/__main__.py +++ b/pulumi/python/kubernetes/logagent/__main__.py @@ -54,7 +54,7 @@ def pulumi_logstore_project_name(): k8s_provider = k8s.Provider(resource_name=f'ingress-controller', kubeconfig=kubeconfig) -ns = k8s.core.v1.Namespace(resource_name='logagent', +ns = k8s.core.v1.Namespace('logagent', metadata={'name': 'logagent'}, opts=pulumi.ResourceOptions(provider=k8s_provider)) diff --git a/pulumi/python/kubernetes/logstore/__main__.py b/pulumi/python/kubernetes/logstore/__main__.py index aaf48da8..95d58112 100644 --- a/pulumi/python/kubernetes/logstore/__main__.py +++ b/pulumi/python/kubernetes/logstore/__main__.py @@ -69,7 +69,7 @@ def project_name_from_project_dir(dirname: str): k8s_provider = k8s.Provider(resource_name=f'ingress-controller', kubeconfig=kubeconfig) -ns = k8s.core.v1.Namespace(resource_name='logstore', +ns = k8s.core.v1.Namespace('logstore', metadata={'name': 'logstore'}, opts=pulumi.ResourceOptions(provider=k8s_provider)) diff --git a/pulumi/python/kubernetes/nginx/ingress-controller-namespace/__main__.py b/pulumi/python/kubernetes/nginx/ingress-controller-namespace/__main__.py index 388cb7cc..9f3de5f6 100644 --- a/pulumi/python/kubernetes/nginx/ingress-controller-namespace/__main__.py +++ b/pulumi/python/kubernetes/nginx/ingress-controller-namespace/__main__.py @@ -27,7 +27,7 @@ def infrastructure_project_name_from_project_dir(dirname: str): namespace_name = 'nginx-ingress' -ns = k8s.core.v1.Namespace(resource_name='nginx-ingress', +ns = k8s.core.v1.Namespace('nginx-ingress', metadata={'name': namespace_name, 'labels': { 'prometheus': 'scrape'} diff --git a/pulumi/python/kubernetes/nginx/ingress-controller-repo-only/__main__.py b/pulumi/python/kubernetes/nginx/ingress-controller-repo-only/__main__.py index 65c2bd98..71845a42 100644 --- a/pulumi/python/kubernetes/nginx/ingress-controller-repo-only/__main__.py +++ b/pulumi/python/kubernetes/nginx/ingress-controller-repo-only/__main__.py @@ -31,7 +31,7 @@ nginx_repository = "nginx/nginx-ingress" nginx_tag = config.get('nginx_tag') if not nginx_tag: - nginx_tag = "2.4.2" + nginx_tag = "3.2.0" nginx_plus_flag = config.get_bool('nginx_plus_flag') if not nginx_plus_flag: nginx_plus_flag = False @@ -59,13 +59,6 @@ def k8_manifest_location(): k8_manifest_path = os.path.join(script_dir, 'manifests', 'regcred.yaml') return k8_manifest_path - -k8_manifest = k8_manifest_location() - -registrycred = ConfigFile( - "regcred", - file=k8_manifest) - chart_values = { 'controller': { 'nginxplus': nginx_plus_flag, @@ -91,6 +84,7 @@ def k8_manifest_location(): } }, 'service': { + 'name': "kic-nginx-ingress", 'annotations': { 'co.elastic.logs/module': 'nginx' }, @@ -137,13 +131,19 @@ def k8_manifest_location(): kubeconfig=kubeconfig) # This is required for the service monitor from the Prometheus namespace -ns = k8s.core.v1.Namespace(resource_name='nginx-ingress', +ns = k8s.core.v1.Namespace('nginx-ingress', metadata={'name': 'nginx-ingress', 'labels': { 'prometheus': 'scrape'} }, opts=pulumi.ResourceOptions(provider=k8s_provider)) +k8_manifest = k8_manifest_location() + +registrycred = ConfigFile( + "regcred", + file=k8_manifest) + kic_release_args = ReleaseArgs( chart=chart_name, repository_opts=RepositoryOptsArgs( @@ -182,8 +182,11 @@ def k8_manifest_location(): # Some LB's give us a hostname (which is cool) and some just an IP. We need to capture # both, and then make a determination on what the user needs to do based on what they have # been given. -# +print("befoe export lb_ingress_hostname") pulumi.export('lb_ingress_hostname', fqdn) +print("befoe export lb_ingress_ip") pulumi.export('lb_ingress_ip', pulumi.Output.unsecret(ingress_service.load_balancer.ingress[0].ip)) # Print out our status +print("befoe export kic status") pulumi.export("kic_status", pstatus) +print("All done") diff --git a/pulumi/python/kubernetes/observability/__main__.py b/pulumi/python/kubernetes/observability/__main__.py index 7835c81f..375acb02 100644 --- a/pulumi/python/kubernetes/observability/__main__.py +++ b/pulumi/python/kubernetes/observability/__main__.py @@ -50,7 +50,7 @@ def add_namespace(obj): k8s_provider = k8s.Provider(resource_name=f'ingress-controller', kubeconfig=kubeconfig) # Create the namespace -ns = k8s.core.v1.Namespace(resource_name='observability', +ns = k8s.core.v1.Namespace('observability', metadata={'name': 'observability'}, opts=pulumi.ResourceOptions(provider=k8s_provider)) diff --git a/pulumi/python/kubernetes/prometheus/__main__.py b/pulumi/python/kubernetes/prometheus/__main__.py index f89f9966..3982c22c 100644 --- a/pulumi/python/kubernetes/prometheus/__main__.py +++ b/pulumi/python/kubernetes/prometheus/__main__.py @@ -56,7 +56,7 @@ def extract_adminpass_from_k8s_secrets(secrets: Mapping[str, str]) -> str: k8s_provider = k8s.Provider(resource_name=f'ingress-controller', kubeconfig=kubeconfig) -ns = k8s.core.v1.Namespace(resource_name='prometheus', +ns = k8s.core.v1.Namespace('prometheus', metadata={'name': 'prometheus'}, opts=pulumi.ResourceOptions(provider=k8s_provider)) diff --git a/pulumi/python/requirements.txt b/pulumi/python/requirements.txt deleted file mode 100644 index 0ad7699f..00000000 --- a/pulumi/python/requirements.txt +++ /dev/null @@ -1,21 +0,0 @@ -awscli~=1.25.35 -grpcio==1.43.0 -fart~=0.1.5 -lolcat~=1.4 -nodeenv~=1.6.0 -passlib~=1.7.4 -pulumi-aws>=4.39.0 -pulumi-docker==3.1.0 -pulumi-eks>=0.41.2 -pulumi-kubernetes==3.20.1 -pycryptodome~=3.14.0 -PyYAML~=5.4.1 -requests~=2.27.1 -setuptools==62.1.0 -setuptools-git-versioning==1.9.2 -wheel==0.37.1 -yamlreader==3.0.4 -pulumi-digitalocean==4.12.0 -pulumi-linode==3.7.1 -linode-cli~=5.17.2 -pulumi~=3.36.0 \ No newline at end of file diff --git a/pulumi/python/tools/metallb/__main__.py b/pulumi/python/tools/metallb/__main__.py index 206a0868..d72742b5 100644 --- a/pulumi/python/tools/metallb/__main__.py +++ b/pulumi/python/tools/metallb/__main__.py @@ -43,7 +43,7 @@ def k8_manifest_location(): k8s_provider = k8s.Provider(resource_name=f'ingress-controller', kubeconfig=kubeconfig) # Create the namespace for metallb -ns = k8s.core.v1.Namespace(resource_name='metallb-system', +ns = k8s.core.v1.Namespace('metallb-system', metadata={'name': 'metallb-system'}, opts=pulumi.ResourceOptions(provider=k8s_provider)) diff --git a/pulumi/python/tools/nfsvolumes/__main__.py b/pulumi/python/tools/nfsvolumes/__main__.py index b3eb763e..01881f47 100644 --- a/pulumi/python/tools/nfsvolumes/__main__.py +++ b/pulumi/python/tools/nfsvolumes/__main__.py @@ -32,7 +32,7 @@ def pulumi_kube_project_name(): k8s_provider = k8s.Provider(resource_name=f'ingress-controller', kubeconfig=kubeconfig) -ns = k8s.core.v1.Namespace(resource_name='nfsvols', +ns = k8s.core.v1.Namespace('nfsvols', metadata={'name': 'nfsvols'}, opts=pulumi.ResourceOptions(provider=k8s_provider)) diff --git a/pulumi/python/utility/kic-image-push/registries/base_registry.py b/pulumi/python/utility/kic-image-push/registries/base_registry.py index 7171cd5a..c1c50461 100644 --- a/pulumi/python/utility/kic-image-push/registries/base_registry.py +++ b/pulumi/python/utility/kic-image-push/registries/base_registry.py @@ -44,12 +44,12 @@ def format_registry_url_for_docker_login(self): # We strip out the path from the URL because it isn't used when logging into a repository return f'{registry_host_url.scheme}://{registry_host_url.hostname}' - def login_to_registry(self) -> Optional[docker.LoginResult]: + async def login_to_registry(self) -> Optional[docker.LoginResult]: registry = docker.Registry(registry=self.format_registry_url_for_docker_login(), username=self.credentials.username, password=self.credentials.password) - docker.login_to_registry(registry=registry, log_resource=None) + await docker.login_to_registry(registry=registry, log_resource=None) pulumi.log.info(f'Logged into container registry: {registry.registry}') if not docker.login_results: diff --git a/pulumi/python/utility/kic-pulumi-utils/setup.py b/pulumi/python/utility/kic-pulumi-utils/setup.py index f324e816..9c0ef998 100644 --- a/pulumi/python/utility/kic-pulumi-utils/setup.py +++ b/pulumi/python/utility/kic-pulumi-utils/setup.py @@ -7,5 +7,5 @@ version_config=True, packages=['kic_util'], install_requires=[ - 'pyyaml>=5.3.1,<6.0', 'passlib>=1.7.4,<2.0.0', 'GitPython>=3.1.18,<3.2.0' + 'pyyaml', 'passlib', 'GitPython' ])