diff --git a/deploy/complete/helm-chart/setup/requirements.yaml b/deploy/complete/helm-chart/setup/requirements.yaml index 8a814eae..baa70be2 100644 --- a/deploy/complete/helm-chart/setup/requirements.yaml +++ b/deploy/complete/helm-chart/setup/requirements.yaml @@ -5,27 +5,27 @@ dependencies: # Prometheus - name: prometheus - version: 20.0.1 + version: 25.18.0 condition: prometheus.enabled repository: https://prometheus-community.github.io/helm-charts # Grafana - name: grafana - version: 6.52.4 + version: 7.3.7 condition: grafana.enabled repository: https://grafana.github.io/helm-charts # HPA Metrics - name: metrics-server - version: 3.8.4 + version: 3.12.0 condition: metrics-server.enabled repository: https://kubernetes-sigs.github.io/metrics-server # Ingress Controller - name: ingress-nginx - version: 4.5.2 + version: 4.10.0 condition: ingress-nginx.enabled repository: https://kubernetes.github.io/ingress-nginx # cert-manager - name: cert-manager - version: 1.11.0 + version: 1.14.4 condition: cert-manager.enabled repository: https://charts.jetstack.io # jenkins diff --git a/deploy/complete/terraform/.terraform.lock.hcl b/deploy/complete/terraform/.terraform.lock.hcl index dc646a2c..286467b5 100644 --- a/deploy/complete/terraform/.terraform.lock.hcl +++ b/deploy/complete/terraform/.terraform.lock.hcl @@ -2,143 +2,148 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/helm" { - version = "2.1.0" - constraints = "2.1.0" + version = "2.12.1" + constraints = ">= 2.12.0" hashes = [ - "h1:+2eoyrCiL/1j4J6064i+aeac0RrBzy8d6uB5MZ25zSk=", - "h1:/Hdj7kToHecF0frqu7Xco0Dp/fhqjcidyI/tthY2tJc=", - "h1:Bay+WVSBY2bMiFzARPCKznhfPco2S/WwgyChqwWodTc=", - "h1:O/1uro4uBqhAHkTA0n0PqWwHO5OIXpqtQRoAMiXdewY=", - "h1:mrkVquJ5aHCv6spC+AeolSL74BfFnyGPc8llQ590h98=", - "zh:060e0b2b921ed4d4f3b2547236b083a718318634fc19dbdac1a6a2fd77195c6e", - "zh:18b7d5a3c667dadcf5dec2e6f13eb75be144de22e9dbd49a1899086800c80e83", - "zh:1c5bebb517c2cab718739b20789a6b8b4a19aff4aa36bb1c19f99d56bcb7ad5f", - "zh:31413c8710cb8529c31afd553320e7b224d833dcd0dc5ff61b69d9ed95b0470a", - "zh:41beea908ea3c4353b2cc60659dd6b9b8e9245871183788daef3c598784a88c5", - "zh:5a9210810f2cfed2629b2fc9c6a70c34e642cb86f7b88bb6c2086ea7aef893d9", - "zh:7b7a32983b6d8ef28389e83c9f81f0e99fc736031855c2de90a2f6a288f9252f", - "zh:84cb9e087dfde307f7d1f941b3ffb50c84881444217157dcdc49020cd75ba41e", - "zh:ad8106a052fb73977cf658a043ea881c0d9c523953c920a0a6444aea1d3cb13e", - "zh:b2608c1b6addbb990b571e9a5ed4b99cc04a6ea65ee18cbbae9cbf42025ca092", - "zh:da1aa093d3405607d1ec50b5004839070eeda2acc9f3bd9d351f07f51b7c5965", + "h1:7wfYOAeSEchHB8idNl+2jf+OkFi9zFSOLWkEZFuTCik=", + "h1:aBfcqM4cbywa7TAxfT1YoFS+Cst9waerlm4XErFmJlk=", + "h1:sgYI7lwGqJqPopY3NGmhb1eQ0YbH8PIXaAZAmnJrAvw=", + "h1:sjzfyNQAjtF9zXHxB67geryjGkHaPDMMVw9iqPP5pkE=", + "h1:xwHVa6ab/XVfDrZ3h35OzLJ6g0Zte4VAvSnyKw3f9AI=", + "zh:1d623fb1662703f2feb7860e3c795d849c77640eecbc5a776784d08807b15004", + "zh:253a5bc62ba2c4314875139e3fbd2feaad5ef6b0fb420302a474ab49e8e51a38", + "zh:282358f4ad4f20d0ccaab670b8645228bfad1c03ac0d0df5889f0aea8aeac01a", + "zh:4fd06af3091a382b3f0d8f0a60880f59640d2b6d9d6a31f9a873c6f1bde1ec50", + "zh:6816976b1830f5629ae279569175e88b497abbbac30ee809948a1f923c67a80d", + "zh:7d82c4150cdbf48cfeec867be94c7b9bd7682474d4df0ebb7e24e148f964844f", + "zh:83f062049eea2513118a4c6054fb06c8600bac96196f25aed2cc21898ec86e93", + "zh:a79eec0cf4c08fca79e44033ec6e470f25ff23c3e2c7f9bc707ed7771c1072c0", + "zh:b2b2d904b2821a6e579910320605bc478bbef063579a23fbfdd6fcb5871b81f8", + "zh:e91177ca06a15487fc570cb81ecef6359aa399459ea2aa7c4f7367ba86f6fcad", + "zh:e976bcb82996fc4968f8382bbcb6673efb1f586bf92074058a232028d97825b1", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.2.0" - constraints = "2.2.0" + version = "2.27.0" + constraints = ">= 2.27.0" hashes = [ - "h1:+5kneLe8twuafpJxCO8Hw4UA9dkHaY8Jg5U4+RRWxq8=", - "h1:BtekG/QVmKGGa7mCUnYBjyOvB0QqGYNPCMRDi2k62wc=", - "h1:MP2ApCv4RbHWreeKQ+0xZZHALJ94AZIkfjiPsLRN41I=", - "h1:Sb7AlwtZ6VYoS/A+Ls64UFJiyTBNReZZFHI9kKAN6gM=", - "h1:iGRiQAggGI+k1uhlLhqbYQtAg3GYYO+0UP1aRjYvdaI=", - "zh:41be89f07c279425a146a31c2cca646efab65f4d5f0b8bbd6059761ff0446231", - "zh:4cbbb28396dc766bfca7ee2dbc19fa57331754eca7fee0fe57a87a73f5010f20", - "zh:5df93be3e696d60139a485a2937176739f05ac1884850bc58839c3ed99cff995", - "zh:64f01bcfc2ad1a42fbd307b9ceb7f70b3c19b35cdd0b950005190ec2de41083a", - "zh:7fc88030e20dd9560fd0e64c094d07d6f0c8d1db7838f77dc278f3cae93e7207", - "zh:81f7a855f1de2859c83565bc278869f6c7565b56d966fe9a4ef59fb55e5366d8", - "zh:d74811f3d3112ab52d151e1e1fa7fc9087d0ea5cc9ef72484c612780890ee586", - "zh:e93c93c43445855b4a75ec754b8c1579c55f95c23c1a33c188a57aa38357e513", - "zh:f67b32a26cbb763134f6294a2b95798d63aacc63532457c10dc779819f6d8ad0", - "zh:fb435298e7b0d8a021bdbfa496dd5c76c9eb0dada4b406b3439949bd4aef756a", - "zh:ffafbdea9766b89525c67886f6f0ee9992ae48a229c689716952d71a06b05107", + "h1:/3kLyOR2jTaWS1MKso4xAztrocGBMxi8yVadWiqSWOg=", + "h1:GzU0FzYAT/+IgAhnSBcFH3bT+4I5N6oSga6iZgNJAus=", + "h1:TrlG/sofnDv8kAbzKOD5pIPeUiI5VQY61NuWH+cItDw=", + "h1:WuU4rl7szPJr9Nfu5OoQGF84k8yQf+gmS9zU2eZuxcc=", + "h1:w9ENsSqT/3Oj/yt4GcudG202ehSD2Ls5gwqOLoKrBUQ=", + "zh:3bdba30ae67c55dc7e9a317ac0da3b208ea7926fe9c2f0ae6587ee88dcc58d1f", + "zh:3f35138a831c00b188d2ffee27111dd0cf59afad2dd5653ed9e67d59646de12c", + "zh:64066d18f6ae9a316c2bc840ef3e641d7ab94e1ea3a41d12523e77345ad442ef", + "zh:653063d44b44881af3a480f7f8eaa94fa300e0229df2072d30f606bddcc9f025", + "zh:87f306e37efb61d13efa6da53a1e45e97e5996ebc0568b1caf8c3c5e54c05809", + "zh:8c428b9708f9634391e52300218771eab3fe942bb1295d8c0ad50ca4b33db3d9", + "zh:a44e87119a0337ded15479851786a13f412b413d9a463ba550d1210249206b0f", + "zh:aa2c4d110b0de6ef997c0d45f3f23f8a98f5530753095d6eff439a6d91a8ea31", + "zh:eb15ed8781ac6a0dec2f7d03cf090e23cfa05e3225806c6231ff2c574662fd63", + "zh:eb81c563f93bd3303f9620d11cd49f21f3f89ac3475c6d3e821b239feb9c217d", + "zh:f1a344a7f16131123577e4ec994d04a34ea458ec16c1ccac53fe7946bd817b18", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/hashicorp/local" { - version = "2.1.0" - constraints = "2.1.0" + version = "2.5.1" + constraints = ">= 2.5.0" hashes = [ - "h1:/OpJKWupvFd8WJX1mTt8vi01pP7dkA6e//4l4C3TExE=", - "h1:EYZdckuGU3n6APs97nS2LxZm3dDtGqyM4qaIvsmac8o=", - "h1:KfieWtVyGWwplSoLIB5usKAUnrIkDQBkWaR5TI+4WYg=", - "h1:KtUCltnScfZbcvpE9wPH+a0e7KgMX4w7y8RSxu5J/NQ=", - "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:/GAVA/xheGQcbOZEq0qxANOg+KVLCA7Wv8qluxhTjhU=", + "h1:8oTPe2VUL6E2d3OcrvqyjI4Nn/Y/UEQN26WLk5O/B0g=", + "h1:Np4kERf9SMrqUi7DJ1rK3soMK14k49nfgE7l/ipQ5xw=", + "h1:fm2EuMlsdPTuv2tKwx3PMJzWJUh7aMtU9Eky7t4fMys=", + "h1:tjcGlQAFA0kmQ4vKkIPPUC4it1UYxLbg4YvHOWRAJHA=", + "zh:0af29ce2b7b5712319bf6424cb58d13b852bf9a777011a545fac99c7fdcdf561", + "zh:126063ea0d79dad1f68fa4e4d556793c0108ce278034f101d1dbbb2463924561", + "zh:196bfb49086f22fd4db46033e01655b0e5e036a5582d250412cc690fa7995de5", + "zh:37c92ec084d059d37d6cffdb683ccf68e3a5f8d2eb69dd73c8e43ad003ef8d24", + "zh:4269f01a98513651ad66763c16b268f4c2da76cc892ccfd54b401fff6cc11667", + "zh:51904350b9c728f963eef0c28f1d43e73d010333133eb7f30999a8fb6a0cc3d8", + "zh:73a66611359b83d0c3fcba2984610273f7954002febb8a57242bbb86d967b635", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:7ae387993a92bcc379063229b3cce8af7eaf082dd9306598fcd42352994d2de0", + "zh:9e0f365f807b088646db6e4a8d4b188129d9ebdbcf2568c8ab33bddd1b82c867", + "zh:b5263acbd8ae51c9cbffa79743fbcadcb7908057c87eb22fd9048268056efbc4", + "zh:dfcd88ac5f13c0d04e24be00b686d069b4879cc4add1b7b1a8ae545783d97520", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.1.0" - constraints = "3.1.0" + version = "3.6.0" + constraints = ">= 3.6.0" hashes = [ - "h1:9cCiLO/Cqr6IUvMDSApCkQItooiYNatZpEXmcu0nnng=", - "h1:BZMEPucF+pbu9gsPk0G0BHx7YP04+tKdq2MrRDF1EDM=", - "h1:EPIax4Ftp2SNdB9pUfoSjxoueDoLc/Ck3EUoeX0Dvsg=", - "h1:cH1JxJhQqK+FqqkJkmpX9QPC1OD08Bak1fm5IZcnMYw=", - "h1:rKYu5ZUbXwrLG1w81k7H3nce/Ys6yAxXhWcbtk36HjY=", - "zh:2bbb3339f0643b5daa07480ef4397bd23a79963cc364cdfbb4e86354cb7725bc", - "zh:3cd456047805bf639fbf2c761b1848880ea703a054f76db51852008b11008626", - "zh:4f251b0eda5bb5e3dc26ea4400dba200018213654b69b4a5f96abee815b4f5ff", - "zh:7011332745ea061e517fe1319bd6c75054a314155cb2c1199a5b01fe1889a7e2", - "zh:738ed82858317ccc246691c8b85995bc125ac3b4143043219bd0437adc56c992", - "zh:7dbe52fac7bb21227acd7529b487511c91f4107db9cc4414f50d04ffc3cab427", - "zh:a3a9251fb15f93e4cfc1789800fc2d7414bbc18944ad4c5c98f466e6477c42bc", - "zh:a543ec1a3a8c20635cf374110bd2f87c07374cf2c50617eee2c669b3ceeeaa9f", - "zh:d9ab41d556a48bd7059f0810cf020500635bfc696c9fc3adab5ea8915c1d886b", - "zh:d9e13427a7d011dbd654e591b0337e6074eef8c3b9bb11b2e39eaaf257044fd7", - "zh:f7605bd1437752114baf601bdf6931debe6dc6bfe3006eb7e9bb9080931dca8a", + "h1:5KeoKSVKVHJW308uiTgslxFbjQAdWzBGUFK68vgMRWY=", + "h1:I8MBeauYA8J8yheLJ8oSMWqB0kovn16dF/wKZ1QTdkk=", + "h1:R5Ucn26riKIEijcsiOMBR3uOAjuOMfI1x7XvH4P6B1w=", + "h1:p6WG1IPHnqx1fnJVKNjv733FBaArIugqy58HRZnpPCk=", + "h1:t0mRdJzegohRKhfdoQEJnv3JRISSezJRblN0HIe67vo=", + "zh:03360ed3ecd31e8c5dac9c95fe0858be50f3e9a0d0c654b5e504109c2159287d", + "zh:1c67ac51254ba2a2bb53a25e8ae7e4d076103483f55f39b426ec55e47d1fe211", + "zh:24a17bba7f6d679538ff51b3a2f378cedadede97af8a1db7dad4fd8d6d50f829", + "zh:30ffb297ffd1633175d6545d37c2217e2cef9545a6e03946e514c59c0859b77d", + "zh:454ce4b3dbc73e6775f2f6605d45cee6e16c3872a2e66a2c97993d6e5cbd7055", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:91df0a9fab329aff2ff4cf26797592eb7a3a90b4a0c04d64ce186654e0cc6e17", + "zh:aa57384b85622a9f7bfb5d4512ca88e61f22a9cea9f30febaa4c98c68ff0dc21", + "zh:c4a3e329ba786ffb6f2b694e1fd41d413a7010f3a53c20b432325a94fa71e839", + "zh:e2699bc9116447f96c53d55f2a00570f982e6f9935038c3810603572693712d0", + "zh:e747c0fd5d7684e5bfad8aa0ca441903f15ae7a98a737ff6aca24ba223207e2c", + "zh:f1ca75f417ce490368f047b63ec09fd003711ae48487fba90b4aba2ccf71920e", ] } provider "registry.terraform.io/hashicorp/tls" { - version = "3.1.0" - constraints = "3.1.0" + version = "4.0.5" + constraints = ">= 4.0.0" hashes = [ - "h1:U+kgPLboCrcs4eZV87esP7iydF8mjMyHKE/mDsrwfkQ=", - "h1:WsWbr4kSJVO5mpS20rFnJhHU0LUGRQ3z+lobUhg6sxc=", - "h1:XTU9f6sGMZHOT8r/+LWCz2BZOPH127FBTPjMMEAAu1U=", - "h1:ekOxs6MjdIElt8h9crEVaOwWbEqtfUUfArtA13Jkk6A=", - "h1:fUJX8Zxx38e2kBln+zWr1Tl41X+OuiE++REjrEyiOM4=", - "zh:3d46616b41fea215566f4a957b6d3a1aa43f1f75c26776d72a98bdba79439db6", - "zh:623a203817a6dafa86f1b4141b645159e07ec418c82fe40acd4d2a27543cbaa2", - "zh:668217e78b210a6572e7b0ecb4134a6781cc4d738f4f5d09eb756085b082592e", - "zh:95354df03710691773c8f50a32e31fca25f124b7f3d6078265fdf3c4e1384dca", - "zh:9f97ab190380430d57392303e3f36f4f7835c74ea83276baa98d6b9a997c3698", - "zh:a16f0bab665f8d933e95ca055b9c8d5707f1a0dd8c8ecca6c13091f40dc1e99d", - "zh:be274d5008c24dc0d6540c19e22dbb31ee6bfdd0b2cddd4d97f3cd8a8d657841", - "zh:d5faa9dce0a5fc9d26b2463cea5be35f8586ab75030e7fa4d4920cd73ee26989", - "zh:e9b672210b7fb410780e7b429975adcc76dd557738ecc7c890ea18942eb321a5", - "zh:eb1f8368573d2370605d6dbf60f9aaa5b64e55741d96b5fb026dbfe91de67c0d", - "zh:fc1e12b713837b85daf6c3bb703d7795eaf1c5177aebae1afcf811dd7009f4b0", + "h1:e4LBdJoZJNOQXPWgOAG0UuPBVhCStu98PieNlqJTmeU=", + "h1:jb/Rg9inGYp4t8HtBoETESsQJgdmOHoe1bzzg2uNB3w=", + "h1:kcw9sNLNFMY2S0HIGOkjlwKtUc8lpqZsQGsC2SG9xEQ=", + "h1:yLqz+skP3+EbU3yyvw8JqzflQTKDQGsC9QyZAg+S4dg=", + "h1:zeG5RmggBZW/8JWIVrdaeSJa0OG62uFX5HY1eE8SjzY=", + "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", + "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", + "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", + "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", + "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", + "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", + "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", + "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", + "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", + "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", + "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/oracle/oci" { - version = "4.85.0" - constraints = ">= 4.85.0" + version = "5.35.0" + constraints = ">= 5.0.0" hashes = [ - "h1:GGj88mGDJC7Y3Z33wJbuj4oA/w2JXi5UEDPg9r32fi8=", - "h1:WfJTuVVQ+CL/NTdZwa5i/CXSes8XLRHgSMBPXfJIBAs=", - "h1:bsO1Q7LbWnsuaXZ420MmxYCB6WxOXHkGpTtnxtxpFuQ=", - "h1:oW5spoTt8aZ1zUIwaEzMYEobcUvkdVQIAGksuSWK9uc=", - "h1:yh1UJ54qwU7NiFqL4q6w2fiXTLH3MqpEoM6PRKItIGI=", - "zh:39e22a7a6d2901576bc3c7e862211364ea8db0dd4147b3e150306d1f6f2266e6", - "zh:4f6e67fdab159bbbf849697451e7c4d1cb644f0a78efa6e1cfbdca63749ac807", - "zh:758176280f194d5e72e60ae1eabd41dbba087cd8dff314e7e2ecac21286c0587", - "zh:8785265cec7e8e0bd3deee1cb83c98d6581eaff49bbdb0c61b8eac35fa417b1d", - "zh:99319aa06818b8dcdecd9b0f1f9d24222a0d107ebb3e34e0f5eb99ea6dada5bc", + "h1:93mbtZFPfC8vP9P91Ksfc7AdQrSD/tb+dClMfX0sbPU=", + "h1:Yce2f7q0F0L0eZbSgbeHhyuqiMUBxAqRBQhX64P9YAI=", + "h1:cMwOx0x9LZya9Tkh9fMdtP2Jsz2e2zqvyCoY2KB04pY=", + "h1:mDfmrA8DpmOOuoPO/+DT67EbdcwAwyLcnOslnaxExDY=", + "h1:rVU22b77JsulJP1JG7u/hgH7IKjkfA+0G7a7O3p7D3U=", + "zh:0b5d69e848f9b61e551fd9a77cada1b71b4311128634ecc9fb4eb43f0212683d", + "zh:1b1eb80de6eab7defa60680661f0d12402f139798e3ed9c6c1d947a0a20d0964", + "zh:560769bc979180ea8bcdcaf2c7378a749e7854fa20574f6024eed80a192146b6", + "zh:5c3c708cf2a57468e1bf9214a9c2d8378f668db407445ab30be183866f85aed8", + "zh:653e0a4e9dd63cf30b96a851ff2bde1894cba4e7fe96e91cd487efca50ccf2e2", + "zh:6a40a8c07dc1a1c5876b05ae9f8c53cdcb7bed4a7ec39ac04f7ce8f6f9c71647", + "zh:7e6c6e8a5d36df25423076a35542717ee9d647ee68eea71bce70f0b7ee1d9bca", + "zh:8458a35f26bd5ad9181232290b8d36d6322e32d073a9f55e44508f528b669eda", + "zh:851c1540eba171738256c12d87c93dd3392ccfabdeb18b110a635e6dfa7dafdf", + "zh:92a621d623e8989ab6286d28de240c8c71f8ad0b6e46806cadd98f7c103a2297", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b0e39737a85679cb8ab7700dea42f1488d7c9a7f22e6bfbc7e86ad5cb29b916e", - "zh:b2fa33b814f1124e196effc6c22e3aeaa02ecdef334b4bef23305edf167948f6", - "zh:b3a83cda505e895b217d015c177e51a944fd644a3168c97b911fe6a09751c09e", - "zh:b4fb4d7068d0d1843a87544f62ecc690c03809f9067642148403423d19cc8be9", - "zh:c067674f49f264664e58d8c71961f3536c135d30caa8f3f64ddbb80380ffe84c", - "zh:c486d2f0f95b37db373bd3d66598823af0afcb7da232a7b7d7ff7399917a8b67", - "zh:caf82e1f72f340ab74d8e214dfe904997c0f080dd151699ea00033a53e94073d", - "zh:e11d64ba2c979f32b14e4d0a3390077e4ae4ec3f7f44913123e9c9fba7fc1fd3", - "zh:fed40ab36092d1986bc8a45b066a8d11c502327c49fbf8ca8350d37abbce6348", + "zh:a543baa5305bcaf4e051bdac51c9658edd9eabf8ea68ed6df82a4fa33753ca66", + "zh:bdb4cd1596f3bdcc161e8298774ef7e803337a78dd6368481e8cfccc3e910d19", + "zh:cbc70ea8f51abb4b9aefe25c26ff79580f81fe8ee9ab374e080a0a086da504bb", + "zh:f58f23dba6bf335dc2e29383102846f6ad64186d63ce0922d6e419e3cc123a97", ] } diff --git a/deploy/complete/terraform/VERSION b/deploy/complete/terraform/VERSION index 6ebad148..a4f52a5d 100644 --- a/deploy/complete/terraform/VERSION +++ b/deploy/complete/terraform/VERSION @@ -1 +1 @@ -3.1.2 \ No newline at end of file +3.2.0 \ No newline at end of file diff --git a/deploy/complete/terraform/mushop-oci-services.tf b/deploy/complete/terraform/mushop-oci-services.tf index f0d28fd6..bd0f527b 100644 --- a/deploy/complete/terraform/mushop-oci-services.tf +++ b/deploy/complete/terraform/mushop-oci-services.tf @@ -107,6 +107,21 @@ resource "kubernetes_service_account" "wallet_extractor_sa" { name = "wallet-extractor-sa" namespace = kubernetes_namespace.mushop_namespace.id } + secret { + name = "wallet-extractor-sa-token" + } + + count = var.mushop_mock_mode_all ? 0 : 1 +} +resource "kubernetes_secret" "wallet_extractor_sa" { + metadata { + name = "wallet-extractor-sa-token" + namespace = kubernetes_namespace.mushop_namespace.id + annotations = { + "kubernetes.io/service-account.name" = kubernetes_service_account.wallet_extractor_sa.0.metadata.0.name + } + } + type = "kubernetes.io/service-account-token" count = var.mushop_mock_mode_all ? 0 : 1 } @@ -141,7 +156,7 @@ resource "kubernetes_job" "wallet_extractor_job" { args = ["kubectl create secret generic oadb-wallet --from-file=/wallet"] volume_mount { mount_path = "/var/run/secrets/kubernetes.io/serviceaccount" - name = kubernetes_service_account.wallet_extractor_sa[0].default_secret_name + name = kubernetes_secret.wallet_extractor_sa.0.metadata.0.name # kubernetes_service_account.wallet_extractor_sa[0].default_secret_name read_only = true } volume_mount { @@ -151,9 +166,9 @@ resource "kubernetes_job" "wallet_extractor_job" { } } volume { - name = kubernetes_service_account.wallet_extractor_sa[0].default_secret_name + name = kubernetes_secret.wallet_extractor_sa.0.metadata.0.name # kubernetes_service_account.wallet_extractor_sa[0].default_secret_name secret { - secret_name = kubernetes_service_account.wallet_extractor_sa[0].default_secret_name + secret_name = kubernetes_secret.wallet_extractor_sa.0.metadata.0.name # kubernetes_service_account.wallet_extractor_sa[0].default_secret_name } } volume { diff --git a/deploy/complete/terraform/mushop-utilities.tf b/deploy/complete/terraform/mushop-utilities.tf index 9df1442e..b9c15bb5 100644 --- a/deploy/complete/terraform/mushop-utilities.tf +++ b/deploy/complete/terraform/mushop-utilities.tf @@ -18,7 +18,7 @@ resource "helm_release" "prometheus" { name = "prometheus" repository = local.helm_repository.prometheus chart = "prometheus" - version = "15.10.5" + version = "25.18.0" namespace = kubernetes_namespace.cluster_utilities_namespace.id wait = false @@ -37,7 +37,7 @@ resource "helm_release" "grafana" { name = "mushop-utils-grafana" # mushop-utils included to be backwards compatible to the docs and setup chart install repository = local.helm_repository.grafana chart = "grafana" - version = "6.32.5" + version = "7.3.7" namespace = kubernetes_namespace.cluster_utilities_namespace.id wait = false @@ -47,10 +47,10 @@ resource "helm_release" "grafana" { type = "string" } - set { - name = "grafana\\.ini.server.serve_from_sub_path" - value = "true" - } + # set { + # name = "grafana\\.ini.server.serve_from_sub_path" + # value = "true" + # } values = [ file("${path.module}/chart-values/grafana-values.yaml"), <= 1.6 when using OpenTofu + required_providers { + oci = { + source = "oracle/oci" + version = ">= 5" + # https://registry.terraform.io/providers/oracle/oci/ + } + kubernetes = { + source = "hashicorp/kubernetes" + version = ">= 2.27" + # https://registry.terraform.io/providers/hashicorp/kubernetes/ + } + helm = { + source = "hashicorp/helm" + version = ">= 2.12" + # https://registry.terraform.io/providers/hashicorp/helm/ + } + tls = { + source = "hashicorp/tls" + version = ">= 4" + # https://registry.terraform.io/providers/hashicorp/tls/ + } + local = { + source = "hashicorp/local" + version = ">= 2.5" + # https://registry.terraform.io/providers/hashicorp/local/ + } + random = { + source = "hashicorp/random" + version = ">= 3.6" + # https://registry.terraform.io/providers/hashicorp/random/ + } + } +} \ No newline at end of file