From 36fc28928dd03ddcc1ce37084c6a8f9b52822233 Mon Sep 17 00:00:00 2001 From: Kenny Ho Date: Fri, 12 Jan 2024 17:00:43 -0500 Subject: [PATCH 1/2] Upgrade go version to 1.21 Also upgraded base image to Alpine 3.19.0 to fix the following CVEs: CVE-2023-5363 CVE-2023-6129 CVE-2023-5678 --- Dockerfile | 4 ++-- go.mod | 2 +- labeller.Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 45264203..c15eff83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/golang:1.19.13-alpine3.18 +FROM docker.io/golang:1.21.6-alpine3.19 RUN apk --no-cache add git pkgconfig build-base libdrm-dev RUN apk --no-cache add hwloc-dev --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community RUN mkdir -p /go/src/github.com/RadeonOpenCompute/k8s-device-plugin @@ -20,7 +20,7 @@ WORKDIR /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/cmd/k8s-device-pl RUN go install \ -ldflags="-X main.gitDescribe=$(git -C /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/ describe --always --long --dirty)" -FROM alpine:3.18.4 +FROM alpine:3.19.0 LABEL \ org.opencontainers.image.source="https://github.com/RadeonOpenCompute/k8s-device-plugin" \ org.opencontainers.image.authors="Kenny Ho " \ diff --git a/go.mod b/go.mod index 0b96e8f1..a02c3616 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/RadeonOpenCompute/k8s-device-plugin -go 1.19 +go 1.21 require ( github.com/go-logr/logr v1.2.3 diff --git a/labeller.Dockerfile b/labeller.Dockerfile index 4f692654..a3d42ea9 100644 --- a/labeller.Dockerfile +++ b/labeller.Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/golang:1.19.13-alpine3.18 +FROM docker.io/golang:1.21.6-alpine3.19 RUN apk --no-cache add git pkgconfig build-base libdrm-dev RUN mkdir -p /go/src/github.com/RadeonOpenCompute/k8s-device-plugin ADD . /go/src/github.com/RadeonOpenCompute/k8s-device-plugin @@ -19,7 +19,7 @@ WORKDIR /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/cmd/k8s-node-labe RUN go install \ -ldflags="-X main.gitDescribe=$(git -C /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/ describe --always --long --dirty)" -FROM alpine:3.18.4 +FROM alpine:3.19.0 LABEL \ org.opencontainers.image.source="https://github.com/RadeonOpenCompute/k8s-device-plugin" \ org.opencontainers.image.authors="Kenny Ho " \ From e9ecf955c3ae0a2a0fc02d31ff20b71f921a070a Mon Sep 17 00:00:00 2001 From: Maarten Blokker Date: Sat, 13 Jan 2024 14:22:16 +0100 Subject: [PATCH 2/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cc10c686..0a7a8482 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ $ kubectl create -f https://raw.githubusercontent.com/RadeonOpenCompute/k8s-devi [ds]: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/ [dp]: https://kubernetes.io/docs/concepts/cluster-administration/device-plugins/ [helmamdgpu]: https://artifacthub.io/packages/helm/amd-gpu-helm/amd-gpu -[rocm]: https://docs.amd.com/en/latest/rocm.html +[rocm]: https://docs.amd.com/en/latest/what-is-rocm.html [rock]: https://github.com/RadeonOpenCompute/ROCK-Kernel-Driver [rocminstall]: https://docs.amd.com/en/latest/deploy/linux/quick_start.html [amdgpuinstall]: https://amdgpu-install.readthedocs.io/en/latest/