release branch 1.16.0 update (#21)

branch 1.16.0 update

Dockerfile

@@ -4,20 +4,18 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
 
-ARG VERSION=1.15.0
-ARG MINOR_VERSION=479
-ARG DIST=ubuntu22.04
-ARG REGISTRY=vault.habana.ai
+ARG VERSION=1.16.0
+ARG BASE_IMAGE
 
-FROM ${REGISTRY}/gaudi-docker/${VERSION}/${DIST}/habanalabs/pytorch-installer-2.2.0:${VERSION}-${MINOR_VERSION} as builder
+FROM ${BASE_IMAGE} as builder
 
 RUN apt-get update && \
     apt-get install -y wget make git gcc \
@@ -51,8 +49,9 @@ RUN go build -buildvcs=false -o bin/habanalabs-device-plugin .
 
 ARG BUILD_DATE
 ARG BUILD_REF
+ARG BASE_IMAGE
 
-FROM ${REGISTRY}/gaudi-docker/${VERSION}/${DIST}/habanalabs/pytorch-installer-2.2.0:${VERSION}-${MINOR_VERSION}
+FROM ${BASE_IMAGE}
 
 # Remove Habana libs(compat etc) in favor of libs installed by the NVIDIA driver
 RUN apt-get --purge -y autoremove habana*
@@ -69,7 +68,7 @@ RUN echo "/usr/lib/habanalabs/" >> /etc/ld.so.conf.d/habanalabs.conf
 RUN ldconfig
 
 LABEL   io.k8s.display-name="HABANA Device Plugin" \
-        vendor="HABANA" \
+        vendor="HABANA LABS" \
         version=${VERSION} \
         image.git-commit="${GIT_COMMIT}" \
         image.created="${BUILD_DATE}" \

Makefile

@@ -22,20 +22,20 @@ IMAGE_NAME := $(REGISTRY)/$(APP_NAME)
 endif
 
 IMAGE_TAG ?= $(VERSION)-$(MINOR_VERSION)
-IMAGE = $(IMAGE_NAME):$(IMAGE_TAG)
 
+# option to ovveride by user request(e.g: CD)
+IMAGE ?= $(IMAGE_NAME):$(IMAGE_TAG)
+BASE_IMAGE ?= ${REGISTRY}/gaudi-docker/${VERSION}/${DIST}/habanalabs/pytorch-installer-2.2.2:${VERSION}-${MINOR_VERSION}
 
 .PHONY: build push
 
 ## build: build docker image
-build: 
+build:
 	$(DOCKER) build \
 	-t $(IMAGE) \
 	--build-arg BUILD_REF=$(IMAGE_TAG) \
-	--build-arg REGISTRY=$(REGISTRY) \
+	--build-arg BASE_IMAGE=$(BASE_IMAGE) \
 	--build-arg VERSION="$(VERSION)" \
-	--build-arg MINOR_VERSION="$(MINOR_VERSION)" \
-	--build-arg DIST="$(DIST)" \
 	--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
 	--build-arg GIT_COMMIT="$(GIT_COMMIT)" \
 	--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \

README.md

@@ -39,12 +39,12 @@ To build and run using a docker, employ the following options according to your
 
 - To pull the prebuilt image, run:
 ```shell
-$ docker pull vault.habana.ai/docker-k8s-device-plugin/docker-k8s-device-plugin:1.15.0
+$ docker pull vault.habana.ai/docker-k8s-device-plugin/docker-k8s-device-plugin:1.16.0
 ```
 
 - To build without cloning the repository, run:
 ```shell
-$ docker build -t vault.habana.ai/docker-k8s-device-plugin:devel -f Dockerfile https://github.com/HabanaAI/habanalabs-k8s-device-plugin.git#1.15.0
+$ docker build -t vault.habana.ai/docker-k8s-device-plugin:devel -f Dockerfile https://github.com/HabanaAI/habanalabs-k8s-device-plugin.git#1.16.0
 ```
 
 - To modify the code, run: 

examples/hl-smi-test.yml

@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: app
-    image: vault.habana.ai/gaudi-docker/1.15.0/ubuntu22.04/habanalabs/pytorch-installer-2.2.0:1.15.0-479
+    image: vault.habana.ai/gaudi-docker/1.16.0/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:1.16.0-526
     command: ["/bin/bash"]
     args: ["-c", "hl-smi"]
     resources:

go.sum

@@ -25,6 +25,8 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/HabanaAI/gohlml v1.14.0 h1:WqBvqSXhEFePIR4jrjwRZ5jbsN57mgZzynX+IdbdeVQ=
+github.com/HabanaAI/gohlml v1.14.0/go.mod h1:qTkZioKexti1OaC/JT+i4EiCxt4iBJUQezrXa15hbfc=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=

versions.mk

@@ -16,8 +16,8 @@ APP_NAME := docker-k8s-device-plugin
 
 REGISTRY ?= vault.habana.ai
 
-VERSION ?= 1.15.0
-MINOR_VERSION ?= 479
+VERSION ?= 1.16.0
+MINOR_VERSION ?= 526
 DIST ?= ubuntu22.04
 
 GOLANG_VERSION ?= 1.21.5