@@ -24,39 +24,29 @@ SOURCES := Makefile go.mod go.sum $(shell find $(DEST) -name '*.go' 2>/dev/null)
2424HAS_GOX := $(shell command -v gox;)
2525GOX_PARALLEL ?= 3
2626
27- TARGETS ?= linux/amd64 linux/386 linux/arm linux/ arm64 linux/ppc64le linux/s390x
27+ TARGETS ?= linux/amd64 linux/arm64
2828DIST_DIRS = find * -type d -exec
2929
3030TEMP_DIR :=$(shell mktemp -d)
3131TAR_FILE ?= rootfs.tar
3232
3333GOOS ?= $(shell go env GOOS)
3434GOPROXY ?= $(shell go env GOPROXY)
35- VERSION ?= $(shell git describe --dirty --tags --match='v* ')
35+ VERSION ?= $(shell git describe --dirty --tags --match='v* ' --always )
3636GOARCH :=
3737GOFLAGS :=
3838TAGS :=
3939LDFLAGS := "-w -s -X 'k8s.io/component-base/version.gitVersion=$(VERSION ) ' -X 'k8s.io/cloud-provider-openstack/pkg/version.Version=$(VERSION ) '"
4040GOX_LDFLAGS := $(shell echo "$(LDFLAGS ) -extldflags \"-static\"")
4141REGISTRY ?= reg.infra.ske.eu01.stackit.cloud/stackitcloud
42+ GHCR ?= ghcr.io/stackitcloud
4243IMAGE_OS ?= linux
4344IMAGE_NAMES ?= openstack-cloud-controller-manager \
44- cinder-csi-plugin \
45- k8s-keystone-auth \
46- octavia-ingress-controller \
47- manila-csi-plugin \
48- barbican-kms-plugin \
49- magnum-auto-healer
45+ cinder-csi-plugin
5046ARCH ?= amd64
51- ARCHS ?= amd64 arm arm64 ppc64le s390x
47+ ARCHS ?= amd64 arm64
5248BUILD_CMDS ?= openstack-cloud-controller-manager \
53- cinder-csi-plugin \
54- k8s-keystone-auth \
55- octavia-ingress-controller \
56- manila-csi-plugin \
57- barbican-kms-plugin \
58- magnum-auto-healer \
59- client-keystone-auth
49+ cinder-csi-plugin
6050
6151# CTI targets
6252
@@ -172,7 +162,7 @@ build-local-images: $(addprefix build-image-,$(IMAGE_NAMES))
172162push-multiarch-image-% :
173163 $(CONTAINER_ENGINE ) buildx build --output type=registry \
174164 --build-arg VERSION=$(VERSION ) \
175- --tag $(REGISTRY ) /$* :$(VERSION ) \
165+ --tag $(GHCR ) /$* :$(VERSION ) \
176166 --platform $(shell echo $(addprefix linux/,$(ARCHS ) ) | sed 's/ /,/g') \
177167 --target $* \
178168 .
@@ -191,11 +181,6 @@ ifndef HAS_GOX
191181endif
192182 CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/openstack-cloud-controller-manager/
193183 CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/cinder-csi-plugin/
194- CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/k8s-keystone-auth/
195- CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/client-keystone-auth/
196- CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/octavia-ingress-controller/
197- CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/manila-csi-plugin/
198- CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/magnum-auto-healer/
199184
200185.PHONY : dist
201186dist : build-cross
0 commit comments