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

patch v0.17.1 - Fixed sandbox issue #1429

Merged
merged 1 commit into from
Sep 3, 2021
Merged
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
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/charts/flyte/charts
/charts/flyte/Chart.lock
/charts/flyte-core/Chart.lock
13 changes: 6 additions & 7 deletions .github/workflows/sandbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ name: Build & Push Sandbox Docker Image

on:
pull_request:
push:
branches:
- master
release:
types: [published]

jobs:
push-sandbox-image:
Expand All @@ -21,12 +20,12 @@ jobs:
username: "${{ secrets.FLYTE_BOT_USERNAME }}"
password: "${{ secrets.FLYTE_BOT_PAT }}"
image_name: ${{ github.repository_owner }}/flyte-sandbox
image_tag: latest,${{ github.sha }}
image_tag: latest,${{ github.sha }},${{ github.event.ref }}
registry: ghcr.io
build_extra_args: "--target=default --compress=true"
context: ./
dockerfile: docker/sandbox/Dockerfile
push_image_and_stages: ${{ github.event_name != 'pull_request' }}
push_image_and_stages: ${{ github.event_name == 'release' }}
push-sandbox-dind-image:
name: Push sandbox DinD image to GHCR
runs-on: ubuntu-latest
Expand All @@ -40,9 +39,9 @@ jobs:
username: "${{ secrets.FLYTE_BOT_USERNAME }}"
password: "${{ secrets.FLYTE_BOT_PAT }}"
image_name: ${{ github.repository_owner }}/flyte-sandbox
image_tag: dind,dind-${{ github.sha }}
image_tag: dind,dind-${{ github.sha }},dind-${{ github.event.ref }}
registry: ghcr.io
build_extra_args: "--target=dind --compress=true"
context: ./
dockerfile: docker/sandbox/Dockerfile
push_image_and_stages: ${{ github.event_name != 'pull_request' }}
push_image_and_stages: ${{ github.event_name == 'release' }}
4 changes: 4 additions & 0 deletions CHANGELOG/CHANGELOG-v0.17.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Flyte v0.17.1

## Platform
- Updated helm chart to include minio & kubernetes Dashboard nodePort
3 changes: 2 additions & 1 deletion charts/flyte/templates/minio/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ spec:
{{- end }}
ports:
- name: minio
port: 30084
nodePort: 30084
port: 9000
protocol: TCP
targetPort: minio
selector: {{ include "minio.selectorLabels" . | nindent 4 }}
Expand Down
7 changes: 0 additions & 7 deletions charts/flyte/values-gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,3 @@ configmap:
spark: spark
container_array: k8s-array
pytorch: pytorch

#
# MINIO
#

minio:
enabled: false
1 change: 1 addition & 0 deletions charts/flyte/values-sandbox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ kubernetes-dashboard:
service:
type: NodePort
externalPort: 30082
nodePort: 30082

# ------------------------------------------------
#
Expand Down
77 changes: 77 additions & 0 deletions deployment/gcp/flyte_helm_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2611,6 +2611,29 @@ spec:
app.kubernetes.io/name: datacatalog
app.kubernetes.io/instance: flyte
---
# Source: flyte/templates/minio/service.yaml
apiVersion: v1
kind: Service
metadata:
name: minio
namespace: flyte
labels:
app.kubernetes.io/name: minio
app.kubernetes.io/instance: flyte
helm.sh/chart: flyte-v0.1.10
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
ports:
- name: minio
nodePort: 30084
port: 9000
protocol: TCP
targetPort: minio
selector:
app.kubernetes.io/name: minio
app.kubernetes.io/instance: flyte
---
# Source: flyte/templates/postgres/service.yaml
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -3368,6 +3391,60 @@ spec:
name: datacatalog-config
name: config-volume
---
# Source: flyte/templates/minio/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: minio
namespace: flyte
labels:
app.kubernetes.io/name: minio
app.kubernetes.io/instance: flyte
helm.sh/chart: flyte-v0.1.10
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: minio
app.kubernetes.io/instance: flyte
template:
metadata:
labels:
app.kubernetes.io/name: minio
app.kubernetes.io/instance: flyte
helm.sh/chart: flyte-v0.1.10
app.kubernetes.io/managed-by: Helm
spec:
containers:
- image: "minio/minio:RELEASE.2020-12-16T05-05-17Z"
imagePullPolicy: "IfNotPresent"
name: minio
args:
- server
- /data
env:
- name: MINIO_ACCESS_KEY
value: minio
- name: MINIO_SECRET_KEY
value: miniostorage
ports:
- containerPort: 9000
name: minio
resources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 10m
memory: 128Mi
volumeMounts:
- name: minio-storage
mountPath: /var/lib/minioql/data
volumes:
- name: minio-storage
emptyDir: {}
---
# Source: flyte/templates/postgres/deployment.yaml
apiVersion: apps/v1
kind: Deployment
Expand Down
4 changes: 3 additions & 1 deletion deployment/sandbox/flyte_helm_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2609,6 +2609,7 @@ spec:
- port: 30082
targetPort: http
name: http
nodePort: 30082
selector:
app.kubernetes.io/name: kubernetes-dashboard
app.kubernetes.io/instance: flyte
Expand Down Expand Up @@ -2717,7 +2718,8 @@ spec:
type: NodePort
ports:
- name: minio
port: 30084
nodePort: 30084
port: 9000
protocol: TCP
targetPort: minio
selector:
Expand Down
2 changes: 1 addition & 1 deletion docker/sandbox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN wget -q -O - https://raw.githubusercontent.com/flyteorg/flytectl/master/inst
COPY --from=go_builder_ /install/linux/ /flyteorg/bin/

# Copy flyte chart
COPY charts/flyte/values-sandbox.yaml /flyteorg/share/values-sandbox.yaml
COPY charts/flyte/ /flyteorg/share/flyte

# Copy scripts
COPY docker/sandbox/kubectl docker/sandbox/cgroup-v2-hack.sh docker/sandbox/wait-for-flyte.sh /flyteorg/bin/
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox/flyte-entrypoint-default.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ echo "Done."

# Deploy flyte
echo "Deploying Flyte..."
helm repo add flyteorg https://flyteorg.github.io/flyte
helm install -n flyte -f /flyteorg/share/values-sandbox.yaml --create-namespace flyte flyteorg/flyte --kubeconfig /etc/rancher/k3s/k3s.yaml
helm dep update /flyteorg/share/flyte/
helm install -n flyte -f /flyteorg/share/flyte/values-sandbox.yaml --create-namespace flyte /flyteorg/share/flyte --kubeconfig /etc/rancher/k3s/k3s.yaml

wait-for-flyte.sh

Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox/flyte-entrypoint-dind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ echo "Done."

# Deploy flyte
echo "Deploying Flyte..."
helm repo add flyteorg https://flyteorg.github.io/flyte
helm install -n flyte -f /flyteorg/share/values-sandbox.yaml --create-namespace flyte flyteorg/flyte --kubeconfig /etc/rancher/k3s/k3s.yaml
helm dep update /flyteorg/share/flyte/
helm install -n flyte -f /flyteorg/share/flyte/values-sandbox.yaml --create-namespace flyte /flyteorg/share/flyte --kubeconfig /etc/rancher/k3s/k3s.yaml

wait-for-flyte.sh

Expand Down