Skip to content

Commit

Permalink
Merge pull request #2594 from randomvariable/release-0.6-dependencies
Browse files Browse the repository at this point in the history
0.6 Release July 2021 Dependency Update
  • Loading branch information
k8s-ci-robot authored Jul 19, 2021
2 parents 6455b0b + f474423 commit 50f8b3f
Show file tree
Hide file tree
Showing 9 changed files with 1,550 additions and 378 deletions.
4 changes: 4 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@ linters:
- godox
- gofumpt
- gomnd
- gomoddirectives
- lll
- makezero
- nilerr
- nlreturn
- predeclared
- revive
- stylecheck
- tagliatelle
- whitespace
- wrapcheck
- wsl
Expand Down
23 changes: 12 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,28 @@ module sigs.k8s.io/cluster-api-provider-aws

go 1.13

replace github.com/golang/mock => github.com/golang/mock v1.4.4

require (
github.com/apparentlymart/go-cidr v1.1.0
github.com/aws/amazon-vpc-cni-k8s v1.7.10
github.com/aws/aws-lambda-go v1.24.0
github.com/aws/aws-sdk-go v1.38.57
github.com/awslabs/goformation/v4 v4.19.4
github.com/aws/aws-lambda-go v1.25.0
github.com/aws/aws-sdk-go v1.40.2
github.com/awslabs/goformation/v4 v4.19.5
github.com/blang/semver v3.5.1+incompatible
github.com/go-logr/logr v0.1.0
github.com/golang/mock v1.4.4
github.com/golang/mock v1.5.0
github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f
github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 // indirect
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/onsi/gomega v1.14.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.11.0
github.com/sergi/go-diff v1.2.0
github.com/spf13/cobra v1.1.3
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
golang.org/x/net v0.0.0-20210716203947-853a461950ff
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.17.17
k8s.io/apiextensions-apiserver v0.17.17
Expand All @@ -32,9 +33,9 @@ require (
k8s.io/component-base v0.17.17
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.1.0
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
k8s.io/utils v0.0.0-20210709001253-0e1f9d693477
sigs.k8s.io/aws-iam-authenticator v0.5.3
sigs.k8s.io/cluster-api v0.3.19
sigs.k8s.io/cluster-api v0.3.21
sigs.k8s.io/controller-runtime v0.5.14
sigs.k8s.io/yaml v1.2.0
)
362 changes: 309 additions & 53 deletions go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions hack/tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ require (
github.com/a8m/envsubst v1.2.0
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
github.com/golang/mock v1.5.0
github.com/golangci/golangci-lint v1.37.1
github.com/golangci/golangci-lint v1.41.1
github.com/itchyny/gojq v0.12.4
github.com/onsi/ginkgo v1.16.4
k8s.io/code-generator v0.21.1
k8s.io/release v0.8.0
k8s.io/code-generator v0.21.3
k8s.io/release v0.9.0
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20210608183808-2ac7d742d70c
sigs.k8s.io/controller-tools v0.3.0
sigs.k8s.io/kind v0.11.1
Expand Down
723 changes: 426 additions & 297 deletions hack/tools/go.sum

Large diffs are not rendered by default.

716 changes: 716 additions & 0 deletions pkg/cloud/services/ec2/mock_ec2iface/ec2api_mock.go

Large diffs are not rendered by default.

66 changes: 66 additions & 0 deletions pkg/cloud/services/eks/mock_eksiface/eksapi_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions test/e2e/data/e2e_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
# For more details, run `go run ./cmd/clusterawsadm bootstrap credentials`

images:
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.3.19
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.3.21
loadBehavior: tryLoad
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v0.3.19
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v0.3.21
loadBehavior: tryLoad
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v0.3.19
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v0.3.21
loadBehavior: tryLoad
# Use local dev images built source tree;
- name: gcr.io/k8s-staging-cluster-api/capa-manager:e2e
Expand All @@ -35,9 +35,9 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v0.3.19
- name: v0.3.21
# Use manifest from source files
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.19/core-components.yaml"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.21/core-components.yaml"
type: "url"
replacements:
- old: "imagePullPolicy: Always"
Expand All @@ -50,9 +50,9 @@ providers:
- name: kubeadm
type: BootstrapProvider
versions:
- name: v0.3.19
- name: v0.3.21
# Use manifest from source files
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.19/bootstrap-components.yaml"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.21/bootstrap-components.yaml"
type: "url"
replacements:
- old: "imagePullPolicy: Always"
Expand All @@ -65,9 +65,9 @@ providers:
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: v0.3.19
- name: v0.3.21
# Use manifest from source files
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.19/control-plane-components.yaml"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.21/control-plane-components.yaml"
type: "url"
replacements:
- old: "imagePullPolicy: Always"
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/data/e2e_eks_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
# For more details, run `go run ./cmd/clusterawsadm bootstrap credentials`

images:
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.3.19
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.3.21
loadBehavior: tryLoad
# Use local dev images built source tree;
- name: gcr.io/k8s-staging-cluster-api/capa-manager:e2e
loadBehavior: mustLoad
- name: gcr.io/k8s-staging-cluster-api/capa-eks-bootstrap-manager:e2e
loadBehavior: mustLoad
- name: gcr.io/k8s-staging-cluster-api/capa-eks-controlplane-manager:e2e
loadBehavior: mustLoad
loadBehavior: mustLoad
- name: quay.io/jetstack/cert-manager-cainjector:v0.16.1
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-webhook:v0.16.1
Expand All @@ -35,9 +35,9 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v0.3.19
- name: v0.3.21
# Use manifest from source files
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.19/core-components.yaml"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.21/core-components.yaml"
type: "url"
replacements:
- old: "imagePullPolicy: Always"
Expand Down Expand Up @@ -107,7 +107,7 @@ providers:
targetName: "cluster-template-eks-managed-machinepool-only.yaml"
- sourcePath: "./eks/cluster-template-eks-managedmachinepool.yaml"
targetName: "cluster-template-eks-managedmachinepool.yaml"


variables:
KUBERNETES_VERSION: "v1.18.0"
Expand Down

0 comments on commit 50f8b3f

Please sign in to comment.