Merge pull request #56 from Cray-HPE/rename

renamed repo

.version

@@ -1 +1 @@
-1.18.0
+1.18.1

CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 These are changes to charts in support of:
 
+## [1.18.1] - 2023-01-12
+
+### Changed
+
+- Renamed the repo to hms-hmnfd, made some build changes to support M1 Mac (ARM).
+
 ## [1.18.0] - 2022-07-19
 
 ### Changed
@@ -194,7 +200,7 @@ These are changes to charts in support of:
 
 ## [1.4.2] - 2020-08-12
 
-- CASMHMS-2957 - Updated hms-hmi-nfd to use the latest trusted baseOS images.
+- CASMHMS-2957 - Updated hms-hmnfd to use the latest trusted baseOS images.
 
 ## [1.4.1] - 2020-06-30
 

Dockerfile

@@ -38,14 +38,14 @@ FROM build-base AS base
 RUN go env -w GO111MODULE=auto
 
 # Copy all the necessary files to the image.
-COPY cmd $GOPATH/src/github.com/Cray-HPE/hms-hmi-nfd/cmd
-COPY vendor $GOPATH/src/github.com/Cray-HPE/hms-hmi-nfd/vendor
+COPY cmd $GOPATH/src/github.com/Cray-HPE/hms-hmnfd/cmd
+COPY vendor $GOPATH/src/github.com/Cray-HPE/hms-hmnfd/vendor
 
 
 ### Build Stage ###
 FROM base AS builder
 
-RUN set -ex && go build -v -tags musl -i -o /usr/local/bin/hmnfd github.com/Cray-HPE/hms-hmi-nfd/cmd/hmi-nfd
+RUN set -ex && go build -v -tags musl -i -o /usr/local/bin/hmnfd github.com/Cray-HPE/hms-hmnfd/cmd/hmi-nfd
 
 
 ### Final Stage ###

Dockerfile.testing.unit.Dockerfile

@@ -38,8 +38,8 @@ FROM build-base AS base
 RUN go env -w GO111MODULE=auto
 
 # Copy all the necessary files to the image.
-COPY cmd $GOPATH/src/github.com/Cray-HPE/hms-hmi-nfd/cmd
-COPY vendor $GOPATH/src/github.com/Cray-HPE/hms-hmi-nfd/vendor
+COPY cmd $GOPATH/src/github.com/Cray-HPE/hms-hmnfd/cmd
+COPY vendor $GOPATH/src/github.com/Cray-HPE/hms-hmnfd/vendor
 
 
 ### Unit test Stage ###
@@ -50,4 +50,4 @@ WORKDIR /go
 # tags -musl ::: It's for the confluent kafka Go package, which uses some funky library that is required to explicitly be linked in.
 # if you take this out, it will break!
 # Run unit tests.
-CMD ["sh", "-c", "go test -cover -tags musl -v github.com/Cray-HPE/hms-hmi-nfd/..."]
+CMD ["sh", "-c", "go test -cover -tags musl -v github.com/Cray-HPE/hms-hmnfd/..."]

HMNFD_Design.md

@@ -162,7 +162,7 @@ This will build a Docker container image tagged with the current version
 #### Building An HMNFD binary
 
 ```
-$ cd cmd/hms-hmi-nfd
+$ cd cmd/hms-hmnfd
 $ go build -mod=vendor -o hmnfd
 ```
 

Makefile

@@ -28,7 +28,7 @@ DOCKER_IMAGE ?= ${NAME}:${VERSION}
 all: image unittest integration snyk ct ct_image
 
 image:
-	docker build ${NO_CACHE} --pull ${DOCKER_ARGS} --tag '${DOCKER_IMAGE}' .
+	docker buildx build --platform linux/amd64 ${NO_CACHE} --pull ${DOCKER_ARGS} --tag '${NAME}:${VERSION}' .
 
 unittest:
 	./runUnitTest.sh

README.md

@@ -162,7 +162,7 @@ This will build a Docker container image tagged with the current version
 #### Building An HMNFD binary
 
 ```
-$ cd cmd/hms-hmi-nfd
+$ cd cmd/hms-hmnfd
 $ go build -mod=vendor -o hmnfd
 ```
 

docker-compose.test.ct.yaml

@@ -39,6 +39,7 @@ services:
   #    - hmnfd
   cray-hmnfd:
     hostname: cray-hmnfd
+    platform: linux/amd64
     build:
       context: .
       dockerfile: Dockerfile

docker-compose.test.unit.yaml

@@ -8,5 +8,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.testing.unit.Dockerfile
+    platform: linux/amd64
     networks:
       - hmnfd

go.mod

@@ -1,4 +1,4 @@
-module github.com/Cray-HPE/hms-hmi-nfd
+module github.com/Cray-HPE/hms-hmnfd
 
 go 1.16
 

test/integration/docker-compose.yaml

@@ -55,6 +55,7 @@ services:
     build:
       context: ../../
       dockerfile: Dockerfile
+    platform: linux/amd64
     environment:
       - DEBUG=3
       - SM_URL=http://cray-smd:27779/hsm/v2