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.

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

Changes for 0.10.0 release #1

Open
wants to merge 9 commits into
base: int
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 16 additions & 11 deletions docbuilder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
FROM ubuntu:bionic
RUN apt-get update \
&& apt-get install -y \
python-virtualenv \
python3-pip \
python3-dev \
&& apt-get autoremove \
&& apt-get clean
FROM ubuntu:focal
RUN : \
&& apt-get update \
&& apt install -y software-properties-common \
&& add-apt-repository ppa:deadsnakes/ppa

RUN : \
&& apt-get update \
&& apt-get install -y python3.7 python3-pip python3.7-venv make build-essential libssl-dev curl vim \
&& apt-get autoremove \
&& apt-get clean

ENV VENV /venv

RUN virtualenv -p python3.6 ${VENV} \
&& ${VENV}/bin/pip install Sphinx \
&& ${VENV}/bin/pip install sphinx_rtd_theme
RUN python3.7 -m venv ${VENV} \
&& ${VENV}/bin/pip3 install wheel
RUN : \
&& ${VENV}/bin/pip3 install Sphinx \
&& ${VENV}/bin/pip3 install sphinx_rtd_theme

# virtual env entrypoint
COPY entrypoint.sh /opt
Expand Down
10 changes: 5 additions & 5 deletions flytetester/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export IMAGE_NAME=flytetester
export IMAGE_NAME=flytetools
VERSION=$(shell ./version.sh)
PROJECT=flytetester
DOMAIN=development
Expand All @@ -20,7 +20,7 @@ register_staging: docker_push
-e FLYTE_CREDENTIALS_CLIENT_SECRET=${FLYTE_CREDENTIALS_CLIENT_SECRET} \
-e FLYTE_CREDENTIALS_AUTH_MODE=basic -e FLYTE_CREDENTIALS_AUTHORIZATION_METADATA_KEY=flyte-authorization \
-e FLYTE_CREDENTIALS_SCOPE=svc -e FLYTE_PLATFORM_AUTH=True \
docker.io/lyft/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_staging_in_container
ghcr.io/nuclyde-io/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_staging_in_container

.PHONY: register_production_in_container
register_production_in_container:
Expand All @@ -32,15 +32,15 @@ register_production: docker_push
-e FLYTE_CREDENTIALS_CLIENT_SECRET=${FLYTE_CREDENTIALS_CLIENT_SECRET} \
-e FLYTE_CREDENTIALS_AUTH_MODE=basic -e FLYTE_CREDENTIALS_AUTHORIZATION_METADATA_KEY=flyte-authorization \
-e FLYTE_CREDENTIALS_SCOPE=svc -e FLYTE_PLATFORM_AUTH=True \
docker.io/lyft/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_production_in_container
ghcr.io/nuclyde-io/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_production_in_container

.PHONY: register_production_in_container
register_sandbox_in_container:
pyflyte -p ${PROJECT} -d ${DOMAIN} --config /root/sandbox.config register workflows

.PHONY: register_production
register_sandbox: docker_push
docker run docker.io/lyft/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_sandbox_in_container
docker run ghcr.io/nuclyde-io/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_sandbox_in_container

.PHONY: end2end
end2end_test:
Expand All @@ -52,7 +52,7 @@ docker_build:

.PHONY: docker_push
docker_push:
REGISTRY=docker.io/lyft scripts/docker_build.sh
REGISTRY=ghcr.io/nuclyde-io scripts/docker_build.sh

.PHONY: docker_build_push
docker_build_push:
Expand Down
12 changes: 6 additions & 6 deletions flytetester/end2end/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ flytekit_venv flyte-cli -h flyteadmin:81 --insecure register-project -n flytetes
# Currently, kill the admin pod, so that the init container sync picks up the change.

# First register everything, but make sure to use local Dockernetes admin
flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config register workflows
flytekit_venv pyflyte -c end2end/end2end.config register -p flytetester -d development workflows

# Kick off workflows
flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config lp execute app.workflows.work.WorkflowWithIO --b hello_world
flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config lp execute app.workflows.failing_workflows.DivideByZeroWf
flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config lp execute app.workflows.failing_workflows.RetrysWf
flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config lp execute app.workflows.failing_workflows.FailingDynamicNodeWF
flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config lp execute app.workflows.failing_workflows.RunToCompletionWF
flytekit_venv pyflyte -c end2end/end2end.config lp -p flytetester -d development execute app.workflows.work.WorkflowWithIO --b hello_world
flytekit_venv pyflyte -c end2end/end2end.config lp -p flytetester -d development execute app.workflows.failing_workflows.DivideByZeroWf
flytekit_venv pyflyte -c end2end/end2end.config lp -p flytetester -d development execute app.workflows.failing_workflows.RetrysWf
flytekit_venv pyflyte -c end2end/end2end.config lp -p flytetester -d development execute app.workflows.failing_workflows.FailingDynamicNodeWF
flytekit_venv pyflyte -c end2end/end2end.config lp -p flytetester -d development execute app.workflows.failing_workflows.RunToCompletionWF

# Make sure workflow does everything correctly
flytekit_venv python end2end/validator.py
2 changes: 1 addition & 1 deletion flytetester/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
flytekit[sidecar,schema]==0.16.0a0
flytekit[sidecar,schema]==0.16.0a2
statsd
opencv-python
k8s-proto>=0.0.2
Expand Down