Skip to content

Commit a8b52c0

Browse files
author
Abdallah Samara (EXT-Nokia)
committed
feat: Upgrade Go to 1.24 - notebook-controller component. #721
Signed-off-by: Abdallah Samara (EXT-Nokia) <[email protected]>
1 parent 8c44fd7 commit a8b52c0

File tree

9 files changed

+238
-21
lines changed

9 files changed

+238
-21
lines changed

.github/workflows/nb_controller_docker_publish.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ name: Build & Publish Notebook Controller Docker image
22
on:
33
push:
44
branches:
5-
- main
6-
- v*-branch
5+
- feat/721
76
- notebooks-v1
87
paths:
98
- components/notebook-controller/**
109
- components/common/**
1110
- releasing/version/VERSION
1211

1312
env:
14-
IMG: ghcr.io/kubeflow/notebooks/notebook-controller
13+
IMG: ghcr.io/abdallahsamabd/notebooks/notebook-controller
1514
ARCH: linux/amd64,linux/ppc64le,linux/arm64/v8
1615

1716
jobs:

.github/workflows/nb_controller_integration_test.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
name: Notebook Controller Integration Test
22
on:
3-
pull_request:
3+
push:
44
paths:
55
- components/notebook-controller/**
66
- releasing/version/VERSION
77
branches:
8-
- main
9-
- notebooks-v1
8+
- feat/721
109
- v*-branch
1110

1211
concurrency:
1312
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.number }}
1413
cancel-in-progress: true
1514

1615
env:
17-
IMG: ghcr.io/kubeflow/notebooks/notebook-controller
16+
IMG: ghcr.io/abdallahsamabd/notebooks/notebook-controller
1817
TAG: integration-test
1918

2019
jobs:

.github/workflows/nb_controller_multi_arch_test.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
name: Notebook Controller Multi-Arch Build Test
22
on:
3-
pull_request:
3+
push:
44
paths:
55
- components/notebook-controller/**
66
- releasing/version/VERSION
77
branches:
8-
- main
9-
- notebooks-v1
8+
- feat/721
109
- v*-branch
1110

1211
concurrency:
1312
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.number }}
1413
cancel-in-progress: true
1514

1615
env:
17-
IMG: ghcr.io/kubeflow/notebooks/notebook-controller
16+
IMG: ghcr.io/abdallahsamabd/notebooks/notebook-controller
1817

1918
jobs:
2019
build:

.github/workflows/nb_controller_unit_test.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
name: Run Notebook Controller unit tests
22
on:
3-
pull_request:
3+
push:
44
paths:
55
- components/notebook-controller/**
66
- releasing/version/VERSION
77
branches:
8-
- main
9-
- notebooks-v1
8+
- feat/721
109
- v*-branch
1110

1211
jobs:
@@ -19,7 +18,7 @@ jobs:
1918
- name: Install Go
2019
uses: actions/setup-go@v5
2120
with:
22-
go-version: "1.17"
21+
go-version: "1.24"
2322
check-latest: true
2423

2524
- name: Run unit tests

.github/workflows/tb_controller_docker_publish.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ name: Build & Publish Tensorboard Controller Docker image
22
on:
33
push:
44
branches:
5-
- main
6-
- notebooks-v1
5+
- feat/721
76
- v*-branch
87
paths:
98
- components/tensorboard-controller/**
109
- releasing/version/VERSION
1110

1211
env:
13-
IMG: ghcr.io/kubeflow/notebooks/tensorboard-controller
12+
IMG: ghcr.io/abdallahsamabd/notebooks/tensorboard-controller
1413
ARCH: linux/amd64,linux/ppc64le,linux/arm64/v8
1514

1615
jobs:

components/notebook-controller/Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# ${PATH_TO_KUBEFLOW/KUBEFLOW repo}/components
66
#
7-
ARG GOLANG_VERSION=1.17
7+
ARG GOLANG_VERSION=1.24
88
FROM golang:${GOLANG_VERSION} as builder
99

1010
WORKDIR /workspace
@@ -16,6 +16,14 @@ COPY notebook-controller /workspace/notebook-controller
1616
# and so that source changes don't invalidate our downloaded layer
1717
RUN cd /workspace/notebook-controller && go mod download
1818

19+
# Force download and extract all HashiCorp modules so they exist under /go/pkg/mod
20+
RUN set -e; cd /workspace/notebook-controller; \
21+
for m in $(go list -m all | awk '/^github.com\/hashicorp\// {print $1 "@" $2}'); do \
22+
go mod download "$m"; \
23+
pkg="${m%@*}"; \
24+
go list "$pkg/..." >/dev/null 2>&1 || true; \
25+
done
26+
1927
WORKDIR /workspace/notebook-controller
2028

2129
# Build

components/notebook-controller/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
136136
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
137137
.PHONY: controller-gen
138138
controller-gen: ## Download controller-gen locally if necessary.
139-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
139+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
140140

141141
KUSTOMIZE = $(shell pwd)/bin/kustomize
142142
.PHONY: kustomize

components/notebook-controller/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubeflow/kubeflow/components/notebook-controller
22

3-
go 1.17
3+
go 1.24
44

55
require (
66
github.com/go-logr/logr v1.2.0

components/notebook-controller/go.sum

Lines changed: 214 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)