Skip to content

Commit

Permalink
Bump k8s dependencies (#2907)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aclevername
aclevername committed Dec 14, 2020
1 parent 3550bac commit fe1cec8
Show file tree
Hide file tree
Showing 42 changed files with 554 additions and 460 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update-generated.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
update_aws_node:
name: Update aws-node and open PR
runs-on: ubuntu-latest
container: weaveworks/eksctl-build:fd27208c8d957f49f68a8fc4f7849ee9616452c8
container: weaveworks/eksctl-build:fd290c96afca07b2bd5c0427c479ec93a2f5c8ff
env:
UPDATE_BRANCH: update-aws-node
GOPRIVATE: ""
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_IMAGE=/weaveworks/eksctl-build:fd27208c8d957f49f68a8fc4f7849ee9616452c8
ARG BUILD_IMAGE=/weaveworks/eksctl-build:fd290c96afca07b2bd5c0427c479ec93a2f5c8ff
FROM $BUILD_IMAGE as build

WORKDIR /src
Expand Down
8 changes: 6 additions & 2 deletions Makefile.docker
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@ check-build-image-manifest-up-to-date: update-build-image-tag ## Update build im
|| (git --no-pager diff $(image_manifest_file); echo "HINT: to fix this, run 'make -f Makefile.docker update-build-image-tag'"; exit 1)

.PHONY: commit-new-image-tag
commit-new-image-tag: update-build-image-tag ## Update build image manifest and commits the changes
git commit --quiet $(image_manifest_file) $(build_image_tag_file) Dockerfile --message 'Update build image manifest and tag file'
commit-new-image-tag: ## Update build image manifest and commits the changes
git stash
$(MAKE) update-build-image-tag
git add -u
git commit --message 'Update build image manifest and tag file'
git stash pop

.PHONY: build-image
build-image: check-build-image-manifest-up-to-date ## Build the build image that has all of external dependencies
Expand Down
10 changes: 4 additions & 6 deletions build/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,14 @@ RUN curl --silent --location "https://dl.k8s.io/${KUBECTL_VERSION}/bin/linux/amd
WORKDIR /src
ENV CGO_ENABLED=0 GOPROXY=https://proxy.golang.org,direct

RUN git config --global url."git@github.com:".insteadOf "https://github.com/"

# The authenticator is a runtime dependency, so it needs to be in /out
ENV AWS_IAM_AUTH_VERSION 0.5.2
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 \
&& chmod +x /out/usr/local/bin/aws-iam-authenticator
COPY .requirements install-build-deps.sh go.mod go.sum /src/

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

# The authenticator is a runtime dependency, so it needs to be in /out
RUN go install sigs.k8s.io/aws-iam-authenticator/cmd/aws-iam-authenticator \
&& mv $GOPATH/bin/aws-iam-authenticator /out/usr/local/bin/aws-iam-authenticator

# Add kubectl and aws-iam-authenticator to the PATH
ENV PATH="${PATH}:/out/usr/bin:/out/usr/local/bin"
12 changes: 6 additions & 6 deletions build/docker/build_image_manifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5"
"github.com/github-release/github-release v0.9.0"
"golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6"
"k8s.io/code-generator v0.16.8"
"k8s.io/code-generator v0.16.8"
"k8s.io/code-generator v0.16.8"
"k8s.io/code-generator v0.16.8"
"k8s.io/code-generator v0.16.8"
100644 blob 78c082615e6782f80357363f1de96e7b9873f69e build/docker/Dockerfile
"k8s.io/code-generator v0.19.4"
"k8s.io/code-generator v0.19.4"
"k8s.io/code-generator v0.19.4"
"k8s.io/code-generator v0.19.4"
"k8s.io/code-generator v0.19.4"
100644 blob 1561a36101fca1244074ca113b8371bf29b05d5e build/docker/Dockerfile
100644 blob dd4fbcfba40125dfc32df14c63c4ce2b5e6fadd4 .requirements
100755 blob 1ec4ce65165cf21e3767ee34d56fb635c51b4a5a build/scripts/install-build-deps.sh
2 changes: 1 addition & 1 deletion build/docker/image_tag
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd27208c8d957f49f68a8fc4f7849ee9616452c8
fd290c96afca07b2bd5c0427c479ec93a2f5c8ff
74 changes: 35 additions & 39 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ module github.com/weaveworks/eksctl
go 1.15

require (
github.com/Azure/go-autorest/autorest v0.10.0 // indirect
github.com/aws/aws-sdk-go v1.36.7
github.com/benjamintf1/unmarshalledmatchers v0.0.0-20190408201839-bb1c1f34eaea
github.com/blang/semver v3.5.1+incompatible
github.com/bxcodec/faker v2.0.1+incompatible
github.com/cloudflare/cfssl v1.5.0
github.com/dave/jennifer v1.4.1
github.com/dlespiau/kube-test-harness v0.0.0-20190930170435-ec3f93e1a754
github.com/dlespiau/kube-test-harness v0.0.0-20200915102055-a03579200ae8
github.com/evanphx/json-patch/v5 v5.1.0
github.com/fluxcd/flux/pkg/install v0.0.0-20201001122558-cb08da1b356a // flux 1.21.0
github.com/fluxcd/go-git-providers v0.0.3
Expand All @@ -24,7 +23,7 @@ require (
github.com/goreleaser/goreleaser v0.149.0
github.com/inconshreveable/log15 v0.0.0-20200109203555-b30bc20e4fd1 // indirect
github.com/instrumenta/kubeval v0.0.0-20190918223246-8d013ec9fc56
github.com/justinbarrick/go-k8s-portforward v1.0.3
github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20200904152830-b575325c1855
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/kevinburke/go-bindata v3.22.0+incompatible
github.com/kevinburke/rest v0.0.0-20200429221318-0d2892b400f8 // indirect
Expand All @@ -51,49 +50,46 @@ require (
github.com/weaveworks/launcher v0.0.2-0.20200715141516-1ca323f1de15
github.com/whilp/git-urls v0.0.0-20191001220047-6db9661140c0
golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6
k8s.io/api v0.16.8
k8s.io/apiextensions-apiserver v0.16.8
k8s.io/apimachinery v0.16.8
k8s.io/cli-runtime v0.16.8
k8s.io/client-go v11.0.0+incompatible
k8s.io/cloud-provider v0.16.8
k8s.io/code-generator v0.16.8
k8s.io/kops v1.15.2
k8s.io/kubelet v0.16.8
k8s.io/kubernetes v1.16.8
k8s.io/legacy-cloud-providers v0.16.8
k8s.io/api v0.19.4
k8s.io/apiextensions-apiserver v0.19.4
k8s.io/apimachinery v0.19.4
k8s.io/cli-runtime v0.19.4
k8s.io/client-go v0.19.4
k8s.io/cloud-provider v0.19.4
k8s.io/code-generator v0.19.4
k8s.io/kops v1.19.0-beta.2
k8s.io/kubelet v0.19.4
k8s.io/kubernetes v1.19.4
k8s.io/legacy-cloud-providers v0.19.4
sigs.k8s.io/aws-iam-authenticator v0.5.2
sigs.k8s.io/yaml v1.2.0
)

replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.0.0+incompatible
// github.com/aws/aws-sdk-go => github.com/weaveworks/aws-sdk-go v1.25.14-0.20191218135223-757eeed07291
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.3.1
// k8s.io/kops is still using old version of component-base
// which uses an older version of the following package
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.4
// Used to pin the k8s library versions regardless of what other dependencies enforce
k8s.io/api => k8s.io/api v0.16.8
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.8
k8s.io/apimachinery => k8s.io/apimachinery v0.16.8
k8s.io/apiserver => k8s.io/apiserver v0.16.8
k8s.io/cli-runtime => k8s.io/cli-runtime v0.16.8
k8s.io/client-go => k8s.io/client-go v0.16.8
k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.8
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.8
k8s.io/code-generator => k8s.io/code-generator v0.16.8
k8s.io/component-base => k8s.io/component-base v0.16.8
k8s.io/cri-api => k8s.io/cri-api v0.16.8
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.16.8
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.16.8
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.16.8
k8s.io/kube-proxy => k8s.io/kube-proxy v0.16.8
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.16.8
k8s.io/kubectl => k8s.io/kubectl v0.16.8
k8s.io/kubelet => k8s.io/kubelet v0.16.8
k8s.io/kubernetes => k8s.io/kubernetes v1.16.8
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.16.8
k8s.io/metrics => k8s.io/metrics v0.16.8
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.16.8
k8s.io/api => k8s.io/api v0.19.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.4
k8s.io/apimachinery => k8s.io/apimachinery v0.19.4
k8s.io/apiserver => k8s.io/apiserver v0.19.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.4
k8s.io/client-go => k8s.io/client-go v0.19.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.4
k8s.io/code-generator => k8s.io/code-generator v0.19.4
k8s.io/component-base => k8s.io/component-base v0.19.4
k8s.io/cri-api => k8s.io/cri-api v0.19.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.4
k8s.io/kubectl => k8s.io/kubectl v0.19.4
k8s.io/kubelet => k8s.io/kubelet v0.19.4
k8s.io/kubernetes => k8s.io/kubernetes v1.19.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.4
k8s.io/metrics => k8s.io/metrics v0.19.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.4
)

0 comments on commit fe1cec8

Please sign in to comment.