diff --git a/device-plugins-for-kubernetes/Makefile b/device-plugins-for-kubernetes/Makefile index 014a0e6..c3c6154 100644 --- a/device-plugins-for-kubernetes/Makefile +++ b/device-plugins-for-kubernetes/Makefile @@ -4,7 +4,7 @@ BINARY_NAME ?= device-plugin PKG_LIST := $(shell go list ./... | grep -v /vendor/) DOCKER_REPO ?= localhost:5000 -BUILD_NAME ?= mf-$(BINARY_NAME) +BUILD_NAME ?= intel-idv-$(BINARY_NAME) HELM_CHART_NAME ?= mdp BUILD_VERSION ?= v1 DOCKER_IMAGE ?= $(DOCKER_REPO)/$(BUILD_NAME):$(BUILD_VERSION) diff --git a/device-plugins-for-kubernetes/README.md b/device-plugins-for-kubernetes/README.md index afb03a9..5b5582f 100644 --- a/device-plugins-for-kubernetes/README.md +++ b/device-plugins-for-kubernetes/README.md @@ -132,7 +132,7 @@ To consume the custom resources, define them in your pod's resource requests. apiVersion: v1 kind: Pod metadata: - name: mvf-test-pod + name: intel-idv-test-pod spec: containers: - name: test-container diff --git a/device-plugins-for-kubernetes/build.sh b/device-plugins-for-kubernetes/build.sh index 20079ad..6bb199a 100755 --- a/device-plugins-for-kubernetes/build.sh +++ b/device-plugins-for-kubernetes/build.sh @@ -51,7 +51,7 @@ fi # Build the device plugin echo "Building the device plugin..." rm -f device-plugin -CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o device-plugin cmd/main.go +CGO_ENABLED=0 GOOS=linux GOARCH=amd64 BUILD_VERSION=$VER go build -o device-plugin cmd/main.go if [[ $? -ne 0 ]]; then echo "Error: Failed to build the device plugin" exit 1 @@ -59,7 +59,7 @@ fi # Build the Docker image echo "Building the Docker image..." -docker build --no-cache -t "$DOCKER_REPO/mf-device-plugin:$VER" . +docker build --no-cache -t "$DOCKER_REPO/intel-idv-device-plugin:$VER" . if [[ $? -ne 0 ]]; then echo "Error: Failed to build the Docker image" exit 1 @@ -68,7 +68,7 @@ fi # Push the Docker image if --push is specified if [[ $PUSH == "true" ]]; then echo "Pushing the Docker image to the repository..." - ! docker push "$DOCKER_REPO/mf-device-plugin:$VER" + ! docker push "$DOCKER_REPO/intel-idv-device-plugin:$VER" if [[ $? -ne 0 ]]; then echo "Error: Failed to push the Docker image" exit 1 @@ -76,6 +76,8 @@ if [[ $PUSH == "true" ]]; then fi # Update the deployment manifest with the newly built image version -perl -p -i -e "s|image:.*mf-device-plugin:.*$|image: '$DOCKER_REPO/mf-device-plugin:$VER'|g" deploy/manifests/maverikflats-device-plugin.yaml +perl -p -i -e "s|image:.*intel-idv-device-plugin:.*$|image: '$DOCKER_REPO/intel-idv-device-plugin:$VER'|g" deploy/manifests/intel-idv-device-plugin.yaml +perl -p -i -e "s|repository:.*$|repository: $DOCKER_REPO/intel-idv-device-plugin|g" deploy/helm/intel-idv-device-plugin/values.yaml +perl -p -i -e "s|tag:.*$|tag: \"$VER\"|g" deploy/helm/intel-idv-device-plugin/values.yaml echo "Build successful." diff --git a/device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/.helmignore b/device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/.helmignore similarity index 100% rename from device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/.helmignore rename to device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/.helmignore diff --git a/device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/Chart.yaml b/device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/Chart.yaml similarity index 100% rename from device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/Chart.yaml rename to device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/Chart.yaml diff --git a/device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/templates/_helpers.tpl b/device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/templates/_helpers.tpl similarity index 100% rename from device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/templates/_helpers.tpl rename to device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/templates/_helpers.tpl diff --git a/device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/templates/daemonset-device-plugin.yml b/device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/templates/daemonset-device-plugin.yml similarity index 97% rename from device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/templates/daemonset-device-plugin.yml rename to device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/templates/daemonset-device-plugin.yml index 1d08fb6..f9dad1b 100644 --- a/device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/templates/daemonset-device-plugin.yml +++ b/device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/templates/daemonset-device-plugin.yml @@ -77,8 +77,8 @@ spec: - name: usb-mount mountPath: /dev/bus/usb containers: - {{- if .Values.mvfPluginEnabled }} - - name: mvf-device-plugin + {{- if .Values.intelIdvPluginEnabled }} + - name: intel-idv-device-plugin image: {{ include "maverikflats-device-plugin.fullimage" . }} imagePullPolicy: Always volumeMounts: @@ -114,4 +114,4 @@ spec: - name: usb-mount hostPath: path: /dev/bus/usb -{{- end }} \ No newline at end of file +{{- end }} diff --git a/device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/values.yaml b/device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/values.yaml new file mode 100644 index 0000000..278f786 --- /dev/null +++ b/device-plugins-for-kubernetes/deploy/helm/intel-idv-device-plugin/values.yaml @@ -0,0 +1,8 @@ +devicePlugin: + enabled: true +image: + repository: localhost:5000/intel-idv-device-plugin + tag: "v1" +intelIdvPluginEnabled: true +userId: "107" +groupId: "107" diff --git a/device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/values.yaml b/device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/values.yaml deleted file mode 100644 index f5de879..0000000 --- a/device-plugins-for-kubernetes/deploy/helm/maverikflats-device-plugin/values.yaml +++ /dev/null @@ -1,8 +0,0 @@ -devicePlugin: - enabled: true -image: - repository: localhost:5000/mf-device-plugin - tag: "v1" -mvfPluginEnabled: true -userId: "107" -groupId: "107" diff --git a/device-plugins-for-kubernetes/deploy/manifests/maverikflats-device-plugin.yaml b/device-plugins-for-kubernetes/deploy/manifests/intel-idv-device-plugin.yaml similarity index 97% rename from device-plugins-for-kubernetes/deploy/manifests/maverikflats-device-plugin.yaml rename to device-plugins-for-kubernetes/deploy/manifests/intel-idv-device-plugin.yaml index fcf4913..e659229 100644 --- a/device-plugins-for-kubernetes/deploy/manifests/maverikflats-device-plugin.yaml +++ b/device-plugins-for-kubernetes/deploy/manifests/intel-idv-device-plugin.yaml @@ -73,8 +73,8 @@ spec: - name: usb-mount mountPath: /dev/bus/usb containers: - - name: mvf-device-plugin - image: 'localhost:5000/mf-device-plugin:v1' + - name: intel-idv-device-plugin + image: 'localhost:5000/intel-idv-device-plugin:v1' imagePullPolicy: Always volumeMounts: - name: device-plugin diff --git a/device-plugins-for-kubernetes/go.mod b/device-plugins-for-kubernetes/go.mod index 584a32c..fbc26b8 100644 --- a/device-plugins-for-kubernetes/go.mod +++ b/device-plugins-for-kubernetes/go.mod @@ -1,17 +1,17 @@ module device-plugin -go 1.24.1 +go 1.24.4 require ( - google.golang.org/grpc v1.71.0 - k8s.io/kubelet v0.32.2 + google.golang.org/grpc v1.73.0 + k8s.io/kubelet v0.33.2 ) require ( github.com/gogo/protobuf v1.3.2 // indirect - golang.org/x/net v0.38.0 // indirect - golang.org/x/sys v0.31.0 // indirect - golang.org/x/text v0.23.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/protobuf v1.36.4 // indirect + golang.org/x/net v0.41.0 // indirect + golang.org/x/sys v0.33.0 // indirect + golang.org/x/text v0.26.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect + google.golang.org/protobuf v1.36.6 // indirect ) diff --git a/device-plugins-for-kubernetes/go.sum b/device-plugins-for-kubernetes/go.sum index fe5c4fd..dcbcf38 100644 --- a/device-plugins-for-kubernetes/go.sum +++ b/device-plugins-for-kubernetes/go.sum @@ -6,8 +6,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -16,16 +16,16 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= -go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= -go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= -go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= -go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= -go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= -go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= -go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= -go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= -go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= +go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ= +go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= +go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M= +go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= +go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY= +go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg= +go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o= +go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= +go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs= +go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -35,20 +35,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= +golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -57,11 +57,11 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg= -google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec= -google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= -google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= -k8s.io/kubelet v0.32.2 h1:WFTSYdt3BB1aTApDuKNI16x/4MYqqX8WBBBBh3KupDg= -k8s.io/kubelet v0.32.2/go.mod h1:cC1ms5RS+lu0ckVr6AviCQXHLSPKEBC3D5oaCBdTGkI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok= +google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +k8s.io/kubelet v0.33.2 h1:wxEau5/563oJb3j3KfrCKlNWWx35YlSgDLOYUBCQ0pg= +k8s.io/kubelet v0.33.2/go.mod h1:way8VCDTUMiX1HTOvJv7M3xS/xNysJI6qh7TOqMe5KM=