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

Kubernetes Backend; Go Module Support #626

Merged
merged 23 commits into from
Mar 27, 2020
Merged

Kubernetes Backend; Go Module Support #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c108da6
compute: adding kubernetes backend [wip]; use go modules
adamstruck Feb 18, 2020
2664c93
travis: use go 1.12
adamstruck Feb 20, 2020
a0e3cfd
kubernetes: wip; added template file option for compute backends
adamstruck Feb 20, 2020
73b952e
kubernetes: deployment docs
adamstruck Feb 20, 2020
21ca711
kubernetes: map tes disk requests to kubernetes job
adamstruck Feb 21, 2020
9a25baf
rollback github.com/aws/aws-sdk-go to v1.13.54;
adamstruck Feb 21, 2020
8dbde34
Makefile: set CGO_ENABLED=0
adamstruck Feb 21, 2020
d9366f7
website: add kubernetes section
adamstruck Feb 21, 2020
b64fbcf
Merge branch 'master' into kube
adamstruck Feb 21, 2020
636a2a8
kubernetes: add dind-rootless variant of funnel worker
adamstruck Feb 24, 2020
498a5f3
Adding docker file based on docker-in-docker image
kellrott Mar 18, 2020
0648192
Adding entrypoints and rootless docker in docker build
kellrott Mar 18, 2020
87b2c96
Renaming docker-in-docker builds
kellrott Mar 19, 2020
bfa7a1e
Merge remote-tracking branch 'origin/master' into kube
kellrott Mar 19, 2020
3a20afa
adds serviceAccount
bwalsh Mar 25, 2020
579d41d
compute/kube: updating docs
adamstruck Mar 26, 2020
c1f0d0b
compute/kube: updating docs
adamstruck Mar 26, 2020
35c95b7
goreleaser: remove docker builds since dockerhub handles those now
adamstruck Mar 26, 2020
974e340
Merge branch 'master' into kube
kellrott Mar 26, 2020
6b7b9c2
fix dockerfile
adamstruck Mar 26, 2020
0473344
webdash: fix security vulnerabilities
adamstruck Mar 26, 2020
6e45e20
Makefile: added 'build'; removed 'depends'
adamstruck Mar 27, 2020
177ba11
update .travis.yml
adamstruck Mar 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
1 change: 0 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ Dockerfile*
build
website
docs
deployments
storage/_test_download
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ storage/_test_download
/webdash/bundle.js
/webdash/style.css
/vendor
docker/funnel
deployments/kubernetes/**/funnel
deployments/kubernetes/**/*.json
funnel
7 changes: 0 additions & 7 deletions .goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ archives:
- format: tar.gz
name_template: "{{.ProjectName}}-{{.Os}}-{{.Arch}}-{{.Version}}"

dockers:
- goos: linux
goarch: amd64
image_templates:
- "ohsucompbio/funnel:{{.Version}}"
dockerfile: ./docker/Dockerfile

brews:
- github:
owner: ohsu-comp-bio
Expand Down
14 changes: 8 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ os:
- linux
language: go
go:
- "1.10"
- "1.12"

dist: xenial
sudo: required

services:
Expand All @@ -12,20 +14,20 @@ services:
cache:
directories:
- $GOPATH/pkg
- $GOPATH/src/github.com/ohsu-comp-bio/funnel/.git/modules
- $GOPATH/src/github.com/ohsu-comp-bio/funnel/vendor

git:
submodules: false

install:
- make depends
- make
- export GO111MODULE=on
- make install

jobs:
include:
- stage: all
script: make lint
script:
- make lint-depends
- make lint
env:
- n=lint
- script: make test
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ RUN apk add make git bash build-base
ENV GOPATH=/go
ENV PATH="/go/bin:${PATH}"
ADD ./ /go/src/github.com/ohsu-comp-bio/funnel
RUN cd /go/src/github.com/ohsu-comp-bio/funnel && make install
RUN cd /go/src/github.com/ohsu-comp-bio/funnel && make build

# final stage
FROM alpine
WORKDIR /opt/funnel
VOLUME /opt/funnel/funnel-work-dir
EXPOSE 8000 9090
ENV PATH="/app:${PATH}"
COPY --from=build-env /go/bin/funnel /app/
COPY --from=build-env /go/src/github.com/ohsu-comp-bio/funnel/funnel /app/

ENTRYPOINT ["/app/funnel"]
18 changes: 18 additions & 0 deletions Dockerfile.dind
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# build stage
FROM golang:1.13.8-alpine AS build-env
RUN apk add make git bash build-base
ENV GOPATH=/go
ENV PATH="/go/bin:${PATH}"
ADD ./ /go/src/github.com/ohsu-comp-bio/funnel
RUN cd /go/src/github.com/ohsu-comp-bio/funnel && make build

# final stage
FROM docker:stable-dind
WORKDIR /opt/funnel
VOLUME /opt/funnel/funnel-work-dir
EXPOSE 8000 9090
ENV PATH="/app:${PATH}"
COPY --from=build-env /go/src/github.com/ohsu-comp-bio/funnel/funnel /app/
ADD ./deployments/kubernetes/dind/entrypoint.sh /usr/local/bin/entrypoint.sh

ENTRYPOINT ["entrypoint.sh"]
18 changes: 18 additions & 0 deletions Dockerfile.dind-rootless
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# build stage
FROM golang:1.13.8-alpine AS build-env
RUN apk add make git bash build-base
ENV GOPATH=/go
ENV PATH="/go/bin:${PATH}"
ADD ./ /go/src/github.com/ohsu-comp-bio/funnel
RUN cd /go/src/github.com/ohsu-comp-bio/funnel && make build

# final stage
FROM docker:stable-dind-rootless
WORKDIR /opt/funnel
VOLUME /opt/funnel/funnel-work-dir
EXPOSE 8000 9090
ENV PATH="/app:${PATH}"
COPY --from=build-env /go/src/github.com/ohsu-comp-bio/funnel/funnel /app/
ADD ./deployments/kubernetes/dind-rootless/entrypoint.sh /usr/local/bin/entrypoint.sh

ENTRYPOINT ["entrypoint.sh"]
Loading