Added flyte scheduler in helm

charts/flyte-core/README.md

@@ -159,7 +159,7 @@ helm install gateway bitnami/contour -n flyte
 | flytepropeller.serviceAccount.create | bool | `true` | Should a service account be created for FlytePropeller |
 | flytepropeller.serviceAccount.imagePullSecrets | object | `{}` | ImapgePullSecrets to automatically assign to the service account |
 | flytepropeller.tolerations | list | `[]` | tolerations for Flytepropeller deployment |
-| flytescheduler | object | `{"affinity":{},"configPath":"/etc/flyte/config/*.yaml","enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"cr.flyte.org/flyteorg/flytescheduler","tag":"v0.6.28"},"nodeSelector":{},"podAnnotations":{},"resources":{"limits":{"cpu":"250m","ephemeral-storage":"100Mi","memory":"500Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}},"secrets":{},"serviceAccount":{"annotations":{},"create":true,"imagePullSecrets":{}},"tolerations":[]}` |  FLYTESCHEDULER SETTINGS |
+| flytescheduler | object | `{"affinity":{},"configPath":"/etc/flyte/config/*.yaml","image":{"pullPolicy":"IfNotPresent","repository":"cr.flyte.org/flyteorg/flytescheduler","tag":"v0.6.28"},"nodeSelector":{},"podAnnotations":{},"resources":{"limits":{"cpu":"250m","ephemeral-storage":"100Mi","memory":"500Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}},"secrets":{},"serviceAccount":{"annotations":{},"create":true,"imagePullSecrets":{}},"tolerations":[]}` |  FLYTESCHEDULER SETTINGS |
 | flytescheduler.affinity | object | `{}` | affinity for Flyteadmin deployment |
 | flytescheduler.configPath | string | `"/etc/flyte/config/*.yaml"` | Default regex string for searching configuration files |
 | flytescheduler.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |

charts/flyte-core/templates/flytescheduler/configmap.yaml

@@ -1,4 +1,5 @@
-{{- if .Values.flytescheduler.enabled }}
+{{- if .Values.workflow_scheduler.enabled}}
+{{- if eq .Values.workflow_scheduler.type "native" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/flyte-core/templates/flytescheduler/deployment.yaml

@@ -1,4 +1,5 @@
-{{- if .Values.flytescheduler.enabled }}
+{{- if .Values.workflow_scheduler.enabled}}
+{{- if eq .Values.workflow_scheduler.type "native" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -59,4 +60,5 @@ spec:
       {{- with .Values.flytescheduler.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}
+  {{- end }}
   {{- end }}

charts/flyte-core/values-eks.yaml

@@ -54,8 +54,7 @@ flyteadmin:
 # FLYTESCHEDULER
 #
 
-flytescheduler:
-  enabled: false
+flytescheduler: {}
 
 #
 # DATACATALOG
@@ -326,6 +325,7 @@ configmap:
 # this module, you will not have scheduled launchplans/workflows.
 workflow_scheduler:
   enabled: false
+  type: native
   config:
     scheduler:
       # -- This is configured to use Cloudwatch schedules as explained [here](https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/Create-CloudWatch-Events-Scheduled-Rule.html)

charts/flyte-core/values.yaml

@@ -66,7 +66,6 @@ flyteadmin:
 #
 
 flytescheduler:
-  enabled: true
   image:
     # -- Docker image for Flyteadmin deployment
     repository:  cr.flyte.org/flyteorg/flytescheduler

charts/flyte/README.md

@@ -183,11 +183,11 @@ helm install gateway bitnami/contour -n flyte
 | flytepropeller.serviceAccount.create | bool | `true` | Should a service account be created for FlytePropeller |
 | flytepropeller.serviceAccount.imagePullSecrets | object | `{}` | ImapgePullSecrets to automatically assign to the service account |
 | flytepropeller.tolerations | list | `[]` | tolerations for Flytepropeller deployment |
-| flytescheduler | object | `{"affinity":{},"configPath":"/etc/flyte/config/*.yaml","enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"ghcr.io/flyteorg/flytescheduler","tag":"v0.6.28"},"nodeSelector":{},"podAnnotations":{},"resources":{"limits":{"cpu":"250m","ephemeral-storage":"100Mi","memory":"500Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}},"secrets":{},"serviceAccount":{"annotations":{},"create":true,"imagePullSecrets":{}},"tolerations":[]}` |  FLYTESCHEDULER SETTINGS |
+| flytescheduler | object | `{"affinity":{},"configPath":"/etc/flyte/config/*.yaml","image":{"pullPolicy":"IfNotPresent","repository":"cr.flyte.org/flyteorg/flytescheduler","tag":"v0.6.28"},"nodeSelector":{},"podAnnotations":{},"resources":{"limits":{"cpu":"250m","ephemeral-storage":"100Mi","memory":"500Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}},"secrets":{},"serviceAccount":{"annotations":{},"create":true,"imagePullSecrets":{}},"tolerations":[]}` |  FLYTESCHEDULER SETTINGS |
 | flytescheduler.affinity | object | `{}` | affinity for Flyteadmin deployment |
 | flytescheduler.configPath | string | `"/etc/flyte/config/*.yaml"` | Default regex string for searching configuration files |
 | flytescheduler.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
-| flytescheduler.image.repository | string | `"ghcr.io/flyteorg/flytescheduler"` | Docker image for Flyteadmin deployment |
+| flytescheduler.image.repository | string | `"cr.flyte.org/flyteorg/flytescheduler"` | Docker image for Flyteadmin deployment |
 | flytescheduler.image.tag | string | `"v0.6.28"` | Docker image tag |
 | flytescheduler.nodeSelector | object | `{}` | nodeSelector for Flyteadmin deployment |
 | flytescheduler.podAnnotations | object | `{}` | Annotations for Flyteadmin pods |

charts/flyte/templates/flytescheduler/configmap.yaml

@@ -1,8 +1,9 @@
-{{- if .Values.flytescheduler.enabled }}
+{{- if .Values.workflow_scheduler.enabled}}
+{{- if eq .Values.workflow_scheduler.type "native" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: flyte-scheduler-admin-config
+  name: flyte-scheduler-config
   namespace: {{ template "flyte.namespace" . }}
   labels: {{ include "flytescheduler.labels" . | nindent 4 }}
 data:
@@ -24,4 +25,5 @@ data:
   scheduler.yaml: | {{ tpl (toYaml .) $ | nindent 4 }}
 {{- end }}
 {{- end }}
+{{- end }}
 {{- end }}

charts/flyte/templates/flytescheduler/deployment.yaml

@@ -1,4 +1,5 @@
-{{- if .Values.flytescheduler.enabled }}
+{{- if .Values.workflow_scheduler.enabled}}
+{{- if eq .Values.workflow_scheduler.type "native" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -59,4 +60,5 @@ spec:
       {{- with .Values.flytescheduler.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}
+  {{- end }}
   {{- end }}

charts/flyte/values-eks.yaml

@@ -51,8 +51,7 @@ flyteadmin:
 # FLYTESCHEDULER
 #
 
-flytescheduler:
-  enabled: false
+flytescheduler: {}
 
 #
 # DATACATALOG
@@ -347,7 +346,7 @@ configmap:
 # -- # Flyte uses a cloud hosted Cron scheduler to run workflows on a schedule. The following module is optional. Without,
 # this module, you will not have scheduled launchplans/workflows.
 workflow_scheduler:
-  enabled: true
+  enabled: false
   config:
     scheduler:
       # -- This is configured to use Cloudwatch schedules as explained [here](https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/Create-CloudWatch-Events-Scheduled-Rule.html)
@@ -370,6 +369,7 @@ workflow_scheduler:
 # various events in their workflows
 workflow_notifications:
   enabled: false
+  type: native
   config:
     notifications:
       type: aws

charts/flyte/values-sandbox.yaml

@@ -215,6 +215,7 @@ configmap:
 # this module, you will not have scheduled launchplans/workflows.
 workflow_scheduler:
   enabled: true
+  type: native
 
 # --
 # Workflow notifications module is an optional dependency. Flyte uses cloud native pub-sub systems to notify users of

charts/flyte/values.yaml

@@ -68,10 +68,9 @@ flyteadmin:
 #
 
 flytescheduler:
-  enabled: true
   image:
     # -- Docker image for Flyteadmin deployment
-    repository:  ghcr.io/flyteorg/flytescheduler
+    repository: cr.flyte.org/flyteorg/flytescheduler
     # -- Docker image tag
     tag: v0.6.28 # FLYTESCHEDULER_TAG
     # -- Docker image pull policy

deployment/eks/flyte_helm_generated.yaml

@@ -370,21 +370,6 @@ data:
       refresh: 5m
       refreshInterval: 5m
       templatePath: /etc/flyte/clusterresource/templates
-  scheduler.yaml: | 
-    scheduler:
-      eventScheduler:
-        region: '<AWS_REGION>'
-        scheduleNamePrefix: flyte
-        scheduleRole: arn:aws:iam::<ACCOUNT_NUMBER>:role/flyte_cron_scheduler_role
-        scheme: aws
-        targetName: arn:aws:sqs:<AWS_REGION>:<ACCOUNT_NUMBER>:flyte-helm-test-cron-scheduler-queue
-      workflowExecutor:
-        accountId: '<ACCOUNT_NUMBER>'
-        reconnectAttempts: 10
-        reconnectDelaySeconds: 30
-        region: '<AWS_REGION>'
-        scheduleQueueName: flyte-helm-test-cron-scheduler-queue
-        scheme: aws
 ---
 # Source: flyte/templates/console/configmap.yaml
 apiVersion: v1
@@ -1348,7 +1333,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "1e835d36ff62ef26701c9386a8264d96938fd75a0a9ff8dab1251397eea9c89"
+        configChecksum: "dec12d3ac1285f51fd4cc5d079339a26633fc8984313de9cdaef3b0d2f4f8b9"
       labels: 
         app.kubernetes.io/name: flyteadmin
         app.kubernetes.io/instance: flyte

deployment/gcp/flyte_helm_generated.yaml

@@ -363,92 +363,6 @@ data:
       limits:
         maxDownloadMBs: 10
 ---
-# Source: flyte/templates/flytescheduler/configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: flyte-scheduler-admin-config
-  namespace: flyte
-  labels: 
-    app.kubernetes.io/name: flytescheduler
-    app.kubernetes.io/instance: flyte
-    helm.sh/chart: flyte-v0.1.10
-    app.kubernetes.io/managed-by: Helm
-data:
-  admin.yaml: | 
-    admin:
-      endpoint: flyteadmin:81
-      insecure: true
-    event:
-      capacity: 1000
-      rate: 500
-      type: admin
-  db.yaml: | 
-    database:
-      dbname: flyteadmin
-      host: postgres
-      port: 5432
-      username: postgres
-  logger.yaml: | 
-    logger:
-      level: 4
-      show-source: true
-  server.yaml: | 
-    auth:
-      appAuth:
-        thirdPartyConfig:
-          flyteClient:
-            clientId: flytectl
-            redirectUri: http://localhost:53593/callback
-            scopes:
-            - offline
-            - all
-      authorizedUris:
-      - https://localhost:30081
-      - http://flyteadmin:80
-      - http://flyteadmin.flyte.svc.cluster.local:80
-      userAuth:
-        openId:
-          baseUrl: https://accounts.google.com
-          clientId: 657465813211-6eog7ek7li5k7i7fvgv2921075063hpe.apps.googleusercontent.com
-          scopes:
-          - profile
-          - openid
-    flyteadmin:
-      eventVersion: 1
-      metadataStoragePrefix:
-      - metadata
-      - admin
-      metricsScope: 'flyte:'
-      profilerPort: 10254
-      roleNameKey: iam.amazonaws.com/role
-      testing:
-        host: http://flyteadmin
-    server:
-      grpcPort: 8089
-      httpPort: 8088
-      security:
-        allowCors: true
-        allowedHeaders:
-        - Content-Type
-        - flyte-authorization
-        allowedOrigins:
-        - '*'
-        secure: false
-        useAuth: false
-  storage.yaml: | 
-    storage:
-      type: stow
-      stow:
-        kind: google
-        config:
-          json: ""
-          project_id: <GOOGLE_PROJECT_ID>
-          scopes: https://www.googleapis.com/auth/devstorage.read_write
-      container: "<BUCKET_NAME>"
-      limits:
-        maxDownloadMBs: 10
----
 # Source: flyte/templates/propeller/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
@@ -1592,77 +1506,6 @@ spec:
           name: datacatalog-config
         name: config-volume
 ---
-# Source: flyte/templates/flytescheduler/deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: flytescheduler
-  namespace: flyte
-  labels: 
-    app.kubernetes.io/name: flytescheduler
-    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: flytescheduler
-      app.kubernetes.io/instance: flyte
-  template:
-    metadata:
-      annotations:
-        configChecksum: "b82f80234a60e51e11c35cd37594272dd9bbb99bd767ef748b6beea9deee192"
-      labels: 
-        app.kubernetes.io/name: flytescheduler
-        app.kubernetes.io/instance: flyte
-        helm.sh/chart: flyte-v0.1.10
-        app.kubernetes.io/managed-by: Helm
-    spec:
-      initContainers:
-      - command:
-        - flytescheduler
-        - precheck
-        - --config
-        - /etc/flyte/config/*.yaml
-        image: "ghcr.io/flyteorg/flytescheduler:v0.6.28"
-        imagePullPolicy: "IfNotPresent"
-        name: flytescheduler-check
-        volumeMounts:
-
-          - mountPath: /etc/flyte/config
-            name: config-volume
-      containers:
-      - command:
-        - flytescheduler
-        - run
-        - --config
-        - /etc/flyte/config/*.yaml
-        image: "ghcr.io/flyteorg/flytescheduler:v0.6.28"
-        imagePullPolicy: "IfNotPresent"
-        name: flytescheduler
-        resources: 
-          limits:
-            cpu: 250m
-            ephemeral-storage: 100Mi
-            memory: 500Mi
-          requests:
-            cpu: 10m
-            ephemeral-storage: 50Mi
-            memory: 50Mi
-        volumeMounts:
-
-          - mountPath: /etc/flyte/config
-            name: config-volume
-      serviceAccountName: flyteadmin
-      volumes:
-
-        - emptyDir: {}
-          name: shared-data
-        - configMap:
-            name: flytescheduler-admin-config
-          name: config-volume
----
 # Source: flyte/templates/propeller/deployment.yaml
 apiVersion: apps/v1
 kind: Deployment

deployment/sandbox/flyte_helm_generated.yaml

@@ -491,7 +491,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: flyte-scheduler-admin-config
+  name: flyte-scheduler-config
   namespace: flyte
   labels: 
     app.kubernetes.io/name: flytescheduler
@@ -3853,7 +3853,7 @@ spec:
         - precheck
         - --config
         - /etc/flyte/config/*.yaml
-        image: "ghcr.io/flyteorg/flytescheduler:v0.6.28"
+        image: "cr.flyte.org/flyteorg/flytescheduler:v0.6.28"
         imagePullPolicy: "IfNotPresent"
         name: flytescheduler-check
         volumeMounts:
@@ -3866,7 +3866,7 @@ spec:
         - run
         - --config
         - /etc/flyte/config/*.yaml
-        image: "ghcr.io/flyteorg/flytescheduler:v0.6.28"
+        image: "cr.flyte.org/flyteorg/flytescheduler:v0.6.28"
         imagePullPolicy: "IfNotPresent"
         name: flytescheduler
         resources: