Skip to content

Commit 50f8b3f

Browse files
authored
Merge pull request #2594 from randomvariable/release-0.6-dependencies
0.6 Release July 2021 Dependency Update
2 parents 6455b0b + f474423 commit 50f8b3f

File tree

9 files changed

+1550
-378
lines changed

9 files changed

+1550
-378
lines changed

.golangci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@ linters:
1515
- godox
1616
- gofumpt
1717
- gomnd
18+
- gomoddirectives
1819
- lll
1920
- makezero
21+
- nilerr
2022
- nlreturn
2123
- predeclared
2224
- revive
25+
- stylecheck
26+
- tagliatelle
2327
- whitespace
2428
- wrapcheck
2529
- wsl

go.mod

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,28 @@ module sigs.k8s.io/cluster-api-provider-aws
22

33
go 1.13
44

5+
replace github.com/golang/mock => github.com/golang/mock v1.4.4
6+
57
require (
68
github.com/apparentlymart/go-cidr v1.1.0
79
github.com/aws/amazon-vpc-cni-k8s v1.7.10
8-
github.com/aws/aws-lambda-go v1.24.0
9-
github.com/aws/aws-sdk-go v1.38.57
10-
github.com/awslabs/goformation/v4 v4.19.4
10+
github.com/aws/aws-lambda-go v1.25.0
11+
github.com/aws/aws-sdk-go v1.40.2
12+
github.com/awslabs/goformation/v4 v4.19.5
1113
github.com/blang/semver v3.5.1+incompatible
1214
github.com/go-logr/logr v0.1.0
13-
github.com/golang/mock v1.4.4
15+
github.com/golang/mock v1.5.0
1416
github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f
1517
github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 // indirect
1618
github.com/onsi/ginkgo v1.16.4
17-
github.com/onsi/gomega v1.13.0
19+
github.com/onsi/gomega v1.14.0
1820
github.com/pkg/errors v0.9.1
1921
github.com/prometheus/client_golang v1.11.0
2022
github.com/sergi/go-diff v1.2.0
21-
github.com/spf13/cobra v1.1.3
22-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
23+
github.com/spf13/cobra v1.2.1
2324
github.com/spf13/pflag v1.0.5
24-
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
25-
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
25+
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
26+
golang.org/x/net v0.0.0-20210716203947-853a461950ff
2627
gopkg.in/yaml.v2 v2.4.0
2728
k8s.io/api v0.17.17
2829
k8s.io/apiextensions-apiserver v0.17.17
@@ -32,9 +33,9 @@ require (
3233
k8s.io/component-base v0.17.17
3334
k8s.io/klog v1.0.0
3435
k8s.io/klog/v2 v2.1.0
35-
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
36+
k8s.io/utils v0.0.0-20210709001253-0e1f9d693477
3637
sigs.k8s.io/aws-iam-authenticator v0.5.3
37-
sigs.k8s.io/cluster-api v0.3.19
38+
sigs.k8s.io/cluster-api v0.3.21
3839
sigs.k8s.io/controller-runtime v0.5.14
3940
sigs.k8s.io/yaml v1.2.0
4041
)

go.sum

Lines changed: 309 additions & 53 deletions
Large diffs are not rendered by default.

hack/tools/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ require (
66
github.com/a8m/envsubst v1.2.0
77
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
88
github.com/golang/mock v1.5.0
9-
github.com/golangci/golangci-lint v1.37.1
9+
github.com/golangci/golangci-lint v1.41.1
1010
github.com/itchyny/gojq v0.12.4
1111
github.com/onsi/ginkgo v1.16.4
12-
k8s.io/code-generator v0.21.1
13-
k8s.io/release v0.8.0
12+
k8s.io/code-generator v0.21.3
13+
k8s.io/release v0.9.0
1414
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20210608183808-2ac7d742d70c
1515
sigs.k8s.io/controller-tools v0.3.0
1616
sigs.k8s.io/kind v0.11.1

hack/tools/go.sum

Lines changed: 426 additions & 297 deletions
Large diffs are not rendered by default.

pkg/cloud/services/ec2/mock_ec2iface/ec2api_mock.go

Lines changed: 716 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/cloud/services/eks/mock_eksiface/eksapi_mock.go

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/e2e/data/e2e_conf.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
# For more details, run `go run ./cmd/clusterawsadm bootstrap credentials`
1515

1616
images:
17-
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.3.19
17+
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.3.21
1818
loadBehavior: tryLoad
19-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v0.3.19
19+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v0.3.21
2020
loadBehavior: tryLoad
21-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v0.3.19
21+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v0.3.21
2222
loadBehavior: tryLoad
2323
# Use local dev images built source tree;
2424
- name: gcr.io/k8s-staging-cluster-api/capa-manager:e2e
@@ -35,9 +35,9 @@ providers:
3535
- name: cluster-api
3636
type: CoreProvider
3737
versions:
38-
- name: v0.3.19
38+
- name: v0.3.21
3939
# Use manifest from source files
40-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.19/core-components.yaml"
40+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.21/core-components.yaml"
4141
type: "url"
4242
replacements:
4343
- old: "imagePullPolicy: Always"
@@ -50,9 +50,9 @@ providers:
5050
- name: kubeadm
5151
type: BootstrapProvider
5252
versions:
53-
- name: v0.3.19
53+
- name: v0.3.21
5454
# Use manifest from source files
55-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.19/bootstrap-components.yaml"
55+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.21/bootstrap-components.yaml"
5656
type: "url"
5757
replacements:
5858
- old: "imagePullPolicy: Always"
@@ -65,9 +65,9 @@ providers:
6565
- name: kubeadm
6666
type: ControlPlaneProvider
6767
versions:
68-
- name: v0.3.19
68+
- name: v0.3.21
6969
# Use manifest from source files
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.19/control-plane-components.yaml"
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.21/control-plane-components.yaml"
7171
type: "url"
7272
replacements:
7373
- old: "imagePullPolicy: Always"

test/e2e/data/e2e_eks_conf.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
# For more details, run `go run ./cmd/clusterawsadm bootstrap credentials`
1515

1616
images:
17-
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.3.19
17+
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.3.21
1818
loadBehavior: tryLoad
1919
# Use local dev images built source tree;
2020
- name: gcr.io/k8s-staging-cluster-api/capa-manager:e2e
2121
loadBehavior: mustLoad
2222
- name: gcr.io/k8s-staging-cluster-api/capa-eks-bootstrap-manager:e2e
2323
loadBehavior: mustLoad
2424
- name: gcr.io/k8s-staging-cluster-api/capa-eks-controlplane-manager:e2e
25-
loadBehavior: mustLoad
25+
loadBehavior: mustLoad
2626
- name: quay.io/jetstack/cert-manager-cainjector:v0.16.1
2727
loadBehavior: tryLoad
2828
- name: quay.io/jetstack/cert-manager-webhook:v0.16.1
@@ -35,9 +35,9 @@ providers:
3535
- name: cluster-api
3636
type: CoreProvider
3737
versions:
38-
- name: v0.3.19
38+
- name: v0.3.21
3939
# Use manifest from source files
40-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.19/core-components.yaml"
40+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.21/core-components.yaml"
4141
type: "url"
4242
replacements:
4343
- old: "imagePullPolicy: Always"
@@ -107,7 +107,7 @@ providers:
107107
targetName: "cluster-template-eks-managed-machinepool-only.yaml"
108108
- sourcePath: "./eks/cluster-template-eks-managedmachinepool.yaml"
109109
targetName: "cluster-template-eks-managedmachinepool.yaml"
110-
110+
111111

112112
variables:
113113
KUBERNETES_VERSION: "v1.18.0"

0 commit comments

Comments
 (0)