fix sandbox helm issue (flyteorg#1429)

Signed-off-by: Yuvraj <[email protected]>
Tom-Newton · Sep 3, 2021 · 8d6091c · 8d6091c
1 parent 9c2f598
commit 8d6091c
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 21 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+/charts/flyte/charts
+/charts/flyte/Chart.lock
+/charts/flyte-core/Chart.lock
diff --git a/.github/workflows/sandbox.yml b/.github/workflows/sandbox.yml
@@ -2,9 +2,8 @@ name: Build & Push Sandbox Docker Image
 
 on:
   pull_request:
-  push:
-    branches:
-      - master
+  release:
+    types: [published]
 
 jobs:
   push-sandbox-image:
@@ -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
@@ -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' }}
diff --git a/CHANGELOG/CHANGELOG-v0.17.1.md b/CHANGELOG/CHANGELOG-v0.17.1.md
@@ -0,0 +1,4 @@
+# Flyte v0.17.1
+
+## Platform
+- Updated helm chart to include minio & kubernetes Dashboard nodePort
diff --git a/charts/flyte/templates/minio/service.yaml b/charts/flyte/templates/minio/service.yaml
@@ -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 }}

diff --git a/charts/flyte/values-gcp.yaml b/charts/flyte/values-gcp.yaml
@@ -46,10 +46,3 @@ configmap:
         spark: spark
         container_array: k8s-array
         pytorch: pytorch
-
-#
-# MINIO
-#
-
-minio:
-  enabled: false
diff --git a/charts/flyte/values-sandbox.yaml b/charts/flyte/values-sandbox.yaml
@@ -87,6 +87,7 @@ kubernetes-dashboard:
   service:
     type: NodePort
     externalPort: 30082
+    nodePort: 30082
 
 # ------------------------------------------------
 #

diff --git a/deployment/gcp/flyte_helm_generated.yaml b/deployment/gcp/flyte_helm_generated.yaml
@@ -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
@@ -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

diff --git a/deployment/sandbox/flyte_helm_generated.yaml b/deployment/sandbox/flyte_helm_generated.yaml
@@ -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
@@ -2717,7 +2718,8 @@ spec:
   type: NodePort
   ports:
   - name: minio
-    port: 30084
+    nodePort: 30084
+    port: 9000
     protocol: TCP
     targetPort: minio
   selector: 

diff --git a/docker/sandbox/Dockerfile b/docker/sandbox/Dockerfile
@@ -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/

diff --git a/docker/sandbox/flyte-entrypoint-default.sh b/docker/sandbox/flyte-entrypoint-default.sh
@@ -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
 

diff --git a/docker/sandbox/flyte-entrypoint-dind.sh b/docker/sandbox/flyte-entrypoint-dind.sh
@@ -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