From d60008483e9e1603380a8d75612c8f66457a353f Mon Sep 17 00:00:00 2001 From: LizBaldo Date: Wed, 22 Jan 2025 15:11:00 -0500 Subject: [PATCH] Revert "[AN-347] Bump up helm scala sdk and GKE k8s versions to latest (1.30)" (#4825) --- http/src/main/resources/reference.conf | 2 +- .../dsde/workbench/leonardo/config/ConfigSpec.scala | 2 +- project/Dependencies.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/http/src/main/resources/reference.conf b/http/src/main/resources/reference.conf index b19492de71..9ce43d0524 100644 --- a/http/src/main/resources/reference.conf +++ b/http/src/main/resources/reference.conf @@ -723,7 +723,7 @@ gke { "69.173.112.0/21" ] # See https://cloud.google.com/kubernetes-engine/docs/release-notes - version = "1.30" + version = "1.28" nodepoolLockCacheExpiryTime = 1 hour nodepoolLockCacheMaxSize = 200 diff --git a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/config/ConfigSpec.scala b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/config/ConfigSpec.scala index 1763ba4c20..944c6ac0ac 100644 --- a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/config/ConfigSpec.scala +++ b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/config/ConfigSpec.scala @@ -84,7 +84,7 @@ final class ConfigSpec extends AnyFlatSpec with Matchers { "69.173.127.240/28", "69.173.112.0/21" ).map(CidrIP), - KubernetesClusterVersion("1.30"), + KubernetesClusterVersion("1.28"), 1 hour, 200, AutopilotConfig(AutopilotResource(500, 3, 1), AutopilotResource(500, 3, 1)) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 932b669207..c3b4f56b07 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -26,7 +26,7 @@ object Dependencies { val workbenchOauth2V = "0.8-3e0cf25" val workbenchAzureV = s"0.8-$workbenchLibsHash" - val helmScalaSdkV = "0.0.9.0" + val helmScalaSdkV = "0.0.8.5" val excludeAkkaHttp = ExclusionRule(organization = "com.typesafe.akka", name = s"akka-http_${scalaV}") val excludeAkkaStream = ExclusionRule(organization = "com.typesafe.akka", name = s"akka-stream_${scalaV}")