diff --git a/Dockerfile b/Dockerfile index 0cc1460437..50e98a8915 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # 1. Build the Helm client Go lib # 2. Deploy Leonardo pointing to the Go lib -FROM golang:1.20 AS helm-go-lib-builder +FROM golang:1.23 AS helm-go-lib-builder # TODO Consider moving repo set-up to the build script to make CI versioning easier RUN mkdir /helm-go-lib-build && \ @@ -42,7 +42,7 @@ COPY --from=helm-go-lib-builder /helm-go-lib-build/helm-scala-sdk/helm-go-lib /l # Install the Helm3 CLI client using a provided script because installing it via the RHEL package managing didn't work RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 && \ chmod 700 get_helm.sh && \ - ./get_helm.sh --version v3.11.2 && \ + ./get_helm.sh --version v3.15.3 && \ rm get_helm.sh # Add the repos containing nginx, galaxy, setup apps, custom apps, cromwell and aou charts diff --git a/http/src/main/resources/leo.conf b/http/src/main/resources/leo.conf index e833d40fd0..da82b4b95b 100644 --- a/http/src/main/resources/leo.conf +++ b/http/src/main/resources/leo.conf @@ -24,6 +24,9 @@ gce { } gke { + cluster { + version = ${?KUBERNETES_VERSION} + } galaxyApp { postgres.password = ${?GALAXY_POSTGRES_PASSWORD} orchUrl = ${?ORCH_URL} diff --git a/http/src/main/resources/reference.conf b/http/src/main/resources/reference.conf index 9ce43d0524..b19492de71 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.28" + version = "1.30" 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 944c6ac0ac..1763ba4c20 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.28"), + KubernetesClusterVersion("1.30"), 1 hour, 200, AutopilotConfig(AutopilotResource(500, 3, 1), AutopilotResource(500, 3, 1)) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c3b4f56b07..e1c2d47b3d 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.8.5" + val helmScalaSdkV = "0.0.9.1" val excludeAkkaHttp = ExclusionRule(organization = "com.typesafe.akka", name = s"akka-http_${scalaV}") val excludeAkkaStream = ExclusionRule(organization = "com.typesafe.akka", name = s"akka-stream_${scalaV}")