Skip to content

Commit 4eef54c

Browse files
nckturnernckturner
committed
Initial changes for compatibility with v1.19
- Update go mod - Update imports to k8s.io/cloud-provider - Remove utilflag dependency - Add InstancesV2 to V2 provider impl
1 parent 4a47f84 commit 4eef54c

File tree

5 files changed

+375
-335
lines changed

5 files changed

+375
-335
lines changed

Diff for: ‎Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ GOOS ?= $(shell go env GOOS)
1717
VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
1818
git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
1919
LDFLAGS := "-w -s -X 'main.version=${VERSION}'"
20+
GOPROXY ?=
21+
ifneq ($(GOPROXY),)
22+
GOPROXYFLAG := --build-arg GOPROXY=$(GOPROXY)
23+
endif
2024

2125
IMAGE ?= gcr.io/k8s-staging-provider-aws/cloud-controller-manager:$(VERSION)
2226

@@ -30,7 +34,7 @@ aws-cloud-controller-manager: $(SOURCES)
3034

3135
.PHONY: build
3236
build:
33-
docker build -t $(IMAGE) .
37+
docker build $(GOPROXYFLAG) -t $(IMAGE) .
3438

3539
.PHONY: push
3640
push: build

Diff for: ‎cmd/aws-cloud-controller-manager/main.go

+16-7
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
"time"
3636

3737
"github.com/spf13/cobra"
38+
"github.com/spf13/pflag"
3839

3940
"k8s.io/apimachinery/pkg/util/sets"
4041
"k8s.io/apimachinery/pkg/util/wait"
@@ -47,17 +48,17 @@ import (
4748
"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
4849
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
4950
"k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates
50-
utilflag "k8s.io/kubernetes/pkg/util/flag"
5151
netutils "k8s.io/utils/net"
5252

5353
cloudprovider "k8s.io/cloud-provider"
5454
awsv1 "k8s.io/cloud-provider-aws/pkg/providers/v1"
5555
awsv2 "k8s.io/cloud-provider-aws/pkg/providers/v2"
5656

57+
cloudnodecontroller "k8s.io/cloud-provider/controllers/node"
58+
cloudnodelifecyclecontroller "k8s.io/cloud-provider/controllers/nodelifecycle"
59+
routecontroller "k8s.io/cloud-provider/controllers/route"
60+
servicecontroller "k8s.io/cloud-provider/controllers/service"
5761
cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config"
58-
cloudcontrollers "k8s.io/kubernetes/pkg/controller/cloud"
59-
routecontroller "k8s.io/kubernetes/pkg/controller/route"
60-
servicecontroller "k8s.io/kubernetes/pkg/controller/service"
6162
)
6263

6364
const (
@@ -106,7 +107,7 @@ func main() {
106107
}
107108
}
108109

109-
utilflag.PrintFlags(cmd.Flags())
110+
printFlags(cmd.Flags())
110111

111112
c, err := s.Config(KnownControllers(), ControllersDisabledByDefault.List())
112113
if err != nil {
@@ -162,7 +163,7 @@ func newControllerInitializers() map[string]initFunc {
162163

163164
func startCloudNodeController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cloudprovider.Interface, stopCh <-chan struct{}) (http.Handler, bool, error) {
164165
// Start the CloudNodeController
165-
nodeController, err := cloudcontrollers.NewCloudNodeController(
166+
nodeController, err := cloudnodecontroller.NewCloudNodeController(
166167
ctx.SharedInformers.Core().V1().Nodes(),
167168
// cloud node controller uses existing cluster role from node-controller
168169
ctx.ClientBuilder.ClientOrDie("node-controller"),
@@ -181,7 +182,7 @@ func startCloudNodeController(ctx *cloudcontrollerconfig.CompletedConfig, cloud
181182

182183
func startCloudNodeLifecycleController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cloudprovider.Interface, stopCh <-chan struct{}) (http.Handler, bool, error) {
183184
// Start the cloudNodeLifecycleController
184-
cloudNodeLifecycleController, err := cloudcontrollers.NewCloudNodeLifecycleController(
185+
cloudNodeLifecycleController, err := cloudnodelifecyclecontroller.NewCloudNodeLifecycleController(
185186
ctx.SharedInformers.Core().V1().Nodes(),
186187
// cloud node lifecycle controller uses existing cluster role from node-controller
187188
ctx.ClientBuilder.ClientOrDie("node-controller"),
@@ -206,6 +207,7 @@ func startServiceController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cl
206207
ctx.SharedInformers.Core().V1().Services(),
207208
ctx.SharedInformers.Core().V1().Nodes(),
208209
ctx.ComponentConfig.KubeCloudShared.ClusterName,
210+
utilfeature.DefaultFeatureGate,
209211
)
210212
if err != nil {
211213
// This error shouldn't fail. It lives like this as a legacy.
@@ -282,3 +284,10 @@ func processCIDRs(cidrsList string) ([]*net.IPNet, bool, error) {
282284

283285
return cidrs, dualstack, nil
284286
}
287+
288+
// PrintFlags logs the flags in the flagset
289+
func printFlags(flags *pflag.FlagSet) {
290+
flags.VisitAll(func(flag *pflag.Flag) {
291+
klog.V(1).Infof("FLAG: --%s=%q", flag.Name, flag.Value)
292+
})
293+
}

Diff for: ‎go.mod

+25-24
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,38 @@ module k8s.io/cloud-provider-aws
33
go 1.13
44

55
replace (
6-
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20200715165012-dff82dc0de47
7-
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20200715165012-dff82dc0de47
8-
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20200715165012-dff82dc0de47
9-
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200715165012-dff82dc0de47
10-
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20200715165012-dff82dc0de47
11-
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200715165012-dff82dc0de47
12-
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200715165012-dff82dc0de47
13-
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20200715165012-dff82dc0de47
14-
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20200715165012-dff82dc0de47
15-
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20200715165012-dff82dc0de47
16-
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20200715165012-dff82dc0de47
17-
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20200715165012-dff82dc0de47
18-
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200715165012-dff82dc0de47
19-
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20200715165012-dff82dc0de47
20-
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20200715165012-dff82dc0de47
21-
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20200715165012-dff82dc0de47
22-
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20200715165012-dff82dc0de47
23-
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20200715165012-dff82dc0de47
24-
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200715165012-dff82dc0de47
25-
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20200715165012-dff82dc0de47
26-
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20200715165012-dff82dc0de47
6+
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20200909111720-206bcadf021e
7+
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20200909111720-206bcadf021e
8+
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20200909111720-206bcadf021e
9+
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200909111720-206bcadf021e
10+
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20200909111720-206bcadf021e
11+
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200909111720-206bcadf021e
12+
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200909111720-206bcadf021e
13+
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20200909111720-206bcadf021e
14+
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20200909111720-206bcadf021e
15+
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20200909111720-206bcadf021e
16+
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20200909111720-206bcadf021e
17+
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20200909111720-206bcadf021e
18+
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200909111720-206bcadf021e
19+
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20200909111720-206bcadf021e
20+
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20200909111720-206bcadf021e
21+
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20200909111720-206bcadf021e
22+
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20200909111720-206bcadf021e
23+
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20200909111720-206bcadf021e
24+
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200909111720-206bcadf021e
25+
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20200909111720-206bcadf021e
26+
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20200909111720-206bcadf021e
2727
)
2828

2929
require (
30-
github.com/spf13/cobra v0.0.5
30+
github.com/spf13/cobra v1.0.0
31+
github.com/spf13/pflag v1.0.5
3132
k8s.io/apimachinery v0.0.0
3233
k8s.io/apiserver v0.0.0
3334
k8s.io/cloud-provider v0.0.0
3435
k8s.io/component-base v0.0.0
3536
k8s.io/klog v1.0.0
36-
k8s.io/kubernetes v1.18.6
37+
k8s.io/kubernetes v1.19.1
3738
k8s.io/legacy-cloud-providers v0.0.0
38-
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
39+
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
3940
)

0 commit comments

Comments
 (0)