Skip to content

Build with Go 1.23.8, update image metadata #324

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 25, 2025
Merged

Build with Go 1.23.8, update image metadata #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions deployments/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG GOLANG_VERSION=1.23.1
ARG GOLANG_VERSION=1.23.8
Copy link
Member

@elezar elezar Apr 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be possible to drop this here. I know that sometimes we allow users to build the dockerfiles directly from the git repos, but setting this to:

Suggested change
ARG GOLANG_VERSION=1.23.8
ARG GOLANG_VERSION=undefined

Should give a reasonable error message when a user does not provide the expected --build-arg.

I don't think the effort in maintaining support for this out-of-band build process is worth the benefit to the community.

Copy link
Collaborator Author

@jgehrcke jgehrcke Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I will leave things as they are for now, and we can perform that simplification later.

# We use an ubuntu20.04 base image to allow for a more efficient multi-arch builds.
FROM --platform=${BUILDOS}/amd64 nvcr.io/nvidia/cuda:12.8.0-base-ubuntu20.04 AS build

Expand Down Expand Up @@ -51,15 +51,15 @@ ENV NVIDIA_DRIVER_CAPABILITIES=utility
ARG VERSION="N/A"
ARG GIT_COMMIT="unknown"

LABEL io.k8s.display-name="NVIDIA DRA Driver"
LABEL name="NVIDIA DRA Driver"
LABEL io.k8s.display-name="NVIDIA DRA Driver for GPUs"
LABEL name="NVIDIA DRA Driver for GPUs"
LABEL vendor="NVIDIA"
LABEL version=${VERSION}
LABEL com.nvidia.git-commit="${GIT_COMMIT}"
LABEL release="N/A"
LABEL summary="NVIDIA DRA driver for Kubernetes"
LABEL description="See summary"
LABEL org.opencontainers.image.description "NVIDIA GPU DRA driver for Kubernetes"
LABEL summary="NVIDIA DRA Driver for GPUs"
LABEL description="NVIDIA DRA Driver for GPUs"
LABEL org.opencontainers.image.description "NVIDIA DRA Driver for GPUs"
Copy link
Member

@elezar elezar Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
LABEL org.opencontainers.image.description "NVIDIA DRA Driver for GPUs"
LABEL org.opencontainers.image.description="NVIDIA DRA Driver for GPUs"

Copy link
Collaborator

@ArangoGutierrez ArangoGutierrez Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Dockerfiles is valid to have Label Key Val separated without an =

Copy link
Collaborator Author

@jgehrcke jgehrcke Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Let's normalize this later, and then pick the preferred way of doing this (if one of both is preferred).

Copy link
Member

@elezar elezar Apr 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Dockerfiles is valid to have Label Key Val separated without an =

Yes, I'm not saying it's invalid. I'm saying that it's locally inconsistent. Not a blocker for this PR though.

LABEL org.opencontainers.image.source "https://github.com/NVIDIA/k8s-dra-driver-gpu"

RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE
Expand Down
2 changes: 1 addition & 1 deletion deployments/devel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# This Dockerfile is also used to define the golang version used in this project
# This allows dependabot to manage this version in addition to other images.
FROM golang:1.23.1
FROM golang:1.23.8
Copy link
Member

@elezar elezar Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're still on main, this is done by #312 I'm OK to do this here.

Copy link
Collaborator Author

@jgehrcke jgehrcke Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is done by #312 I'm OK to do this here.

Right. This PR here is slightly more conservative as it stays within 1.23.x

Copy link
Member

@elezar elezar Apr 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, in other projects we configure dependabot to only allow patch updates on release-* branches. This would have skipped these minor version updates.


WORKDIR /work
COPY * .
Expand Down