diff --git a/cmd/cloud-controller-manager/BUILD b/cmd/cloud-controller-manager/BUILD index 25ca34efcd2..801c6b260c0 100644 --- a/cmd/cloud-controller-manager/BUILD +++ b/cmd/cloud-controller-manager/BUILD @@ -16,7 +16,10 @@ go_binary( go_library( name = "go_default_library", - srcs = ["controller-manager.go"], + srcs = [ + "controller-manager.go", + "providers.go", + ], importpath = "k8s.io/kubernetes/cmd/cloud-controller-manager", deps = [ "//cmd/cloud-controller-manager/app:go_default_library", diff --git a/cmd/cloud-controller-manager/controller-manager.go b/cmd/cloud-controller-manager/controller-manager.go index e2d81b2d668..3e5055ded74 100644 --- a/cmd/cloud-controller-manager/controller-manager.go +++ b/cmd/cloud-controller-manager/controller-manager.go @@ -27,15 +27,8 @@ import ( "k8s.io/component-base/logs" "k8s.io/kubernetes/cmd/cloud-controller-manager/app" - _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration - // NOTE: Importing all in-tree cloud-providers is not required when - // implementing an out-of-tree cloud-provider. _ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins - _ "k8s.io/legacy-cloud-providers/aws" - _ "k8s.io/legacy-cloud-providers/azure" - _ "k8s.io/legacy-cloud-providers/gce" - _ "k8s.io/legacy-cloud-providers/openstack" - _ "k8s.io/legacy-cloud-providers/vsphere" + _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration ) func main() { diff --git a/cmd/cloud-controller-manager/providers.go b/cmd/cloud-controller-manager/providers.go new file mode 100644 index 00000000000..91a74e758d3 --- /dev/null +++ b/cmd/cloud-controller-manager/providers.go @@ -0,0 +1,32 @@ +// +build !providerless + +/* +Copyright 2020 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// The external controller manager is responsible for running controller loops that +// are cloud provider dependent. It uses the API to listen to new events on resources. + +package main + +import ( + // NOTE: Importing all in-tree cloud-providers is not required when + // implementing an out-of-tree cloud-provider. + _ "k8s.io/legacy-cloud-providers/aws" + _ "k8s.io/legacy-cloud-providers/azure" + _ "k8s.io/legacy-cloud-providers/gce" + _ "k8s.io/legacy-cloud-providers/openstack" + _ "k8s.io/legacy-cloud-providers/vsphere" +) diff --git a/pkg/cloudprovider/providers/providers_test.go b/pkg/cloudprovider/providers/providers_test.go index 69ff45e9841..8b6599f8fe6 100644 --- a/pkg/cloudprovider/providers/providers_test.go +++ b/pkg/cloudprovider/providers/providers_test.go @@ -1,3 +1,5 @@ +// +build !providerless + /* Copyright 2019 The Kubernetes Authors. diff --git a/pkg/controller/nodeipam/node_ipam_controller_test.go b/pkg/controller/nodeipam/node_ipam_controller_test.go index 1b435f4ab73..117e7709f73 100644 --- a/pkg/controller/nodeipam/node_ipam_controller_test.go +++ b/pkg/controller/nodeipam/node_ipam_controller_test.go @@ -1,3 +1,5 @@ +// +build !providerless + /* Copyright 2018 The Kubernetes Authors. @@ -23,7 +25,7 @@ import ( "strings" "testing" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/credentialprovider/azure/BUILD b/pkg/credentialprovider/azure/BUILD index ba9ec88167b..85485c6e26b 100644 --- a/pkg/credentialprovider/azure/BUILD +++ b/pkg/credentialprovider/azure/BUILD @@ -11,6 +11,7 @@ go_library( srcs = [ "azure_acr_helper.go", "azure_credentials.go", + "doc.go", ], importpath = "k8s.io/kubernetes/pkg/credentialprovider/azure", deps = [ diff --git a/pkg/credentialprovider/azure/azure_acr_helper.go b/pkg/credentialprovider/azure/azure_acr_helper.go index 12a2ad3f3b6..347b1658a91 100644 --- a/pkg/credentialprovider/azure/azure_acr_helper.go +++ b/pkg/credentialprovider/azure/azure_acr_helper.go @@ -1,3 +1,5 @@ +// +build !providerless + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/credentialprovider/azure/azure_credentials.go b/pkg/credentialprovider/azure/azure_credentials.go index 74670a3d1f6..f1028882500 100644 --- a/pkg/credentialprovider/azure/azure_credentials.go +++ b/pkg/credentialprovider/azure/azure_credentials.go @@ -1,3 +1,5 @@ +// +build !providerless + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/credentialprovider/azure/azure_credentials_test.go b/pkg/credentialprovider/azure/azure_credentials_test.go index 987c748c1c0..2cda325ade2 100644 --- a/pkg/credentialprovider/azure/azure_credentials_test.go +++ b/pkg/credentialprovider/azure/azure_credentials_test.go @@ -1,3 +1,5 @@ +// +build !providerless + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/credentialprovider/azure/doc.go b/pkg/credentialprovider/azure/doc.go new file mode 100644 index 00000000000..b61f8a238db --- /dev/null +++ b/pkg/credentialprovider/azure/doc.go @@ -0,0 +1,17 @@ +/* +Copyright 2020 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package azure diff --git a/test/typecheck/main.go b/test/typecheck/main.go index 29d74de48dd..37574ad4df2 100644 --- a/test/typecheck/main.go +++ b/test/typecheck/main.go @@ -297,6 +297,7 @@ func main() { errors, err := c.verify(plat) if err != nil { serialFprintf(os.Stderr, "ERROR(%s): failed to verify: %v\n", plat, err) + f = true } else if len(errors) > 0 { for _, e := range errors { // Special case CGo errors which may depend on headers we