Merge branch 'master' into 4291-separate-buckets

Signed-off-by: David Espejo <[email protected]>
flyteorg · Mar 15, 2024 · d1b7dee · d1b7dee
2 parents cbcded1 + 3100c12
commit d1b7dee
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/single-binary.yml b/.github/workflows/single-binary.yml
@@ -156,7 +156,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - uses: unionai/[email protected]
       - name: Setup sandbox
         run: |
@@ -181,17 +181,17 @@ jobs:
         with:
           repository: flyteorg/flytesnacks
           path: flytesnacks
-          # TODO: Enable this once refactored version produces a release tag
-          # ref: ${{ env.FLYTESNACKS_VERSION }}
+          ref: ${{ env.FLYTESNACKS_VERSION }}
       - name: Register specific tests
         run: |
+          flytekit_version=$(pip show flytekit | grep -i version | awk '{ print $2 }')
           while read -r line;
           do
               pyflyte --config ./boilerplate/flyte/end2end/functional-test-config.yaml \
                   register \
                   --project flytesnacks \
                   --domain development \
-                  --image cr.flyte.org/flyteorg/flytekit:py3.11-latest \
+                  --image cr.flyte.org/flyteorg/flytekit:py3.12-${flytekit_version} \
                   --version ${{ env.FLYTESNACKS_VERSION }} \
                   flytesnacks/$line;
           done < flytesnacks/flyte_tests.txt

diff --git a/.github/workflows/validate-helm-charts.yaml b/.github/workflows/validate-helm-charts.yaml
@@ -5,8 +5,9 @@ on:
     branches:
       - master
     paths:
-      - deployment
-      - docker/sandbox-bundled/manifests
+      - "charts/**"
+      - "deployment/**"
+      - "docker/sandbox-bundled/manifests/**"
 
 jobs:
   lint-and-test-charts:

diff --git a/charts/flyte-core/templates/flytescheduler/deployment.yaml b/charts/flyte-core/templates/flytescheduler/deployment.yaml
@@ -48,8 +48,10 @@ spec:
         volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 8 }}
         - mountPath: /etc/flyte/config
           name: config-volume
+        {{- if .Values.secrets.adminOauthClientCredentials.enabled }}
         - name: auth
           mountPath: /etc/secrets/
+        {{- end }}
       {{- end }}
       containers:
       - command:

diff --git a/charts/flyte-deps/Chart.yaml b/charts/flyte-deps/Chart.yaml
@@ -11,7 +11,7 @@ dependencies:
   - name: spark-operator
     alias: sparkoperator
     version: 1.1.15
-    repository: https://googlecloudplatform.github.io/spark-on-k8s-operator
+    repository: https://kubeflow.github.io/spark-operator
     condition: sparkoperator.enabled
   - name: dask-kubernetes-operator
     alias: daskoperator

diff --git a/charts/flyte-deps/README.md b/charts/flyte-deps/README.md
@@ -9,8 +9,8 @@ A Helm chart for Flyte dependency
 | Repository | Name | Version |
 |------------|------|---------|
 | https://charts.bitnami.com/bitnami | contour | 7.10.1 |
-| https://googlecloudplatform.github.io/spark-on-k8s-operator | sparkoperator(spark-operator) | 1.1.15 |
 | https://helm.dask.org | daskoperator(dask-kubernetes-operator) | 2022.12.0 |
+| https://kubeflow.github.io/spark-operator | sparkoperator(spark-operator) | 1.1.15 |
 | https://kubernetes.github.io/dashboard/ | kubernetes-dashboard | 4.0.2 |
 
 ### SANDBOX INSTALLATION:

diff --git a/charts/flyte/Chart.yaml b/charts/flyte/Chart.yaml
@@ -15,7 +15,7 @@ dependencies:
   - name: spark-operator
     alias: sparkoperator
     version: 1.1.15
-    repository: https://googlecloudplatform.github.io/spark-on-k8s-operator
+    repository: https://kubeflow.github.io/spark-operator
     condition: sparkoperator.enabled
   - name: dask-kubernetes-operator
     alias: daskoperator

diff --git a/charts/flyte/README.md b/charts/flyte/README.md
@@ -10,8 +10,8 @@ A Helm chart for Flyte Sandbox
 |------------|------|---------|
 | file://../flyte-core | flyte(flyte-core) | v0.1.10 |
 | https://charts.bitnami.com/bitnami | contour | 7.10.1 |
-| https://googlecloudplatform.github.io/spark-on-k8s-operator | sparkoperator(spark-operator) | 1.1.15 |
 | https://helm.dask.org | daskoperator(dask-kubernetes-operator) | 2022.12.0 |
+| https://kubeflow.github.io/spark-operator | sparkoperator(spark-operator) | 1.1.15 |
 | https://kubernetes.github.io/dashboard/ | kubernetes-dashboard | 4.0.2 |
 
 **NOTE:** Flyte sandbox helm chart is deprecated, From now follow the sandbox [docs](https://docs.flyte.org/en/latest/deployment/sandbox.html) for installing it on cloud

diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml
@@ -816,7 +816,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: TjcwUUU5a0I4NjY1VEZ6QQ==
+  haSharedSecret: VTg5RFBvY205cXRtcEVFbw==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1412,7 +1412,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: f1051560597442e19f00458f2d7e59764124ab7f5f37ad7e64af8fa0750aa8bf
+        checksum/secret: b8339a7b42c1e04b994b517d4ddd749074787df4a0eaef9e1aa2181988aea2d7
       labels:
         app: docker-registry
         release: flyte-sandbox

diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml
@@ -796,7 +796,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: aFNrWVg3UVRQQ1QwWk8wZg==
+  haSharedSecret: ZTNEUmhqY1VsWDBXNFowTg==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1360,7 +1360,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: c5a1150d783cdbf08b5809a4aa4e8edb1350dbe194919353ac464df3a2ad9cf9
+        checksum/secret: cedf489b22e27428631c5c365e58bfd51cf8465bf04d07a74462677278017b80
       labels:
         app: docker-registry
         release: flyte-sandbox

diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml
@@ -499,7 +499,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  haSharedSecret: QkRKSmNZU1M4MjhycFcwSA==
+  haSharedSecret: bkV2U2JzN0o2TXNVcHJTMg==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -934,7 +934,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 96dcc672fc5ca4b9964df1dc5392d25be3cc5fd6727d2f6e645325210618b2a6
+        checksum/secret: 2f2e4b3f4abc8a670a75900bd0c7987fb3afa6b2a287fdf7292fbeb755c00c12
       labels:
         app: docker-registry
         release: flyte-sandbox