chore: updating the base cnms image to reach compliance (#759)

* chore: updating the base cnms image to reach compliance

Author: pjohnst5

Makefile

@@ -128,6 +128,7 @@ CNS_ARCHIVE_NAME = azure-cns-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
 CNMS_ARCHIVE_NAME = azure-cnms-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
 NPM_ARCHIVE_NAME = azure-npm-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
 NPM_IMAGE_ARCHIVE_NAME = azure-npm-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
+CNMS_IMAGE_ARCHIVE_NAME = azure-cnms-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
 TELEMETRY_IMAGE_ARCHIVE_NAME = azure-vnet-telemetry-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
 CNS_IMAGE_ARCHIVE_NAME = azure-cns-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
 
@@ -140,6 +141,9 @@ IMAGE_REGISTRY ?= acnpublic.azurecr.io
 # Azure network policy manager parameters.
 AZURE_NPM_IMAGE ?= $(IMAGE_REGISTRY)/azure-npm
 
+# Azure cnms parameters
+AZURE_CNMS_IMAGE ?= $(IMAGE_REGISTRY)/networkmonitor
+
 # Azure CNI installer parameters
 AZURE_CNI_IMAGE = $(IMAGE_REGISTRY)/azure-cni-manager
 
@@ -315,6 +319,19 @@ endif
 publish-azure-npm-image:
 	docker push $(AZURE_NPM_IMAGE):$(VERSION)
 
+# Build the Azure CNMS image
+.PHONY: azure-cnms-image
+azure-cnms-image: azure-cnms
+ifeq ($(GOOS),linux)
+	docker build \
+	--no-cache \
+	-f cnms/Dockerfile \
+	-t $(AZURE_CNMS_IMAGE):$(VERSION) \
+	--build-arg CNMS_BUILD_DIR=$(CNMS_BUILD_DIR) \
+	.
+	docker save $(AZURE_CNMS_IMAGE):$(VERSION) | gzip -c > $(CNMS_BUILD_DIR)/$(CNMS_IMAGE_ARCHIVE_NAME)
+endif
+
 # Build the Azure vnet telemetry image
 .PHONY: azure-vnet-telemetry-image
 azure-vnet-telemetry-image: azure-vnet-telemetry

cnms/Dockerfile

@@ -1,8 +1,10 @@
-FROM ubuntu:latest
+FROM sbidprod.azurecr.io/quinault:latest
+ARG CNMS_BUILD_DIR
+
 RUN apt -y update
 RUN apt-get -y upgrade
 RUN apt install -y ebtables
 RUN apt install -y net-tools
-COPY azure-cnms /usr/bin/azure-cnms
+COPY $CNMS_BUILD_DIR/azure-cnms /usr/bin/azure-cnms
 RUN chmod +x /usr/bin/azure-cnms
 CMD ["/usr/bin/azure-cnms"]