From 5e9f23c7da0dabe98f0b28b4b63c5c965ddf0c40 Mon Sep 17 00:00:00 2001 From: Alan Moran Date: Wed, 28 Aug 2024 18:12:07 +0200 Subject: [PATCH] Update app autoscaler release tools image source to ghcr.io --- ci/autoscaler/tasks/deploy-apps.yml | 2 +- src/autoscaler/.cfignore | 1 + src/autoscaler/Makefile | 8 +------- src/autoscaler/mta.yaml | 11 ++++++++--- 4 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 src/autoscaler/.cfignore diff --git a/ci/autoscaler/tasks/deploy-apps.yml b/ci/autoscaler/tasks/deploy-apps.yml index d1957f4852..d656afd8d1 100755 --- a/ci/autoscaler/tasks/deploy-apps.yml +++ b/ci/autoscaler/tasks/deploy-apps.yml @@ -4,7 +4,7 @@ platform: linux image_resource: type: registry-image source: - repository: docker.io/bonzofenix/app-autoscaler-release-tools + repository: ghcr.io/cloudfoundry/app-autoscaler-release-tools tag: main diff --git a/src/autoscaler/.cfignore b/src/autoscaler/.cfignore new file mode 100644 index 0000000000..378eac25d3 --- /dev/null +++ b/src/autoscaler/.cfignore @@ -0,0 +1 @@ +build diff --git a/src/autoscaler/Makefile b/src/autoscaler/Makefile index 4e01642ea2..79c59bb7ff 100644 --- a/src/autoscaler/Makefile +++ b/src/autoscaler/Makefile @@ -89,12 +89,6 @@ go-mod-vendor: ${go-vendoring-folder} ${go-vendored-files} ${go-vendoring-folder} ${go-vendored-files} &: ${app-fakes-dir} ${app-fakes-files} go mod vendor -cf-build-%: generate-fakes - @echo "# building for cf $*" - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/$* $*/cmd/$*/main.go - -cf-build: $(addprefix cf-build-,$(binaries)) - # CGO_ENABLED := 1 is required to enforce dynamic linking which is a requirement of dynatrace. build-%: ${openapi-generated-clients-and-servers-dir} ${openapi-generated-clients-and-servers-files} @echo "# building $*" @@ -167,7 +161,7 @@ mta-logs: vim mta-* .PHONY: mta-build -mta-build: mta-build-clean cf-build +mta-build: mta-build-clean mbt build mta-build-clean: diff --git a/src/autoscaler/mta.yaml b/src/autoscaler/mta.yaml index 3b14d94d3f..4f9b597ea2 100644 --- a/src/autoscaler/mta.yaml +++ b/src/autoscaler/mta.yaml @@ -7,8 +7,10 @@ version: 0.0.1 modules: - name: metricsforwarder - type: binary - path: build + type: go + path: . + properties: + GO_INSTALL_PACKAGE_SPEC: code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsforwarder/cmd/metricsforwarder requires: - name: config - name: policydb @@ -18,8 +20,11 @@ modules: disk-quota: 1G instances: 2 stack: cflinuxfs4 - command: ./metricsforwarder routes: + build-parameters: + builder: custom + commands: + - make vendor resources: - name: config