Skip to content

Commit 1a00c81

Browse files
authored
[AN-347] Update go from 1.20 to 1.23, helm from 3.11.2 to 3.15.3 and kubernetes from 1.28 to 1.30 (#4826)
1 parent d600084 commit 1a00c81

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

Diff for: Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# 1. Build the Helm client Go lib
33
# 2. Deploy Leonardo pointing to the Go lib
44

5-
FROM golang:1.20 AS helm-go-lib-builder
5+
FROM golang:1.23 AS helm-go-lib-builder
66

77
# TODO Consider moving repo set-up to the build script to make CI versioning easier
88
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
4242
# Install the Helm3 CLI client using a provided script because installing it via the RHEL package managing didn't work
4343
RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 && \
4444
chmod 700 get_helm.sh && \
45-
./get_helm.sh --version v3.11.2 && \
45+
./get_helm.sh --version v3.15.3 && \
4646
rm get_helm.sh
4747

4848
# Add the repos containing nginx, galaxy, setup apps, custom apps, cromwell and aou charts

Diff for: http/src/main/resources/leo.conf

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ gce {
2424
}
2525

2626
gke {
27+
cluster {
28+
version = ${?KUBERNETES_VERSION}
29+
}
2730
galaxyApp {
2831
postgres.password = ${?GALAXY_POSTGRES_PASSWORD}
2932
orchUrl = ${?ORCH_URL}

Diff for: http/src/main/resources/reference.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ gke {
723723
"69.173.112.0/21"
724724
]
725725
# See https://cloud.google.com/kubernetes-engine/docs/release-notes
726-
version = "1.28"
726+
version = "1.30"
727727
nodepoolLockCacheExpiryTime = 1 hour
728728
nodepoolLockCacheMaxSize = 200
729729

Diff for: http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/config/ConfigSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ final class ConfigSpec extends AnyFlatSpec with Matchers {
8484
"69.173.127.240/28",
8585
"69.173.112.0/21"
8686
).map(CidrIP),
87-
KubernetesClusterVersion("1.28"),
87+
KubernetesClusterVersion("1.30"),
8888
1 hour,
8989
200,
9090
AutopilotConfig(AutopilotResource(500, 3, 1), AutopilotResource(500, 3, 1))

Diff for: project/Dependencies.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object Dependencies {
2626
val workbenchOauth2V = "0.8-3e0cf25"
2727
val workbenchAzureV = s"0.8-$workbenchLibsHash"
2828

29-
val helmScalaSdkV = "0.0.8.5"
29+
val helmScalaSdkV = "0.0.9.1"
3030

3131
val excludeAkkaHttp = ExclusionRule(organization = "com.typesafe.akka", name = s"akka-http_${scalaV}")
3232
val excludeAkkaStream = ExclusionRule(organization = "com.typesafe.akka", name = s"akka-stream_${scalaV}")

0 commit comments

Comments
 (0)