diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bbadd558..a3a3f2cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -137,11 +137,6 @@ jobs: runs-on: ubuntu-latest needs: [mr_matchmaker, mr_persistence, mr_server, mr_web_client] steps: - - uses: azure/setup-kubectl@v2.0 - with: - version: 'v1.23.6' - id: install - - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 5a9a0a0c..f91348a4 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,22 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "3.63.0" - constraints = ">= 2.23.0, ~> 3.0, >= 3.40.0, >= 3.56.0, >= 3.63.0, ~> 3.63" + version = "3.76.0" + constraints = ">= 2.23.0, ~> 3.0, >= 3.40.0, >= 3.56.0, ~> 3.63, >= 3.73.0" hashes = [ - "h1:Z+2GvXLgqQ/uPMH8dv+dXJ/t+jd6sriYjhCJS6kSO6g=", - "h1:lf8Qex8bhCmh8TUEAU6H4brzjy3+d4BXB6gcOYnNtNY=", - "zh:42c6c98b294953a4e1434a331251e539f5372bf6779bd61ab5df84cac0545287", - "zh:5493773762a470889c9a23db97582d3a82035847c8d3bd13323b4c3012abf325", - "zh:550d22ff9fed4d817a922e7b84bd9d1f2ef8d3afa00832cf66b8cd5f0e6dc748", - "zh:632cb5e2d9d5041875f57174236eafe5b05dbf26750c1041ab57eb08c5369fe2", - "zh:7cfeaf5bde1b28bd010415af1f3dc494680a8374f1a26ec19db494d99938cc4e", - "zh:99d871606b67c8aefce49007315de15736b949c09a9f8f29ad8af1e9ce383ed3", - "zh:c4fc8539ffe90df5c7ae587fde495fac6bc0186fec2f2713a8988a619cef265f", - "zh:d0a26493206575c99ca221d78fe64f96a8fbcebe933af92eea6b39168c1f1c1d", - "zh:e156fdc964fdd4a7586ec15629e20d2b06295b46b4962428006e088145db07d6", - "zh:eb04fc80f652b5c92f76822f0fec1697581543806244068506aed69e1bb9b2af", - "zh:f5638a533cf9444f7d02b5527446cdbc3b2eab8bcc4ec4b0ca32035fe6f479d3", + "h1:mCSKUr8mQJgHcNRtDtbxM5LzAZVWMgjn3ZcgenLlgGc=", + "zh:144ac5d606a9236564a9e2cfe4fde5f25c56c42d97108b5ef9f4ba68c367c17a", + "zh:1e8f594d094bd83e759aeed1f6b9d83d67bace36bcd0d5ddc48316e9c219d9f8", + "zh:1eb473010b250c083a7370e0ae43f9961f3c83678a4f5782981387d04f5f7491", + "zh:258ff4c1d204876dea485fac0856721cccf15b94361e7d56ea433fc6fbfc7dc6", + "zh:3cf323d1ebc797486c8b995b0e8d1093ec75e832308fe9dd52dccb8507af2b00", + "zh:5108ba908617ed6e89ac15defafbf9bc57b3ff098d0efdd10294bae1a5532daf", + "zh:54bd6fe57680b845bbf3f4f0cc9a20057973defcd7786390f1967bdbf7b58e1f", + "zh:5f1d06843997229616dc56cecae450e4165ecadb2b2f8206eb074babc09e8dbc", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a6a222eb9ac72ad4efd0f039cac3ffda35d0152e47e573da1aa6da272edb9413", + "zh:ad96cddae3ab78fa85095b7d82e09ed6b25ef099c58d18c1c14c75d5f5f1219c", + "zh:bf18dd6bd6a8eba83f9d55adeeeb14abeb2b63b4a05ac26fc15d1820d34ff9d2", + "zh:cace02539792163c90362998fae484f3b32869d0d148484c809d7c9e8086ac50", + "zh:d527fe5b1fa912a06134fa6be35a044d05ae69973b5ce5c1804466a167b4d3bc", + "zh:fad111579454ec38c3d51ad2422bf43b108f51f17d4db64e81f178b5fbfb2675", ] } @@ -42,22 +45,22 @@ provider "registry.terraform.io/hashicorp/cloudinit" { } provider "registry.terraform.io/hashicorp/helm" { - version = "2.3.0" + version = "2.8.0" constraints = "~> 2.3" hashes = [ - "h1:7Bs688A79t9vct+XeyO4siL7UrHhZ33PFosGrv7spPQ=", - "h1:mLNIobQGKfv/9kCqe7+41y2K8bC/Kjet4Fzc+ImcZeM=", - "zh:0c63c0aa9f13ec057971c9ddd0965e062b064c0b2ce9a3d13df41239b8f5af89", - "zh:14b4146e56b1c1e5492ce597d03fb993a71039dd701e3886667f7ad3d60afd34", - "zh:3882a3a091aeac1d42a01c7654c727a46870185d363454579e707c672a42f430", - "zh:3ccb84b23348e2b64ffe273170f686e6927e974060e37b52459ab2395bd59523", - "zh:4fb709aeb63dd6dee1e851459ac87c399ddb831ebfe9e28e4c9827c65bb55b67", - "zh:6739a4da9510f552b93fa77859f04c20af3a7a40a7f0b0073eb723af36b8156b", - "zh:7432b070124a161fe6a32dc6b76fd45100d079fdee917318460a82b80cda5518", - "zh:9aa51dc2a649fcaac133dad5c1e148c2e0f675fdf18b1d3b1da53549d8fa3b36", - "zh:a9a2abf1fbec56019473c8696d285703218ea0e8f2dc01879e7a391ea8785d57", - "zh:b3c25b085b7a7fbc05000303d82c54531987525575ff337e4be6fc152f4200d4", - "zh:fa8cb34df7786bbeffcee664eab72aeb15c4f8fba2d9c0b05faca6b3e819cf33", + "h1:a98mBNghv9odh5PVmgdXapgyYJmO/ncAWkwLWdXLuY4=", + "zh:1e42d1a04c07d4006844e477ca32b5f45b04f6525dbbbe00b6be6e6ec5a11c54", + "zh:2f87187cb48ccfb18d12e2c4332e7e822923b659e7339b954b7db78aff91529f", + "zh:391fe49b4d2dc07bc717248a3fc6952189cfc49c596c514ad72a29c9a9f9d575", + "zh:89272048e1e63f3edc3e83dfddd5a9fd4bd2a4ead104e67de1e14319294dedf1", + "zh:a5a057c3435a854389ce8a1d98a54aaa7cbab68aca7baa436a605897aa70ff7e", + "zh:b1098e53e1a8a3afcd325ecd0328662156b3d9c3d80948f19ba3a4eb870cee2b", + "zh:b676f949e8274a2b6c3fa41f5428ea597125579c7b93bb50bb73a5e295a7a447", + "zh:cdf7e9460f28c2dbfe49a79a5022bd0d474ff18120d340738aa35456ba77ebca", + "zh:e24b59b4ed1c593facbf8051ec58550917991e2e017f3085dac5fb902d9908cb", + "zh:e3b5e1f5543cac9d9031a028f1c1be4858fb80fae69f181f21e9465e366ebfa2", + "zh:e9fddc0bcdb28503078456f0088851d45451600d229975fd9990ee92c7489a10", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } @@ -82,22 +85,22 @@ provider "registry.terraform.io/hashicorp/kubernetes" { } provider "registry.terraform.io/hashicorp/local" { - version = "2.1.0" + version = "2.2.3" constraints = ">= 1.4.0" hashes = [ - "h1:KfieWtVyGWwplSoLIB5usKAUnrIkDQBkWaR5TI+4WYg=", - "h1:PaQTpxHMbZB9XV+c1od1eaUvndQle3ZZHx79hrI6C3k=", - "zh:0f1ec65101fa35050978d483d6e8916664b7556800348456ff3d09454ac1eae2", - "zh:36e42ac19f5d68467aacf07e6adcf83c7486f2e5b5f4339e9671f68525fc87ab", - "zh:6db9db2a1819e77b1642ec3b5e95042b202aee8151a0256d289f2e141bf3ceb3", - "zh:719dfd97bb9ddce99f7d741260b8ece2682b363735c764cac83303f02386075a", - "zh:7598bb86e0378fd97eaa04638c1a4c75f960f62f69d3662e6d80ffa5a89847fe", - "zh:ad0a188b52517fec9eca393f1e2c9daea362b33ae2eb38a857b6b09949a727c1", - "zh:c46846c8df66a13fee6eff7dc5d528a7f868ae0dcf92d79deaac73cc297ed20c", - "zh:dc1a20a2eec12095d04bf6da5321f535351a594a636912361db20eb2a707ccc4", - "zh:e57ab4771a9d999401f6badd8b018558357d3cbdf3d33cc0c4f83e818ca8e94b", - "zh:ebdcde208072b4b0f8d305ebf2bfdc62c926e0717599dcf8ec2fd8c5845031c3", - "zh:ef34c52b68933bedd0868a13ccfd59ff1c820f299760b3c02e008dc95e2ece91", + "h1:FvRIEgCmAezgZUqb2F+PZ9WnSSnR5zbEM2ZI+GLmbMk=", + "zh:04f0978bb3e052707b8e82e46780c371ac1c66b689b4a23bbc2f58865ab7d5c0", + "zh:6484f1b3e9e3771eb7cc8e8bab8b35f939a55d550b3f4fb2ab141a24269ee6aa", + "zh:78a56d59a013cb0f7eb1c92815d6eb5cf07f8b5f0ae20b96d049e73db915b238", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:8aa9950f4c4db37239bcb62e19910c49e47043f6c8587e5b0396619923657797", + "zh:996beea85f9084a725ff0e6473a4594deb5266727c5f56e9c1c7c62ded6addbb", + "zh:9a7ef7a21f48fabfd145b2e2a4240ca57517ad155017e86a30860d7c0c109de3", + "zh:a63e70ac052aa25120113bcddd50c1f3cfe61f681a93a50cea5595a4b2cc3e1c", + "zh:a6e8d46f94108e049ad85dbed60354236dc0b9b5ec8eabe01c4580280a43d3b8", + "zh:bb112ce7efbfcfa0e65ed97fa245ef348e0fd5bfa5a7e4ab2091a9bd469f0a9e", + "zh:d7bec0da5c094c6955efed100f3fe22fca8866859f87c025be1760feb174d6d9", + "zh:fb9f271b72094d07cef8154cd3d50e9aa818a0ea39130bc193132ad7b23076fd", ] } diff --git a/Cargo.lock b/Cargo.lock index 3775d891..111a32ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -382,15 +382,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" version = "1.0.68" @@ -645,9 +636,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.5.17" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" +checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48" dependencies = [ "async-trait", "axum-core", @@ -663,20 +654,20 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", + "rustversion", "serde", "sync_wrapper", - "tokio", "tower", - "tower-http 0.3.5", + "tower-http", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.2.9" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" +checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" dependencies = [ "async-trait", "bytes", @@ -684,6 +675,7 @@ dependencies = [ "http", "http-body 0.4.5", "mime", + "rustversion", "tower-layer", "tower-service", ] @@ -2226,6 +2218,16 @@ dependencies = [ "darling_macro 0.13.4", ] +[[package]] +name = "darling" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +dependencies = [ + "darling_core 0.14.2", + "darling_macro 0.14.2", +] + [[package]] name = "darling_core" version = "0.12.4" @@ -2254,6 +2256,20 @@ dependencies = [ "syn", ] +[[package]] +name = "darling_core" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + [[package]] name = "darling_macro" version = "0.12.4" @@ -2276,6 +2292,17 @@ dependencies = [ "syn", ] +[[package]] +name = "darling_macro" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +dependencies = [ + "darling_core 0.14.2", + "quote", + "syn", +] + [[package]] name = "data-encoding" version = "2.3.3" @@ -3721,9 +3748,9 @@ dependencies = [ [[package]] name = "k8s-openapi" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0489fc937cc7616a9abfa61bf39c250d7e32e1325ef028c8d9278dd24ea395b3" +checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ "base64 0.13.1", "bytes", @@ -3788,9 +3815,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.71.0" +version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342744dfeb81fe186b84f485b33f12c6a15d3396987d933b06a566a3db52ca38" +checksum = "9ba77b857a9581e3d1cb1165f9cb1d1732d65ce52642498addae8fa2c6d5e037" dependencies = [ "k8s-openapi", "kube-client", @@ -3800,9 +3827,9 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.71.0" +version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f69a504997799340408635d6e351afb8aab2c34ca3165e162f41b3b34a69a79" +checksum = "e80db3ca107e89da5f7eae37ea5274e06cefdcf9689d0ebd5ec3575a6f983e4e" dependencies = [ "base64 0.13.1", "bytes", @@ -3829,15 +3856,15 @@ dependencies = [ "tokio", "tokio-util", "tower", - "tower-http 0.2.5", + "tower-http", "tracing", ] [[package]] name = "kube-core" -version = "0.71.0" +version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a247487699941baaf93438d65b12d4e32450bea849d619d19ed394e8a4a645" +checksum = "fce686d2fbdaf6cb18d19cdb0692e9485dd9945f79f944b8772bdb2a07e8d39d" dependencies = [ "chrono", "form_urlencoded", @@ -3852,11 +3879,11 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.71.0" +version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "203f7c5acf9d0dfb0b08d44ec1d66ace3d1dfe0cdd82e65e274f3f96615d666c" +checksum = "93ef49d30d03c5de8041e2ab5dc421d671d6225ffd53975571d4a5b18d5e50fb" dependencies = [ - "darling 0.13.4", + "darling 0.14.2", "proc-macro2", "quote", "serde_json", @@ -4048,9 +4075,9 @@ dependencies = [ [[package]] name = "matchit" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "matrixmultiply" @@ -4691,6 +4718,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num" version = "0.4.0" @@ -5020,6 +5057,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "owned_ttf_parser" version = "0.17.1" @@ -5335,9 +5378,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.10.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +checksum = "c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592" dependencies = [ "bytes", "prost-derive", @@ -5345,9 +5388,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.10.1" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +checksum = "c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720" dependencies = [ "anyhow", "itertools", @@ -5808,9 +5851,9 @@ dependencies = [ [[package]] name = "rymder" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7364b4510e90a7fff6c76a04395d84439769fcc0ff6116b462f98cfbd16e0a" +checksum = "016ce81296a8921c0b540a89a24e228095e1531ab97e42651498d6413e70619e" dependencies = [ "async-stream", "futures-util", @@ -6999,9 +7042,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.7.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be9d60db39854b30b835107500cf0aca0b0d14d6e1c3de124217c23a29c2ddb" +checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", @@ -7049,32 +7092,13 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" -dependencies = [ - "base64 0.13.1", - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body 0.4.5", - "http-range-header", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower-http" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ + "base64 0.13.1", "bitflags", "bytes", "futures-core", @@ -7086,6 +7110,7 @@ dependencies = [ "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -7102,8 +7127,8 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.34" -source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#a8a1a2f811079e349ce64c2cba187401de1c52eb" +version = "0.1.37" +source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#f7614bd002b03e4e72f78c20eef42d00bf49a6a3" dependencies = [ "cfg-if", "log", @@ -7114,8 +7139,8 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.21" -source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#a8a1a2f811079e349ce64c2cba187401de1c52eb" +version = "0.1.23" +source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#f7614bd002b03e4e72f78c20eef42d00bf49a6a3" dependencies = [ "proc-macro2", "quote", @@ -7124,10 +7149,10 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.26" -source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#a8a1a2f811079e349ce64c2cba187401de1c52eb" +version = "0.1.30" +source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#f7614bd002b03e4e72f78c20eef42d00bf49a6a3" dependencies = [ - "lazy_static", + "once_cell", "valuable", ] @@ -7154,21 +7179,21 @@ dependencies = [ [[package]] name = "tracing-log" version = "0.1.3" -source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#a8a1a2f811079e349ce64c2cba187401de1c52eb" +source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#f7614bd002b03e4e72f78c20eef42d00bf49a6a3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.11" -source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#a8a1a2f811079e349ce64c2cba187401de1c52eb" +version = "0.3.16" +source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#f7614bd002b03e4e72f78c20eef42d00bf49a6a3" dependencies = [ - "ansi_term", - "lazy_static", "matchers", + "nu-ansi-term", + "once_cell", "regex", "sharded-slab", "smallvec", diff --git a/README.md b/README.md index dfe3f22c..c9201287 100644 --- a/README.md +++ b/README.md @@ -169,10 +169,10 @@ docker build -t mvlabat/mr_server -f mr_server.dockerfile . --platform linux/amd ### Prerequisites -- [aws-cli](https://aws.amazon.com/cli/) (tested with 2.3.2) +- [aws-cli](https://aws.amazon.com/cli/) (tested with 2.9.12) - Make sure to [configure AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html): `aws configure` -- [kubectl](https://kubernetes.io/docs/tasks/tools/) (v1.21.0) -- [helm](https://helm.sh/docs/intro/install/) (tested with v3.7.1) +- [kubectl](https://kubernetes.io/docs/tasks/tools/) (v1.23.0) +- [helm](https://helm.sh/docs/intro/install/) (tested with v3.10.3) ### Applying diff --git a/bins/matchmaker/Cargo.toml b/bins/matchmaker/Cargo.toml index 5b4c01ed..4b7c8948 100644 --- a/bins/matchmaker/Cargo.toml +++ b/bins/matchmaker/Cargo.toml @@ -14,9 +14,9 @@ anyhow = "1.0" env_logger = "0.9" futures = "0.3" hyper = { version = "0.14.19", features = ["server"] } -kube = { version = "0.71.0", features = ["derive"] } +kube = { version = "0.77.0", features = ["derive"] } log = "0.4" -k8s-openapi = { version = "0.14.0", default-features = false, features = ["v1_20"] } +k8s-openapi = { version = "0.16.0", default-features = false, features = ["v1_23"] } reqwest = "0.11" sentry = "0.29" serde = "1.0" diff --git a/bins/server/Cargo.toml b/bins/server/Cargo.toml index 6ab57ca6..3c75676b 100644 --- a/bins/server/Cargo.toml +++ b/bins/server/Cargo.toml @@ -14,7 +14,7 @@ mr_server_lib = { path = "../../libs/server_lib" } mr_utils_lib = { path = "../../libs/utils_lib", features = ["bevy_logging"] } bevy = { version = "0.9.1", default-features = false } -rymder = { version = "0.5.0", features = ["player-tracking"] } +rymder = { version = "0.6.0", features = ["player-tracking"] } sentry = "0.26.0" tokio = { version = "1.21", features = ["sync"] } diff --git a/k8s/eks_cluster/module.tf b/k8s/eks_cluster/module.tf index 456d9d45..6393029f 100644 --- a/k8s/eks_cluster/module.tf +++ b/k8s/eks_cluster/module.tf @@ -123,7 +123,7 @@ module "eks" { cluster_name = var.cluster_name subnets = module.vpc.public_subnets vpc_id = module.vpc.vpc_id - cluster_version = "1.21" + cluster_version = "1.23" write_kubeconfig = false enable_irsa = true diff --git a/libs/server_lib/Cargo.toml b/libs/server_lib/Cargo.toml index ee3db099..7a41920b 100644 --- a/libs/server_lib/Cargo.toml +++ b/libs/server_lib/Cargo.toml @@ -16,14 +16,14 @@ bevy = { version = "0.9.1", default-features = false } bevy_disturbulence = { git = "https://github.com/mvlabat/bevy_disturbulence.git", branch = "wip", features = ["server"] } bevy_rapier2d = "0.19" jwt-compact = { version = "0.6", features = ["std", "clock", "with_rsa"], default-features = false } -kube = "0.71.0" +kube = "0.77.0" local-ip-address = "0.5" -k8s-openapi = { version = "0.14.0", default-features = false, features = ["v1_20"] } +k8s-openapi = { version = "0.16.0", default-features = false, features = ["v1_23"] } puffin = { version = "0.13", optional = true } rand = "0.8.4" rapier2d = "0.16" reqwest = "0.11" -rymder = "0.5.0" +rymder = "0.6.0" serde = "1.0" serde_json = "1.0" tokio = "1.21" diff --git a/libs/utils_lib/Cargo.toml b/libs/utils_lib/Cargo.toml index 744e7152..c9c22aac 100644 --- a/libs/utils_lib/Cargo.toml +++ b/libs/utils_lib/Cargo.toml @@ -15,8 +15,8 @@ bevy = { version = "0.9.1", optional = true, default-features = false } dotenv = "0.15.0" headers = { version = "0.3.5", optional = true } jwt-compact = { version = "0.6", optional = true, features = ["std", "clock", "with_rsa"], default-features = false } -kube = { version = "0.71.0", optional = true } -k8s-openapi = { version = "0.14.0", default-features = false, features = ["v1_20"], optional = true } +kube = { version = "0.77.0", optional = true } +k8s-openapi = { version = "0.16.0", default-features = false, features = ["v1_23"], optional = true } log = "0.4.17" reqwest = { version = "0.11.11", optional = true } serde = "1.0" diff --git a/module.tf b/module.tf index efd2cf42..d7a4e953 100644 --- a/module.tf +++ b/module.tf @@ -17,7 +17,7 @@ terraform { } variable "agones_version" { - default = "1.18.0" + default = "1.28.0" } variable "cluster_name" {