Merge pull request #5577 from mdbooth/issue-5576

🌱 Reduce memory consumption of cluster-api-provider-aws-build-docker

Author: k8s-ci-robot

Makefile

@@ -143,6 +143,12 @@ LDFLAGS := $(shell source ./hack/version.sh; version::ldflags)
 # Set USE_EXISTING_CLUSTER to use an existing kubernetes context
 USE_EXISTING_CLUSTER ?= "false"
 
+# GORELEASER_PARALLELISM restricts the number of tasks goreleaser will run
+# concurrently. The primary reason to do this is to ensure its memory usage
+# remains within the resource limits of the
+# cluster-api-provider-aws-build-docker job
+GORELEASER_PARALLELISM ?= 2
+
 # Set E2E_SKIP_EKS_UPGRADE to false to test EKS upgrades.
 # Warning, this takes a long time
 E2E_SKIP_EKS_UPGRADE ?= "false"
@@ -571,7 +577,7 @@ release: clean-release check-release-tag check-release-branch $(RELEASE_DIR) $(G
 	$(MAKE) release-changelog
 	CORE_CONTROLLER_IMG=$(PROD_REGISTRY)/$(CORE_IMAGE_NAME) $(MAKE) release-manifests
 	$(MAKE) release-policies
-	$(GORELEASER) release --config $(GORELEASER_CONFIG) --release-notes $(RELEASE_DIR)/CHANGELOG.md --clean
+	$(GORELEASER) release --config $(GORELEASER_CONFIG) --release-notes $(RELEASE_DIR)/CHANGELOG.md --clean --parallelism $(GORELEASER_PARALLELISM)
 
 release-policies: $(RELEASE_POLICIES) ## Release policies
 
@@ -606,7 +612,7 @@ promote-images: $(KPROMO) $(YQ)
 
 .PHONY: release-binaries
 release-binaries: $(GORELEASER) ## Builds only the binaries, not a release.
-	GOMAXPROCS=2 $(GORELEASER) build --config $(GORELEASER_CONFIG) --snapshot --clean
+	$(GORELEASER) build --config $(GORELEASER_CONFIG) --snapshot --clean --parallelism $(GORELEASER_PARALLELISM)
 
 .PHONY: release-staging
 release-staging: ## Builds and push container images and manifests to the staging bucket.

pkg/cloud/services/ssm/secret_test.go

@@ -178,7 +178,7 @@ func TestServiceCreate(t *testing.T) {
 			expectedPrefix: "/prefix",
 			wantErr:        true,
 			expect: func(m *mock_ssmiface.MockSSMAPIMockRecorder) {
-				m.PutParameter(context.TODO(), gomock.AssignableToTypeOf(&ssm.PutParameterInput{})).Return(nil, &mockAPIError{
+				m.PutParameter(context.TODO(), gomock.AssignableToTypeOf(&ssm.PutParameterInput{})).MinTimes(1).Return(nil, &mockAPIError{
 					"ParameterAlreadyExists",
 					"parameter already exists"}).Do(
 					func(ctx context.Context, putParameterInput *ssm.PutParameterInput, optFns ...func(*ssm.Options)) {
@@ -211,7 +211,7 @@ func TestServiceCreate(t *testing.T) {
 			secretPrefix:   "",
 			expectedPrefix: "/cluster.x-k8s.io",
 			expect: func(m *mock_ssmiface.MockSSMAPIMockRecorder) {
-				m.PutParameter(context.TODO(), gomock.AssignableToTypeOf(&ssm.PutParameterInput{})).Return(nil, &mockAPIError{
+				m.PutParameter(context.TODO(), gomock.AssignableToTypeOf(&ssm.PutParameterInput{})).MinTimes(1).Return(nil, &mockAPIError{
 					"ParameterLimitExceeded",
 					"parameter limit exceeded"})
 			},