Skip to content

Commit fe1cec8

Browse files
aclevernameaclevername
authored
Bump k8s dependencies (eksctl-io#2907)
1 parent 3550bac commit fe1cec8

42 files changed

Lines changed: 554 additions & 460 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/update-generated.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
update_aws_node:
5454
name: Update aws-node and open PR
5555
runs-on: ubuntu-latest
56-
container: weaveworks/eksctl-build:fd27208c8d957f49f68a8fc4f7849ee9616452c8
56+
container: weaveworks/eksctl-build:fd290c96afca07b2bd5c0427c479ec93a2f5c8ff
5757
env:
5858
UPDATE_BRANCH: update-aws-node
5959
GOPRIVATE: ""

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BUILD_IMAGE=/weaveworks/eksctl-build:fd27208c8d957f49f68a8fc4f7849ee9616452c8
1+
ARG BUILD_IMAGE=/weaveworks/eksctl-build:fd290c96afca07b2bd5c0427c479ec93a2f5c8ff
22
FROM $BUILD_IMAGE as build
33

44
WORKDIR /src

‎Makefile.docker‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@ check-build-image-manifest-up-to-date: update-build-image-tag ## Update build im
3636
|| (git --no-pager diff $(image_manifest_file); echo "HINT: to fix this, run 'make -f Makefile.docker update-build-image-tag'"; exit 1)
3737

3838
.PHONY: commit-new-image-tag
39-
commit-new-image-tag: update-build-image-tag ## Update build image manifest and commits the changes
40-
git commit --quiet $(image_manifest_file) $(build_image_tag_file) Dockerfile --message 'Update build image manifest and tag file'
39+
commit-new-image-tag: ## Update build image manifest and commits the changes
40+
git stash
41+
$(MAKE) update-build-image-tag
42+
git add -u
43+
git commit --message 'Update build image manifest and tag file'
44+
git stash pop
4145

4246
.PHONY: build-image
4347
build-image: check-build-image-manifest-up-to-date ## Build the build image that has all of external dependencies

‎build/docker/Dockerfile‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,14 @@ RUN curl --silent --location "https://dl.k8s.io/${KUBECTL_VERSION}/bin/linux/amd
3737
WORKDIR /src
3838
ENV CGO_ENABLED=0 GOPROXY=https://proxy.golang.org,direct
3939

40-
RUN git config --global url."git@github.com:".insteadOf "https://github.com/"
41-
40+
# The authenticator is a runtime dependency, so it needs to be in /out
41+
ENV AWS_IAM_AUTH_VERSION 0.5.2
42+
RUN curl --silent --location "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v${AWS_IAM_AUTH_VERSION}/aws-iam-authenticator_${AWS_IAM_AUTH_VERSION}_linux_amd64" --output /out/usr/local/bin/aws-iam-authenticator \
43+
&& chmod +x /out/usr/local/bin/aws-iam-authenticator
4244
COPY .requirements install-build-deps.sh go.mod go.sum /src/
4345

4446
# Install all build tools dependencies
4547
RUN ./install-build-deps.sh
4648

47-
# The authenticator is a runtime dependency, so it needs to be in /out
48-
RUN go install sigs.k8s.io/aws-iam-authenticator/cmd/aws-iam-authenticator \
49-
&& mv $GOPATH/bin/aws-iam-authenticator /out/usr/local/bin/aws-iam-authenticator
50-
5149
# Add kubectl and aws-iam-authenticator to the PATH
5250
ENV PATH="${PATH}:/out/usr/bin:/out/usr/local/bin"

‎build/docker/build_image_manifest‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5"
99
"github.com/github-release/github-release v0.9.0"
1010
"golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6"
11-
"k8s.io/code-generator v0.16.8"
12-
"k8s.io/code-generator v0.16.8"
13-
"k8s.io/code-generator v0.16.8"
14-
"k8s.io/code-generator v0.16.8"
15-
"k8s.io/code-generator v0.16.8"
16-
100644 blob 78c082615e6782f80357363f1de96e7b9873f69e build/docker/Dockerfile
11+
"k8s.io/code-generator v0.19.4"
12+
"k8s.io/code-generator v0.19.4"
13+
"k8s.io/code-generator v0.19.4"
14+
"k8s.io/code-generator v0.19.4"
15+
"k8s.io/code-generator v0.19.4"
16+
100644 blob 1561a36101fca1244074ca113b8371bf29b05d5e build/docker/Dockerfile
1717
100644 blob dd4fbcfba40125dfc32df14c63c4ce2b5e6fadd4 .requirements
1818
100755 blob 1ec4ce65165cf21e3767ee34d56fb635c51b4a5a build/scripts/install-build-deps.sh

‎build/docker/image_tag‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fd27208c8d957f49f68a8fc4f7849ee9616452c8
1+
fd290c96afca07b2bd5c0427c479ec93a2f5c8ff

‎go.mod‎

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ module github.com/weaveworks/eksctl
55
go 1.15
66

77
require (
8-
github.com/Azure/go-autorest/autorest v0.10.0 // indirect
98
github.com/aws/aws-sdk-go v1.36.7
109
github.com/benjamintf1/unmarshalledmatchers v0.0.0-20190408201839-bb1c1f34eaea
1110
github.com/blang/semver v3.5.1+incompatible
1211
github.com/bxcodec/faker v2.0.1+incompatible
1312
github.com/cloudflare/cfssl v1.5.0
1413
github.com/dave/jennifer v1.4.1
15-
github.com/dlespiau/kube-test-harness v0.0.0-20190930170435-ec3f93e1a754
14+
github.com/dlespiau/kube-test-harness v0.0.0-20200915102055-a03579200ae8
1615
github.com/evanphx/json-patch/v5 v5.1.0
1716
github.com/fluxcd/flux/pkg/install v0.0.0-20201001122558-cb08da1b356a // flux 1.21.0
1817
github.com/fluxcd/go-git-providers v0.0.3
@@ -24,7 +23,7 @@ require (
2423
github.com/goreleaser/goreleaser v0.149.0
2524
github.com/inconshreveable/log15 v0.0.0-20200109203555-b30bc20e4fd1 // indirect
2625
github.com/instrumenta/kubeval v0.0.0-20190918223246-8d013ec9fc56
27-
github.com/justinbarrick/go-k8s-portforward v1.0.3
26+
github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20200904152830-b575325c1855
2827
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
2928
github.com/kevinburke/go-bindata v3.22.0+incompatible
3029
github.com/kevinburke/rest v0.0.0-20200429221318-0d2892b400f8 // indirect
@@ -51,49 +50,46 @@ require (
5150
github.com/weaveworks/launcher v0.0.2-0.20200715141516-1ca323f1de15
5251
github.com/whilp/git-urls v0.0.0-20191001220047-6db9661140c0
5352
golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6
54-
k8s.io/api v0.16.8
55-
k8s.io/apiextensions-apiserver v0.16.8
56-
k8s.io/apimachinery v0.16.8
57-
k8s.io/cli-runtime v0.16.8
58-
k8s.io/client-go v11.0.0+incompatible
59-
k8s.io/cloud-provider v0.16.8
60-
k8s.io/code-generator v0.16.8
61-
k8s.io/kops v1.15.2
62-
k8s.io/kubelet v0.16.8
63-
k8s.io/kubernetes v1.16.8
64-
k8s.io/legacy-cloud-providers v0.16.8
53+
k8s.io/api v0.19.4
54+
k8s.io/apiextensions-apiserver v0.19.4
55+
k8s.io/apimachinery v0.19.4
56+
k8s.io/cli-runtime v0.19.4
57+
k8s.io/client-go v0.19.4
58+
k8s.io/cloud-provider v0.19.4
59+
k8s.io/code-generator v0.19.4
60+
k8s.io/kops v1.19.0-beta.2
61+
k8s.io/kubelet v0.19.4
62+
k8s.io/kubernetes v1.19.4
63+
k8s.io/legacy-cloud-providers v0.19.4
6564
sigs.k8s.io/aws-iam-authenticator v0.5.2
6665
sigs.k8s.io/yaml v1.2.0
6766
)
6867

6968
replace (
70-
github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.0.0+incompatible
71-
// github.com/aws/aws-sdk-go => github.com/weaveworks/aws-sdk-go v1.25.14-0.20191218135223-757eeed07291
72-
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.3.1
7369
// k8s.io/kops is still using old version of component-base
7470
// which uses an older version of the following package
7571
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.4
7672
// Used to pin the k8s library versions regardless of what other dependencies enforce
77-
k8s.io/api => k8s.io/api v0.16.8
78-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.8
79-
k8s.io/apimachinery => k8s.io/apimachinery v0.16.8
80-
k8s.io/apiserver => k8s.io/apiserver v0.16.8
81-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.16.8
82-
k8s.io/client-go => k8s.io/client-go v0.16.8
83-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.8
84-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.8
85-
k8s.io/code-generator => k8s.io/code-generator v0.16.8
86-
k8s.io/component-base => k8s.io/component-base v0.16.8
87-
k8s.io/cri-api => k8s.io/cri-api v0.16.8
88-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.16.8
89-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.16.8
90-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.16.8
91-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.16.8
92-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.16.8
93-
k8s.io/kubectl => k8s.io/kubectl v0.16.8
94-
k8s.io/kubelet => k8s.io/kubelet v0.16.8
95-
k8s.io/kubernetes => k8s.io/kubernetes v1.16.8
96-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.16.8
97-
k8s.io/metrics => k8s.io/metrics v0.16.8
98-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.16.8
73+
k8s.io/api => k8s.io/api v0.19.4
74+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.4
75+
k8s.io/apimachinery => k8s.io/apimachinery v0.19.4
76+
k8s.io/apiserver => k8s.io/apiserver v0.19.4
77+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.4
78+
k8s.io/client-go => k8s.io/client-go v0.19.4
79+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.4
80+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.4
81+
k8s.io/code-generator => k8s.io/code-generator v0.19.4
82+
k8s.io/component-base => k8s.io/component-base v0.19.4
83+
k8s.io/cri-api => k8s.io/cri-api v0.19.4
84+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.4
85+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.4
86+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.4
87+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.4
88+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.4
89+
k8s.io/kubectl => k8s.io/kubectl v0.19.4
90+
k8s.io/kubelet => k8s.io/kubelet v0.19.4
91+
k8s.io/kubernetes => k8s.io/kubernetes v1.19.4
92+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.4
93+
k8s.io/metrics => k8s.io/metrics v0.19.4
94+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.4
9995
)

0 commit comments

Comments
 (0)