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

update ks version to 0.12 for webapp backend #1508

Merged
merged 4 commits into from
Sep 12, 2018
Merged

update ks version to 0.12 for webapp backend #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eaf4a55
update ks
lluunn Sep 11, 2018
fb124e4
fix
lluunn Sep 11, 2018
3b63852
update
lluunn Sep 11, 2018
553e28c
fix
lluunn Sep 12, 2018
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 bootstrap/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.10.0/
ARG registries
COPY $registries /opt/registries

# bootstrap is using ksonnet 0.11.0
RUN wget -q https://github.com/ksonnet/ksonnet/releases/download/v0.11.0/ks_0.11.0_linux_amd64.tar.gz && \
tar xzf ks_0.11.0_linux_amd64.tar.gz -C . && \
rm ks_0.11.0_linux_amd64.tar.gz && \
cp ks_0.11.0_linux_amd64/ks /usr/local/bin && \
rm -rf ks_0.11.0_linux_amd64
# bootstrap is using ksonnet 0.12.0
RUN wget -q https://github.com/ksonnet/ksonnet/releases/download/v0.12.0/ks_0.12.0_linux_amd64.tar.gz && \
tar xzf ks_0.12.0_linux_amd64.tar.gz -C . && \
rm ks_0.12.0_linux_amd64.tar.gz && \
cp ks_0.12.0_linux_amd64/ks /usr/local/bin && \
rm -rf ks_0.12.0_linux_amd64

COPY --from=build_base_remote /opt/kubeflow/bootstrapper /opt/kubeflow/
COPY start.sh /opt/kubeflow/
Expand Down
87 changes: 69 additions & 18 deletions bootstrap/glide.lock
View file
Open in desktop

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

4 changes: 3 additions & 1 deletion bootstrap/glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import:
- package: google.golang.org/api
subpackages:
- cloudresourcemanager/v1
- package: google.golang.org/grpc
version: ^1.15.0
- package: k8s.io/kubernetes
version: v1.10.2
- package: k8s.io/client-go
Expand All @@ -36,7 +38,7 @@ import:
- package: k8s.io/apiserver
version: kubernetes-1.10.2
- package: github.com/ksonnet/ksonnet
version: ~0.11.0
version: ~0.12.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry forgot to mention earlier:
glide.lock need to be updated as well.
We can run glide up so that glide.lock pick up changes in glide.yaml
(glide install will use glide.lock to determine versions)

- package: github.com/go-openapi/spec
version: 1de3e0542de65ad8d75452a595886fdd0befb363
- package: github.com/go-openapi/swag
Expand Down
2 changes: 1 addition & 1 deletion components/gcp-click-to-deploy/manifest/kf_app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ spec:
- name: config-volume
mountPath: /app/src/user_config
- name: controller-backend
image: gcr.io/kubeflow-images-public/bootstrapper:v20180910-585674b2-dirty-928448
image: gcr.io/kubeflow-images-public/bootstrapper:v20180912-3b638523-dirty-6a5457
workingDir: /opt/bootstrap
command: [ "/opt/kubeflow/bootstrapper"]
args: [
Expand Down