Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[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

Merged
merged 8 commits into from
Jan 30, 2025
Merged
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions http/src/main/resources/leo.conf
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ gce {
}

gke {
cluster {
version = ${?KUBERNETES_VERSION}
}
galaxyApp {
postgres.password = ${?GALAXY_POSTGRES_PASSWORD}
orchUrl = ${?ORCH_URL}
Expand Down
2 changes: 1 addition & 1 deletion http/src/main/resources/reference.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
Loading