Skip to content
Snippets Groups Projects
Commit 79bf5de8 authored by Brad Downey's avatar Brad Downey
Browse files

Merge branch '10-terrafrom-1-0' into 'master'

Resolve "Terrafrom 1.0"

Closes #10

See merge request gitops-demo/infra/gcp!25
parents 210f9968 8bd3d529
No related branches found
No related tags found
No related merge requests found
......@@ -2,54 +2,58 @@
# Manual edits may be lost in future updates.
provider "registry.terraform.io/gitlabhq/gitlab" {
version = "3.5.0"
version = "3.6.0"
hashes = [
"h1:OPAh3smkOF5k4fkr4pDrKFBfFgx+oGq96Zvn+HEpNRs=",
"zh:20a7e10d88020a88f1aedd93d1de9a70efcc192f5c630df6a7818c4c3e501ac5",
"zh:30c2f168869e7b243c844610bba5964de4acec9d0bb1255fc1ee6b97645dc398",
"zh:4429f353f907f496997590113f1552db153d1b5793a64b06dd30ddd69e4c5c9b",
"zh:9ab8c83053e8af0722e2aa04bc676a40543cc12f82e250d711bfaf2a791b58b1",
"zh:a51dacd1f2022ac3edada0541327b87a7886ad981c32d29fd0bb48139a0b1360",
"zh:ab568a4a19e272f2ead4d6e4f2a8ae61a18a952c92de741dfa6b1f501a18d30c",
"zh:c7a7440c9b4698524506a6cbf8c8daf0dae32af3e245882b1ae2217c5a53bb9d",
"zh:cc344adba161de020c677f7a6e233d829ffdfcd80ca154633caa5b5f23735346",
"zh:ce6f02db7da21c308e824ea3d051e182f310fdba74fd4d40fedceb539b97daed",
"zh:e44c8cde080e8690533623d4c56d9070cb4c720d12774e341c5b75c20291cd2d",
"zh:ebdc5b7c23f3a0be2776402782312277cbd5ec5b54b8302eb64934e96e6c9a28",
"h1:icNPivGM5+Rilvii04ygDEycpSGRzQ4oH+4oXKfhd8M=",
"zh:08a915f21564737090eea015f47d7dd5c2d1a5f63b49211937534f643f47b8ca",
"zh:145527bed51ec8070a85e967395fcd9aa32c97fbf2cf42747397cef6f1388213",
"zh:1e3c8c26af5076b9067ac9f6f71b188c25838db42e8d6c11128322d6c4655982",
"zh:5a795890e78121f7b8d8a3ae6fdc6a6f69083465b6a2073c9c0f0564dad4f7ec",
"zh:765219c271e8af16fd436cf88e32079379b035d92bca0df556dee9adf9c9152f",
"zh:7804d99ba61f74db1a4a911d181e7f8cee62c41658fe424cfa28362d6bbe8784",
"zh:85e51fd6402de3e842e75ea02dc79cc3903fd030bd3d312bfcb78a8a61b8dfaa",
"zh:8b13a75dcd932dc43616d058eeae60fada70bc93b0deb7152a4aba55d365e5b0",
"zh:8d80014cc5acf9c4c64cd73e8f15b418b52cc54e112b1ebb49fdefa2ad8e13eb",
"zh:b25129758f8aa6835dd22101f945abed6430d457659d20d2638eff27ca71bddd",
"zh:b35e089343a6185db0196273517fcfe98fbd13d6ac1901b49d1d24b2b39b2ff1",
"zh:cd928bc0e5d42fb966fd583cb8c46169cf80d35a57859db949d0c0b802fef35d",
"zh:f8af5be58d41afcda522926e3768728fe412a87dbacca7ecb02341b854bf798f",
]
}
provider "registry.terraform.io/hashicorp/google" {
version = "3.58.0"
version = "3.71.0"
hashes = [
"h1:KCj2IR0HGZ3gXFxxTdb6Dyeyj+Rk3cQ69X8zOKPuDgo=",
"zh:11429956acf63eff104d430bbf8d61977f67eadfe79ed3fae5823f76223f7a38",
"zh:25e448f7fcd5a96ae6bb84b6ae0ba9275595c671f1c3ae5332d48193cadbb23b",
"zh:4dc858b85c0981f4e55b3003882f496076ad95b7684fb0edc6c1c2dac063f193",
"zh:5348a8d20b3d56447acb3f471ad9e3887f66bf73f5b803cf10cd77817a8b3b6c",
"zh:733659cb1106c93c0e5df99ad4d6e13fbeefa50a2efcea2d160ec88657ee6a01",
"zh:7cd0c23396c473cd43e61a8aa72c87b170cfdf4816335d0e1e61c1d1d0ebbaf4",
"zh:87543121139f427a7bdea104f226e6cc3e267db66f08dc9294e8f2a953856d35",
"zh:a858ea9a879037e643d1ab7e387e6312369df7740d88f6068b406f4c15dda003",
"zh:b666f26c051cf82a063ab902ba0031db7ca9b7138cdcf00645e594b347630df1",
"zh:dd6d294a2238b83893eb2df00f8d0f0a3fb9841e6cc5f9a2b135a3d5c1e44ee6",
"h1:2TKIPbA+rqmJ5jfLk8AIsi7CAAqhhA+kO2676RuO7gU=",
"zh:0ed7d1a873011aa0b0d00d2e377b4fbf4a2d4164c69956afa65adb47220d7ca0",
"zh:80448ba1bc094cf2a4c1b7aa00519846fe636c5f964e53d7a5706a6cbdd009cd",
"zh:81dab2e452c23e3c4f659799b0b076c129cb9fe866037fdde94ecb28dbea56be",
"zh:8b15d9c37cd04303f866b66bffe13c15d8e3254459958ebaad184d63dc1f5da0",
"zh:920b8b65a6900057c664cb099d64cc58f88ca4ab38e13e2c805cf2413a82795b",
"zh:bd022571709bff30d9d18a1bb2a383df85027b01ffbbf92ce9e514d48557899e",
"zh:c68b306b61e637a66f8c20580f23143517f957ed74b52476e4094a14fd72e615",
"zh:e5f2fe60bc99612cc089265d7003f6d2007304ec37367a43eb65716de2d1f491",
"zh:e865d87acf9c357b12ed55538d8d974a708762ed6288119e4c33591cae70159e",
"zh:f7b52e22b86f11a06f822a9b1176a4d50e120a6b4cfce61a0574007b5d143370",
"zh:ff98905d147426cfc5b018184706774e323993f773333802999eec9974c58773",
]
}
provider "registry.terraform.io/hashicorp/kubernetes" {
version = "2.0.2"
version = "2.3.1"
hashes = [
"h1:vNrgTrqsLcL2Uw8kr89ZIq2NF858MZ15sLtNfd55hVA=",
"zh:4e66d509c828b0a2e599a567ad470bf85ebada62788aead87a8fb621301dec55",
"zh:55ca6466a82f60d2c9798d171edafacc9ea4991aa7aa32ed5d82d6831cf44542",
"zh:65741e6910c8b1322d9aef5dda4d98d1e6409aebc5514b518f46019cd06e1b47",
"zh:79456ca037c19983977285703f19f4b04f7eadcf8eb6af21f5ea615026271578",
"zh:7c39ced4dc44181296721715005e390021770077012c206ab4c209fb704b34d0",
"zh:86856c82a6444c19b3e3005e91408ac68eb010c9218c4c4119fc59300b107026",
"zh:999865090c72fa9b85c45e76b20839da51714ae429d1ab14b7d8ce66c2655abf",
"zh:a3ea0ae37c61b4bfe81f7a395fb7b5ba61564e7d716d7a191372c3c983271d13",
"zh:d9061861822933ebb2765fa691aeed2930ee495bfb6f72a5bdd88f43ccd9e038",
"zh:e04adbe0d5597d1fdd4f418be19c9df171f1d709009f63b8ce1239b71b4fa45a",
"h1:uIwQjQesidbjSS5kMLh39b7ZEwTbKoxSCT0xbDNpfpA=",
"zh:05bc0756996f49e8db644b4da63df42a24bfa3fadc5f7bbc3932cb364d0e0310",
"zh:14c5b75133a1e0bcb100b94eeec37cdadafb85f89f7bd6d3f870cbe023848b31",
"zh:2540962d1f9843b9f806592b84c6b16dea2dc64438911e496e9284a579d4735b",
"zh:40ca8bb8f86d7f0be9457c61c82a1e68a3f90b585b45f3009ed4c2f66a79dc1c",
"zh:475409c1c31d2ef61701a0ffb26c01df41a2709411eedae138c8a470bc670107",
"zh:600b5118485a73262aa33fae3367341c822fd5842b64d9b85a43e9a75a2d3f20",
"zh:70efb8882f13eb1e703b6dbfcf05ac2a904a69be3a4e7e1378254df63ff51a66",
"zh:8211a1616f044862a40ab242891790d2a0588d13672b6f3d6aff35b816232f4a",
"zh:829e24ec14bb6a2799393dae9da513dbd8074c7a1633e9aa90c415a50fa37de9",
"zh:93ea75e2db7c8eac2b0217eab2a2bedc4f330da5749f3b575aabbbdcf4dd92ca",
"zh:ad05540d691fd6ba06bf3faa11dd2f754231646e801c11ab0f235ca854cd21fb",
]
}
......
......@@ -4,7 +4,7 @@ resource "google_container_cluster" "primary" {
location = "us-west1-a"
remove_default_node_pool = true
initial_node_count = 1
min_master_version = "1.20"
}
resource "google_container_node_pool" "primary_preemptible_nodes" {
......
......@@ -10,5 +10,5 @@ terraform {
source = "hashicorp/kubernetes"
}
}
required_version = ">= 0.14"
required_version = "~> 1.0.0"
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment