Skip to content

Commit f1a1bab

Browse files
jackfrancisjackfrancis
committed
add test-build-tags make target
Signed-off-by: Jack Francis <[email protected]>
1 parent 5458e1c commit f1a1bab

20 files changed

+36
-23
lines changed

‎cluster-autoscaler/Makefile

+11
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ GOOS?=linux
99
GOARCH?=$(shell go env GOARCH)
1010
REGISTRY?=staging-k8s.gcr.io
1111
DOCKER_NETWORK?=default
12+
SUPPORTED_BUILD_TAGS=$(shell ls cloudprovider/builder/ | grep -e '^builder_.*\.go' | sed 's/builder_\(.*\)\.go/\1/')
1213
ifdef BUILD_TAGS
1314
TAGS_FLAG=--tags ${BUILD_TAGS}
1415
PROVIDER=-${BUILD_TAGS}
@@ -42,6 +43,16 @@ build:
4243
build-arch-%: clean-arch-%
4344
$(ENVVAR) GOOS=$(GOOS) GOARCH=$* go build -o cluster-autoscaler-$* ${LDFLAGS_FLAG} ${TAGS_FLAG}
4445

46+
test-build-tags:
47+
@if [ -z "$(SUPPORTED_BUILD_TAGS)" ]; then \
48+
echo "No supported build tags found"; \
49+
exit 1; \
50+
fi
51+
@for tag in $(SUPPORTED_BUILD_TAGS); do \
52+
echo "Testing build with tag $$tag"; \
53+
BUILD_TAGS=$$tag $(MAKE) build || exit 1; \
54+
done
55+
4556
test-unit: clean build
4657
go test --test.short -race ./... ${TAGS_FLAG}
4758

‎cluster-autoscaler/cloudprovider/builder/builder_all.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build !gce && !aws && !azure && !kubemark && !alicloud && !magnum && !digitalocean && !clusterapi && !huaweicloud && !ionoscloud && !linode && !hetzner && !bizflycloud && !brightbox && !equinixmetal && !oci && !vultr && !tencentcloud && !scaleway && !externalgrpc && !civo && !rancher && !volcengine && !baiducloud && !cherry && !cloudstack && !exoscale && !kamatera && !ovhcloud
2-
// +build !gce,!aws,!azure,!kubemark,!alicloud,!magnum,!digitalocean,!clusterapi,!huaweicloud,!ionoscloud,!linode,!hetzner,!bizflycloud,!brightbox,!equinixmetal,!oci,!vultr,!tencentcloud,!scaleway,!externalgrpc,!civo,!rancher,!volcengine,!baiducloud,!cherry,!cloudstack,!exoscale,!kamatera,!ovhcloud
1+
//go:build !gce && !aws && !azure && !kubemark && !alicloud && !magnum && !digitalocean && !clusterapi && !huaweicloud && !ionoscloud && !linode && !hetzner && !bizflycloud && !brightbox && !equinixmetal && !oci && !vultr && !tencentcloud && !scaleway && !externalgrpc && !civo && !rancher && !volcengine && !baiducloud && !cherry && !cloudstack && !exoscale && !kamatera && !ovhcloud && !kwok
2+
// +build !gce,!aws,!azure,!kubemark,!alicloud,!magnum,!digitalocean,!clusterapi,!huaweicloud,!ionoscloud,!linode,!hetzner,!bizflycloud,!brightbox,!equinixmetal,!oci,!vultr,!tencentcloud,!scaleway,!externalgrpc,!civo,!rancher,!volcengine,!baiducloud,!cherry,!cloudstack,!exoscale,!kamatera,!ovhcloud,!kwok
33

44
/*
55
Copyright 2018 The Kubernetes Authors.

‎cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.BizflyCloudProviderName,
3232
}
3333

34-
// DefaultCloudProvider build is Bizflycloud..
34+
// DefaultCloudProvider for Bizflycloud-only build is Bizflycloud.
3535
const DefaultCloudProvider = cloudprovider.BizflyCloudProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_brightbox.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.BrightboxProviderName,
3232
}
3333

34-
// DefaultCloudProvider is Brightbox
34+
// DefaultCloudProvider for Brightbox-only build is Brightbox.
3535
const DefaultCloudProvider = cloudprovider.BrightboxProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_cherry.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cherry.ProviderName,
3232
}
3333

34-
// DefaultCloudProvider for Cherry-only build is Cherry
34+
// DefaultCloudProvider for Cherry-only build is Cherry.
3535
const DefaultCloudProvider = cherry.ProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_civo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.CivoProviderName,
3232
}
3333

34-
// DefaultCloudProvider for civo-only build is Civo.
34+
// DefaultCloudProvider for Civo-only build is Civo.
3535
const DefaultCloudProvider = cloudprovider.CivoProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
3434
// DefaultCloudProvider for cloudstack-only build is cloudstack.
3535
const DefaultCloudProvider = cloudprovider.CloudStackProviderName
3636

37-
func BuildCloudStack(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
37+
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
3838
switch opts.CloudProviderName {
3939
case cloudprovider.CloudStackProviderName:
4040
return cloudstack.BuildCloudStack(opts, do, rl)

‎cluster-autoscaler/cloudprovider/builder/builder_clusterapi.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.ClusterAPIProviderName,
3232
}
3333

34-
// DefaultCloudProvider for machineapi-only build.
34+
// DefaultCloudProvider for Cluster API-only build is Cluster API.
3535
const DefaultCloudProvider = cloudprovider.ClusterAPIProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ import (
2626
"k8s.io/client-go/informers"
2727
)
2828

29-
// AvailableCloudProviders supported by the digtalocean cloud provider builder.
29+
// AvailableCloudProviders supported by the DigitalOcean cloud provider builder.
3030
var AvailableCloudProviders = []string{
3131
cloudprovider.DigitalOceanProviderName,
3232
}
3333

34-
// DefaultCloudProvider for do-only build is DigitalOcean.
34+
// DefaultCloudProvider for DigitalOcean-only build is DigitalOcean.
3535
const DefaultCloudProvider = cloudprovider.DigitalOceanProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_packet.go ‎cluster-autoscaler/cloudprovider/builder/builder_equinixmetal.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var AvailableCloudProviders = []string{
3232
cloudprovider.EquinixMetalProviderName,
3333
}
3434

35-
// DefaultCloudProvider for Packet-only build is Packet.
35+
// DefaultCloudProvider for Packet or Equinix Metal-only build is Equinix Metal.
3636
const DefaultCloudProvider = cloudprovider.EquinixMetalProviderName
3737

3838
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_exoscale.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.ExoscaleProviderName,
3232
}
3333

34-
// DefaultCloudProvider is Exoscale.
34+
// DefaultCloudProvider for Exoscale-only build is Exoscale.
3535
const DefaultCloudProvider = cloudprovider.ExoscaleProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_gce.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.GceProviderName,
3232
}
3333

34-
// DefaultCloudProvider is GCE.
34+
// DefaultCloudProvider for GCE-only build is GCE.
3535
const DefaultCloudProvider = cloudprovider.GceProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_hetzner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.HetznerProviderName,
3232
}
3333

34-
// DefaultCloudProvider is Hetzner.
34+
// DefaultCloudProvider for Hetzner-only build is Hetzner.
3535
const DefaultCloudProvider = cloudprovider.HetznerProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.IonoscloudProviderName,
3232
}
3333

34-
// DefaultCloudProvider for IonosCloud-only build is ionoscloud.
34+
// DefaultCloudProvider for IonosCloud-only build is IonosCloud.
3535
const DefaultCloudProvider = cloudprovider.IonoscloudProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_kamatera.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.KamateraProviderName,
3232
}
3333

34-
// DefaultCloudProvider is Kamatera.
34+
// DefaultCloudProvider for Kamatera-only build is Kamatera.
3535
const DefaultCloudProvider = cloudprovider.KamateraProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_magnum.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.MagnumProviderName,
3232
}
3333

34-
// DefaultCloudProvider for OpenStack-only build is OpenStack.
34+
// DefaultCloudProvider for Magnum-only build is Magnum.
3535
const DefaultCloudProvider = cloudprovider.MagnumProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package builder
2121

2222
import (
2323
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
24+
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/ovhcloud"
2425
"k8s.io/autoscaler/cluster-autoscaler/config"
2526
"k8s.io/client-go/informers"
2627
)
@@ -30,7 +31,7 @@ var AvailableCloudProviders = []string{
3031
cloudprovider.OVHcloudProviderName,
3132
}
3233

33-
// DefaultCloudProvider is OVHcloud.
34+
// DefaultCloudProvider for OVHcloud-only build is OVHcloud.
3435
const DefaultCloudProvider = cloudprovider.OVHcloudProviderName
3536

3637
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_scaleway.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.ScalewayProviderName,
3232
}
3333

34-
// DefaultCloudProvider for do-only build is Scaleway.
34+
// DefaultCloudProvider for Scaleway-only build is Scaleway.
3535
const DefaultCloudProvider = cloudprovider.ScalewayProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {

‎cluster-autoscaler/cloudprovider/builder/builder_tencentcloud.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ var AvailableCloudProviders = []string{
3131
cloudprovider.TencentcloudProviderName,
3232
}
3333

34-
// DefaultCloudProvider is TKE.
35-
const DefaultCloudProvider = cloudprovider.TkeProviderName
34+
// DefaultCloudProvider for Tencent-only build is Tencent.
35+
const DefaultCloudProvider = cloudprovider.TencentcloudProviderName
3636

3737
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
3838
switch opts.CloudProviderName {

‎cluster-autoscaler/cloudprovider/builder/builder_vultr.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package builder
2121

2222
import (
2323
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
24+
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/vultr"
2425
"k8s.io/autoscaler/cluster-autoscaler/config"
2526
"k8s.io/client-go/informers"
2627
)
@@ -30,13 +31,13 @@ var AvailableCloudProviders = []string{
3031
cloudprovider.VultrProviderName,
3132
}
3233

33-
// DefaultCloudProvider for linode-only build is linode.
34+
// DefaultCloudProvider for vultr-only build is vultr.
3435
const DefaultCloudProvider = cloudprovider.VultrProviderName
3536

3637
func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
3738
switch opts.CloudProviderName {
3839
case cloudprovider.VultrProviderName:
39-
return vultr.BuildLinode(opts, do, rl)
40+
return vultr.BuildVultr(opts, do, rl)
4041
}
4142

4243
return nil

0 commit comments

Comments
 (0)