Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit 6bb492a

Browse files
authored
Merge pull request #88 from BlaineEXE/build-tidy
tidy up build and make configs
2 parents 047d710 + 272e366 commit 6bb492a

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Diff for: container-object-storage-interface-controller/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ DOCKER ?= docker
1313
## Platform for 'build'
1414
PLATFORM ?= linux/$(GOARCH)
1515

16-
## Platform list for multi-arch 'buildx' build
17-
BUILDX_PLATFORMS ?= linux/amd64,linux/arm64
18-
1916
## Image tag for all builds
2017
IMAGE_TAG ?= cosi-controller:latest
2118

@@ -25,8 +22,7 @@ IMAGE_TAG ?= cosi-controller:latest
2522
.PHONY: build
2623
## Build local image for development, defaulting linux/<hostarch>
2724
build:
28-
# $(DOCKER) build --platform $(PLATFORM) --tag $(IMAGE_TAG) .
29-
true # return true temporarily to allow prow to succeed
25+
$(DOCKER) build --platform $(PLATFORM) --tag $(IMAGE_TAG) .
3026

3127
.PHONY: test
3228
## Test packages

Diff for: container-object-storage-interface-controller/cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# K8s infra build example: https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/README.md
22
# GCloud build docs: https://cloud.google.com/cloud-build/docs/build-config
3-
# Builds go to https://console.cloud.google.com/gcr/images/k8s-staging-test-infra/global/
3+
# Builds go to https://console.cloud.google.com/gcr/images/k8s-staging-sig-storage/GLOBAL
44
# Build logs in https://testgrid.k8s.io/sig-storage-image-build
55
timeout: 3000s
66
options:

0 commit comments

Comments
 (0)