Fips changes

Author: zulfilee

.github/workflows/spectro-release.yaml

@@ -1,5 +1,5 @@
 name: Spectro Release
-run-name: Release for Cluster API openstack ${{ github.event.inputs.release_version }}
+run-name: Release for Cluster API Openstack ${{ github.event.inputs.release_version }}
 on:
   workflow_dispatch:
     inputs:
@@ -43,16 +43,16 @@ jobs:
         env:
           REGISTRY: gcr.io/spectro-images-public/release/cluster-api-openstack
         run: |
-          make docker-build
-          make docker-push
+          make docker-build-all
+          make docker-push-all
       -
         name: Build Image - FIPS Mode
         env:
           FIPS_ENABLE: yes
           REGISTRY: gcr.io/spectro-images-public/release-fips/cluster-api-openstack
         run: |
-          make docker-build
-          make docker-push
+          make docker-build-all
+          make docker-push-all
       -
         name: Create Release
         id: create_release

Dockerfile

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.19.8 as builder
+FROM golang:1.19.10-alpine3.18 as builder
 WORKDIR /workspace
 
 ARG CRYPTO_LIB
@@ -25,6 +25,9 @@ ENV GOEXPERIMENT=${CRYPTO_LIB:+boringcrypto}
 ARG goproxy=https://proxy.golang.org
 ENV GOPROXY=$goproxy
 
+RUN apk update
+RUN apk add git gcc g++ curl
+
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
@@ -45,10 +48,10 @@ ARG ldflags
 # Do not force rebuild of up-to-date packages (do not use -a) and use the compiler cache folder
 RUN  if [ "${CRYPTO_LIB}" ]; \
       then \
-        CGO_ENABLED=1  GOOS=linux  GOARCH=amd64 GO111MODULE=on go build -ldflags "-linkmode=external -extldflags=-static" -a -o manager "${package}" ; \  
+        CGO_ENABLED=1 GOOS=linux  GOARCH=${ARCH}  GO111MODULE=on go build -ldflags  "-linkmode=external  -extldflags '-static'" -a -o manager ${package}; \
       else \
-        CGO_ENABLED=0  GOARCH=amd64 GO111MODULE=on go build -ldflags "-linkmode=external -extldflags=-static" -a -o manager "${package}" ;\ 
-    fi
+        CGO_ENABLED=0  GOARCH=amd64 GO111MODULE=on go build -ldflags "-extldflags=-static" -a -o manager "${package}" ;\ 
+      fi
 
 
 # Production image

Makefile

@@ -76,7 +76,7 @@ ifeq ($(PODMAN), 1)
 else
 	CONTAINERFILE ?= Dockerfile
 endif
-SPECTRO_VERSION ?= 4.0.0-dev
+
 # Release variables
 SPECTRO_VERSION ?= 4.0.0-dev
 FIPS_ENABLE ?= ""
@@ -97,6 +97,7 @@ RELEASE_DIR := out
 TAG ?= v0.6.2-spectro-${SPECTRO_VERSION}
 ARCH ?= amd64
 #ALL_ARCH ?= amd64 arm arm64 ppc64le s390x
+ALL_ARCH = amd64 
 
 # main controller
 IMAGE_NAME ?= capi-openstack-controller
@@ -259,11 +260,11 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 
 .PHONY: docker-build
 docker-build: docker-pull-prerequisites ## Build the docker image for controller-manager
-	docker build -f $(CONTAINERFILE) --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg LDFLAGS="$(LDFLAGS)" . -t $(CONTROLLER_IMG_TAG)
+	docker build -f $(CONTAINERFILE) --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg LDFLAGS="$(LDFLAGS)" . -t  $(CONTROLLER_IMG)-$(ARCH):$(TAG)
 
 .PHONY: docker-push
 docker-push: ## Push the docker image
-	docker push $(CONTROLLER_IMG_TAG)
+	docker push  $(CONTROLLER_IMG)-$(ARCH):$(TAG)
 
 .PHONY: docker-pull-prerequisites
 docker-pull-prerequisites: