Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Strict parser for config file (with kube 1.16+ dependencies) #1874

Closed
wants to merge 2 commits into from
Closed

Strict parser for config file (with kube 1.16+ dependencies) #1874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03f1bad
Upgrade to 1.16.9
sayboras Apr 27, 2020
202d9f5
Update the docker image for testing purpose
sayboras Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ commands:
--volume=$HOME/.cache/go-build/:/root/.cache/go-build \
--volume=$HOME/go/pkg/mod/:/go/pkg/mod \
--volume=$HOME/project/.ssh:/root/.ssh \
weaveworks/eksctl-build:$(cat .docker/image_tag) << parameters.cmd >>
sayboras/eksctl-build:$(cat .docker/image_tag) << parameters.cmd >>
no_output_timeout: << parameters.timeout >>
docker-pull-build-image:
description: Docker pull image
steps:
- run: docker pull "weaveworks/eksctl-build:$(cat .docker/image_tag)"
- run: docker pull "sayboras/eksctl-build:$(cat .docker/image_tag)"
restore-cache:
description: Restore cache
steps:
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
--volume=$(pwd):/src \
--volume=$HOME/.cache/go-build/:/root/.cache/go-build \
--volume=$HOME/go/pkg/mod/:/go/pkg/mod \
weaveworks/eksctl-build:$(cat .docker/image_tag) ./do-release-candidate.sh
sayboras/eksctl-build:$(cat .docker/image_tag) ./do-release-candidate.sh
no_output_timeout: 21m
- store_artifacts:
path: dist/
Expand All @@ -172,15 +172,15 @@ jobs:
--volume=$(pwd):/src \
--volume=$HOME/.cache/go-build/:/root/.cache/go-build \
--volume=$HOME/go/pkg/mod/:/go/pkg/mod \
weaveworks/eksctl-build:$(cat .docker/image_tag) ./do-release.sh
sayboras/eksctl-build:$(cat .docker/image_tag) ./do-release.sh
no_output_timeout: 21m
- store_artifacts:
path: dist/
integration-tests:
machine:
image: ubuntu-1604:201903-01
environment:
BUILD_IMAGE: weaveworks/eksctl-build:242d3cf855385c4cb174cd0fadf6dc7ac4f76a55
BUILD_IMAGE: sayboras/eksctl-build:242d3cf855385c4cb174cd0fadf6dc7ac4f76a55
steps:
- checkout
- add_ssh_keys:
Expand All @@ -200,7 +200,7 @@ jobs:
--env=AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \
--volume=$(pwd):/src \
--volume=$HOME/project/.ssh:/root/.ssh \
weaveworks/eksctl-build:$(cat .docker/image_tag) make integration-test TEST_V=1 SSH_KEY_PATH="/root/.ssh/${SSH_KEY_NAME}"
sayboras/eksctl-build:$(cat .docker/image_tag) make integration-test TEST_V=1 SSH_KEY_PATH="/root/.ssh/${SSH_KEY_NAME}"
no_output_timeout: 35m
- store_test_results:
path: ./test-results
Expand Down
12 changes: 6 additions & 6 deletions .docker/build_image_manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5"
"github.com/weaveworks/github-release v0.6.3-0.20161024133933-73deea6af1e8"
"golang.org/x/tools v0.0.0-20200301222351-066e0c02454c"
"k8s.io/code-generator v0.15.10"
"k8s.io/code-generator v0.15.10"
"k8s.io/code-generator v0.15.10"
"k8s.io/code-generator v0.15.10"
"k8s.io/code-generator v0.15.10"
100644 blob fc30fbc2fce878ca84826e59f295c1242dc09836 Dockerfile
"k8s.io/code-generator v0.16.9"
"k8s.io/code-generator v0.16.9"
"k8s.io/code-generator v0.16.9"
"k8s.io/code-generator v0.16.9"
"k8s.io/code-generator v0.16.9"
100644 blob e76f65ae7dfa47f7ea6201a65d94cf5825c91f54 Dockerfile
100644 blob c82e75f3145cad2829f4906261adeb738bd33ce1 .requirements
100755 blob 1ec4ce65165cf21e3767ee34d56fb635c51b4a5a install-build-deps.sh
2 changes: 1 addition & 1 deletion .docker/image_tag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1771454748a4688d022c47ada0cc17c12a8e2291
3dcafd53302d1c6aea8c9d7ed1133dd5a454e9b4
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN apk add --no-cache --initdb --root /out \
openssh \
&& true

ENV KUBECTL_VERSION v1.11.5
ENV KUBECTL_VERSION v1.16.9
RUN curl --silent --location "https://dl.k8s.io/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" --output /out/usr/local/bin/kubectl \
&& chmod +x /out/usr/local/bin/kubectl

Expand Down
61 changes: 33 additions & 28 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ require (
github.com/justinbarrick/go-k8s-portforward v1.0.3
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/kevinburke/go-bindata v3.15.0+incompatible
github.com/kr/fs v0.1.0 // indirect
github.com/kris-nova/logger v0.0.0-20181127235838-fd0d87064b06
github.com/kris-nova/lolgopher v0.0.0-20180921204813-313b3abb0d9b // indirect
github.com/kubicorn/kubicorn v0.0.0-20180829191017-06f6bce92acc
Expand All @@ -33,6 +34,8 @@ require (
github.com/onsi/gomega v1.8.1
github.com/pelletier/go-toml v1.6.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.4.1 // indirect
github.com/prometheus/procfs v0.0.10 // indirect
github.com/riywo/loginshell v0.0.0-20190610082906-2ed199a032f6
github.com/spf13/afero v1.2.2
github.com/spf13/cobra v1.0.0
Expand All @@ -48,13 +51,13 @@ require (
github.com/whilp/git-urls v0.0.0-20160530060445-31bac0d230fa
golang.org/x/sys v0.0.0-20200428200454-593003d681fa // indirect
golang.org/x/tools v0.0.0-20200301222351-066e0c02454c
k8s.io/api v0.15.10
k8s.io/apiextensions-apiserver v0.15.10
k8s.io/apimachinery v0.15.10
k8s.io/cli-runtime v0.15.10
k8s.io/api v0.16.9
k8s.io/apiextensions-apiserver v0.16.9
k8s.io/apimachinery v0.16.9
k8s.io/cli-runtime v0.16.9
k8s.io/client-go v11.0.0+incompatible
k8s.io/cloud-provider v0.15.10
k8s.io/code-generator v0.15.10
k8s.io/cloud-provider v0.16.9
k8s.io/code-generator v0.16.9
k8s.io/kops v1.15.2
k8s.io/kubelet v0.0.0
k8s.io/legacy-cloud-providers v0.0.0
Expand All @@ -71,27 +74,29 @@ replace (
// Override version since auto-detected one fails with GOPROXY
github.com/census-instrumentation/opencensus-proto => github.com/census-instrumentation/opencensus-proto v0.2.0
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.3.1
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
// Used to pin the k8s library versions regardless of what other dependencies enforce
k8s.io/api => k8s.io/api v0.15.10
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.15.10
k8s.io/apimachinery => k8s.io/apimachinery v0.15.10
k8s.io/apiserver => k8s.io/apiserver v0.15.10
k8s.io/cli-runtime => k8s.io/cli-runtime v0.15.10
k8s.io/client-go => k8s.io/client-go v0.15.10
k8s.io/cloud-provider => k8s.io/cloud-provider v0.15.10
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.15.10
k8s.io/code-generator => k8s.io/code-generator v0.15.10
k8s.io/component-base => k8s.io/component-base v0.15.10
k8s.io/cri-api => k8s.io/cri-api v0.15.10
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.15.10
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.15.10
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.15.10
k8s.io/kube-proxy => k8s.io/kube-proxy v0.15.10
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.15.10
k8s.io/kubectl => k8s.io/kubectl v0.15.10
k8s.io/kubelet => k8s.io/kubelet v0.15.10
k8s.io/kubernetes => k8s.io/kubernetes v1.15.10
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.15.10
k8s.io/metrics => k8s.io/metrics v0.15.10
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.15.10
k8s.io/api => k8s.io/api v0.16.9
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.9
k8s.io/apimachinery => k8s.io/apimachinery v0.16.9
k8s.io/apiserver => k8s.io/apiserver v0.16.9
k8s.io/cli-runtime => k8s.io/cli-runtime v0.16.9
k8s.io/client-go => k8s.io/client-go v0.16.9
k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.9
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.9
k8s.io/code-generator => k8s.io/code-generator v0.16.9
k8s.io/component-base => k8s.io/component-base v0.16.9
k8s.io/cri-api => k8s.io/cri-api v0.16.9
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.16.9
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.16.9
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.16.9
k8s.io/kube-proxy => k8s.io/kube-proxy v0.16.9
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.16.9
k8s.io/kubectl => k8s.io/kubectl v0.16.9
k8s.io/kubelet => k8s.io/kubelet v0.16.9
k8s.io/kubernetes => k8s.io/kubernetes v1.16.9
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.16.9
k8s.io/metrics => k8s.io/metrics v0.16.9
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.16.9

)
Loading