Skip to content

Commit 469c2a2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2485 from randomvariable/dependency-update-jun-2021
Bump dependencies for June 2021 except gomock
2 parents df3c67f + 436d4aa commit 469c2a2

29 files changed

+5551
-5463
lines changed

‎Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ DOCKER_BUILDKIT=1
6666
# Set --output-base for conversion-gen if we are not within GOPATH
6767
ifneq ($(abspath $(REPO_ROOT)),$(shell go env GOPATH)/src/sigs.k8s.io/cluster-api-provider-aws)
6868
GEN_OUTPUT_BASE := --output-base=$(REPO_ROOT)
69+
else
70+
export GOPATH := $(shell go env GOPATH)
6971
endif
7072

7173
# Release variables

‎bootstrap/eks/config/crd/bases/bootstrap.cluster.x-k8s.io_eksconfigs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: eksconfigs.bootstrap.cluster.x-k8s.io
1010
spec:

‎bootstrap/eks/config/crd/bases/bootstrap.cluster.x-k8s.io_eksconfigtemplates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: eksconfigtemplates.bootstrap.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsclustercontrolleridentities.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsclustercontrolleridentities.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterroleidentities.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsclusterroleidentities.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsclusters.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsclusterstaticidentities.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsfargateprofiles.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsfargateprofiles.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsmachinepools.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsmachines.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsmachinetemplates.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedclusters.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsmanagedclusters.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsmanagedmachinepools.infrastructure.cluster.x-k8s.io
1010
spec:

‎controlplane/eks/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.0
88
creationTimestamp: null
99
name: awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io
1010
spec:

‎go.mod

+15-13
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,31 @@ module sigs.k8s.io/cluster-api-provider-aws
22

33
go 1.16
44

5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.0-beta.0
6+
57
require (
68
github.com/apparentlymart/go-cidr v1.1.0
7-
github.com/aws/amazon-vpc-cni-k8s v1.7.5
9+
github.com/aws/amazon-vpc-cni-k8s v1.7.10
810
github.com/aws/aws-lambda-go v1.24.0
9-
github.com/aws/aws-sdk-go v1.38.39
10-
github.com/awslabs/goformation/v4 v4.15.0
11+
github.com/aws/aws-sdk-go v1.38.57
12+
github.com/awslabs/goformation/v4 v4.19.4
1113
github.com/blang/semver v3.5.1+incompatible
1214
github.com/go-logr/logr v0.4.0
1315
github.com/gofrs/flock v0.8.0
1416
github.com/golang/mock v1.4.4
15-
github.com/google/goexpect v0.0.0-20200816234442-b5b77125c2c5
17+
github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f
1618
github.com/google/gofuzz v1.2.0
1719
github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 // indirect
1820
github.com/onsi/ginkgo v1.16.4
19-
github.com/onsi/gomega v1.11.0
21+
github.com/onsi/gomega v1.13.0
2022
github.com/pkg/errors v0.9.1
21-
github.com/prometheus/client_golang v1.9.0
23+
github.com/prometheus/client_golang v1.11.0
2224
github.com/sergi/go-diff v1.2.0
2325
github.com/spf13/cobra v1.1.3
2426
github.com/spf13/jwalterweatherman v1.1.0 // indirect
2527
github.com/spf13/pflag v1.0.5
26-
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
27-
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
28-
golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79 // indirect
28+
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
29+
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
2930
gopkg.in/yaml.v2 v2.4.0
3031
k8s.io/api v0.21.1
3132
k8s.io/apiextensions-apiserver v0.21.1
@@ -34,9 +35,10 @@ require (
3435
k8s.io/client-go v0.21.1
3536
k8s.io/component-base v0.21.1
3637
k8s.io/klog/v2 v2.9.0
37-
k8s.io/utils v0.0.0-20210305010621-2afb4311ab10
38-
sigs.k8s.io/aws-iam-authenticator v0.5.2
39-
sigs.k8s.io/cluster-api v0.3.11-0.20210525143822-fa1cee57595a
40-
sigs.k8s.io/controller-runtime v0.9.0-beta.5
38+
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
39+
sigs.k8s.io/aws-iam-authenticator v0.5.3
40+
sigs.k8s.io/cluster-api v0.4.0-beta.0
41+
sigs.k8s.io/cluster-api/test v0.4.0-beta.0
42+
sigs.k8s.io/controller-runtime v0.9.0
4143
sigs.k8s.io/yaml v1.2.0
4244
)

0 commit comments

Comments
 (0)