Merge branch 'main' into usr/meggm/one-click

.github/CODEOWNERS

@@ -5,28 +5,18 @@
 
 # These are the default owners for the code and will
 # be requested for review when someone opens a pull request.
+# order is alphabetical for easier maintenance.
 #
 # Aaron Tye (atye)
-# Alexander Hoppe (hoppea2)
-# Alik Saring (alikdell)
-# AnandatDell (anandrajak1)
-# Bowen Jiang (bjiang27)
+# Aly Nathoo (anathoodell)
 # Chiman Jain (chimanjain)
-# Don Khan (donatwork)
 # Evgeny Uglov (EvgenyUglov)
-# Florian Coulombel (coulof)
 # Harish H  (HarishH-DELL)
-# Harsha Yalamanchili (harshaatdell)
 # Nitesh Rewatkar (nitesh3108)
+# Oleksandr Babiychuk (alexemc)
 # Rajendra Indukuri (rajendraindukuri)
-# Sean Gallacher (gallacher)
-# Shefali Malhotra (shefali-malhotra)
-# Sharmila Ramamoorthy (sharmilarama)
 # Shayna Finocchiaro (shaynafinocchiaro)
 # Spandita Panigrahi (panigs7)
-# Trevor Dawe (tdawe)
-
 
 # for all files:
-* @atye @hoppea2 @alikdell @anandrajak1 @bjiang27 @chimanjain @donatwork @EvgenyUglov @coulof @HarishH-DELL @harshaatdell @nitesh3108 @rajendraindukuri @gallacher @shefali-malhotra @sharmilarama @shaynafinocchiaro @panigs7 @tdawe
-
+* @atye @anathoodell @chimanjain @EvgenyUglov @HarishH-DELL @nitesh3108 @alexemc @rajendraindukuri @shaynafinocchiaro @panigs7

.github/workflows/actions.yml

@@ -34,9 +34,7 @@ jobs:
         run: go mod download
       - name: Build csm-metrics-powerstore Docker Image
         run: |
-          chmod +x ./scripts/build_ubi_micro.sh
-          make build-base-image
-          podman build -t docker.io/csm-metrics-powerstore -f ./Dockerfile --build-arg GOIMAGE=golang:latest --build-arg BASEIMAGE="localhost/mpst-ubimicro"
+          podman build -t docker.io/csm-metrics-powerstore -f ./Dockerfile --build-arg GOIMAGE=golang:latest --build-arg BASEIMAGE="quay.io/dell/container-storage-modules/csm-base-image:nightly"
           podman save docker.io/library/csm-metrics-powerstore -o /tmp/csm-metrics-powerstore.tar
           docker load -i /tmp/csm-metrics-powerstore.tar
       - name: Run Trivy action

Makefile

@@ -14,7 +14,7 @@ help:
 	@echo
 
 .PHONY: build
-build: 
+build:
 	@$(foreach svc,$(shell ls cmd), CGO_ENABLED=0 GOOS=linux go build -o ./cmd/${svc}/bin/service ./cmd/${svc}/;)
 
 .PHONY: clean
@@ -29,18 +29,10 @@ generate:
 test:
 	go test -count=1 -cover -race -timeout 30s -short ./...
 
-.PHONY: build-base-image
-build-base-image: download-csm-common
-	$(eval include csm-common.mk)
-	@echo "Building base image from $(DEFAULT_BASEIMAGE) and loading dependencies..."
-	./scripts/build_ubi_micro.sh $(DEFAULT_BASEIMAGE)
-	@echo "Base image build: SUCCESS"
-	$(eval BASEIMAGE=mpst-ubimicro:latest)
-
-# Pre-requisites: RHEL, buildah, podman
 .PHONY: podman
-podman: build-base-image
-	podman build $(NOCACHE) -t csm-metrics-powerstore -f Dockerfile --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) .
+podman: download-csm-common
+	$(eval include csm-common.mk)
+	podman build --pull $(NOCACHE) -t csm-metrics-powerstore -f Dockerfile --build-arg BASEIMAGE=$(CSM_BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) .
 
 .PHONY: podman-no-cache
 podman-no-cache: