update chart

Signed-off-by: Kevin Su <[email protected]>
flyteorg · Aug 10, 2023 · dae513c · dae513c
1 parent 7b6b387
commit dae513c
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 200 deletions.
diff --git a/charts/flyte-agent/README.md b/charts/flyte-agent/README.md
@@ -13,11 +13,10 @@ A Helm chart for Flyte agent
 | additionalVolumes | list | `[]` | Appends additional volumes to the deployment spec. May include template values. |
 | affinity | object | `{}` | affinity for flyteagent deployment |
 | agentSecret.name | string | `""` | Specify name of K8s Secret. Leave it empty if you don't need this Secret |
-| agentSecret.secretData | object | `{"data":{"username":"User"}}` | Specify your Secret (with sensitive data) or pseudo-manifest (without sensitive data). See https://github.com/godaddy/kubernetes-external-secrets |
+| agentSecret.secretData | object | `{"data":{"username":"User"}}` | Specify your Secret (with sensitive data) or pseudo-manifest (without sensitive data). |
 | commonAnnotations | object | `{}` |  |
 | commonLabels | object | `{}` |  |
 | configPath | string | `"/etc/flyteagent/config/*.yaml"` | Default regex string for searching configuration files |
-| enabled | bool | `true` |  |
 | extraArgs | object | `{}` | Appends extra command line arguments to the main command |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |

diff --git a/charts/flyte-agent/templates/agent/deployment.yaml b/charts/flyte-agent/templates/agent/deployment.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -52,4 +51,3 @@ spec:
       {{- with .Values.tolerations }}
       tolerations: {{ tpl (toYaml .) $ | nindent 8 }}
       {{- end }}
-{{- end }}
diff --git a/charts/flyte-agent/templates/agent/secret.yaml b/charts/flyte-agent/templates/agent/secret.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,4 +7,3 @@ type: Opaque
 {{- with .Values.agentSecret.secretData -}}
 {{ tpl (toYaml .) $ | nindent 0 }}
 {{- end }}
-{{- end }}
diff --git a/charts/flyte-agent/templates/agent/service.yaml b/charts/flyte-agent/templates/agent/service.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -18,4 +17,3 @@ spec:
     protocol: TCP
     targetPort: {{ .Values.ports.name }}
   selector: {{ include "flyteagent.selectorLabels" . | nindent 4 }}
-{{- end }}
diff --git a/charts/flyte-agent/templates/agent/serviceaccount.yaml b/charts/flyte-agent/templates/agent/serviceaccount.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.enabled }}
 ---
 {{- if .Values.serviceAccount.create }}
 apiVersion: v1
@@ -14,4 +13,3 @@ metadata:
 imagePullSecrets: {{ tpl (toYaml .) $ | nindent 2 }}
 {{- end }}
 {{- end }}
-{{- end }}
diff --git a/charts/flyte-agent/values.yaml b/charts/flyte-agent/values.yaml
@@ -14,12 +14,11 @@ commonAnnotations: {}
 agentSecret:
   # -- Specify name of K8s Secret. Leave it empty if you don't need this Secret
   name: ""
-  # -- Specify your Secret (with sensitive data) or pseudo-manifest (without sensitive data). See https://github.com/godaddy/kubernetes-external-secrets
+  # -- Specify your Secret (with sensitive data) or pseudo-manifest (without sensitive data).
   secretData:
     data:
       username: User
 
-enabled: true
 # -- Replicas count for flyteagent deployment
 replicaCount: 1
 image:

diff --git a/charts/flyte-binary/Chart.yaml b/charts/flyte-binary/Chart.yaml
@@ -16,6 +16,7 @@ version: v0.1.10 # VERSION
 appVersion: "1.16.0"
 dependencies:
   - name: flyteagent
+    condition: flyteagent.enabled
     alias: flyteagent
     version: v0.1.10 # VERSION
     repository: file://../flyte-agent # REPOSITORY
diff --git a/charts/flyte-binary/templates/configmap.yaml b/charts/flyte-binary/templates/configmap.yaml
@@ -66,7 +66,9 @@ data:
       {{- tpl ( .Values.configuration.agentService | toYaml ) . | nindent 8 }}
       {{- else if .Values.flyteagent.enable }}
       agent-service:
-        defaultGrpcEndpoint: {{ include "flyte-binary.agent.name" . }}:{{ include "flyte-binary.agent.servicePort" . }}
+        defaultAgent:
+          endpoint: {{ include "flyte-binary.agent.name" . }}:{{ include "flyte-binary.agent.servicePort" . }}
+          insecure: true
         supportedTaskTypes:
         - bigquery_query_job_task
       {{- end }}

diff --git a/charts/flyte-core/Chart.yaml b/charts/flyte-core/Chart.yaml
@@ -5,6 +5,7 @@ type: application
 version: v0.1.10 # VERSION
 dependencies:
   - name: flyteagent
+    condition: flyteagent.enabled
     alias: flyteagent
     version: v0.1.10 # VERSION
     repository: file://../flyte-agent # REPOSITORY
diff --git a/charts/flyte-core/README.md b/charts/flyte-core/README.md
@@ -100,7 +100,7 @@ helm install gateway bitnami/contour -n flyte
 | configmap.enabled_plugins.tasks | object | `{"task-plugins":{"default-for-task-types":{"bigquery_query_job_task":"agent-service","container":"container","container_array":"k8s-array","sidecar":"sidecar"},"enabled-plugins":["container","sidecar","k8s-array","agent-service"]}}` | Tasks specific configuration [structure](https://pkg.go.dev/github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/config#GetConfig) |
 | configmap.enabled_plugins.tasks.task-plugins | object | `{"default-for-task-types":{"bigquery_query_job_task":"agent-service","container":"container","container_array":"k8s-array","sidecar":"sidecar"},"enabled-plugins":["container","sidecar","k8s-array","agent-service"]}` | Plugins configuration, [structure](https://pkg.go.dev/github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/config#TaskPluginConfig) |
 | configmap.enabled_plugins.tasks.task-plugins.enabled-plugins | list | `["container","sidecar","k8s-array","agent-service"]` | [Enabled Plugins](https://pkg.go.dev/github.com/lyft/flyteplugins/go/tasks/config#Config). Enable sagemaker*, athena if you install the backend plugins |
-| configmap.k8s | object | `{"plugins":{"agent-service":{"defaultGrpcEndpoint":"flyteagent.flyte.svc.cluster.local:8000","supportedTaskTypes":["bigquery_query_job_task"]},"k8s":{"default-cpus":"100m","default-env-vars":[],"default-memory":"100Mi"}}}` | Kubernetes specific Flyte configuration |
+| configmap.k8s | object | `{"plugins":{"agent-service":{"defaultAgent":{"endpoint":"flyteagent.flyte.svc.cluster.local:8000","insecure":true},"supportedTaskTypes":["bigquery_query_job_task"]},"k8s":{"default-cpus":"100m","default-env-vars":[],"default-memory":"100Mi"}}}` | Kubernetes specific Flyte configuration |
 | configmap.k8s.plugins.k8s | object | `{"default-cpus":"100m","default-env-vars":[],"default-memory":"100Mi"}` | Configuration section for all K8s specific plugins [Configuration structure](https://pkg.go.dev/github.com/lyft/flyteplugins/go/tasks/pluginmachinery/flytek8s/config) |
 | configmap.remoteData.remoteData.region | string | `"us-east-1"` |  |
 | configmap.remoteData.remoteData.scheme | string | `"local"` |  |
@@ -173,29 +173,7 @@ helm install gateway bitnami/contour -n flyte
 | flyteadmin.serviceAccount.createClusterRole | bool | `true` | Should a ClusterRole be created for Flyteadmin |
 | flyteadmin.serviceAccount.imagePullSecrets | list | `[]` | ImagePullSecrets to automatically assign to the service account |
 | flyteadmin.tolerations | list | `[]` | tolerations for Flyteadmin deployment |
-| flyteagent.additionalContainers | list | `[]` | Appends additional containers to the deployment spec. May include template values. |
-| flyteagent.additionalVolumeMounts | list | `[]` | Appends additional volume mounts to the main container's spec. May include template values. |
-| flyteagent.additionalVolumes | list | `[]` | Appends additional volumes to the deployment spec. May include template values. |
-| flyteagent.affinity | object | `{}` | affinity for flyteagent deployment |
-| flyteagent.configPath | string | `"/etc/flyteagent/config/*.yaml"` | Default regex string for searching configuration files |
 | flyteagent.enabled | bool | `true` |  |
-| flyteagent.extraArgs | object | `{}` | Appends extra command line arguments to the main command |
-| flyteagent.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
-| flyteagent.image.repository | string | `"ghcr.io/flyteorg/flyteagent"` | Docker image for flyteagent deployment |
-| flyteagent.image.tag | string | `"1.6.2b1"` | Docker image tag |
-| flyteagent.nodeSelector | object | `{}` | nodeSelector for flyteagent deployment |
-| flyteagent.podAnnotations | object | `{}` | Annotations for flyteagent pods |
-| flyteagent.ports.containerPort | int | `8000` |  |
-| flyteagent.ports.name | string | `"agent-grpc"` |  |
-| flyteagent.priorityClassName | string | `""` | Sets priorityClassName for datacatalog pod(s). |
-| flyteagent.replicaCount | int | `1` | Replicas count for flyteagent deployment |
-| flyteagent.resources | object | `{"limits":{"cpu":"500m","ephemeral-storage":"100Mi","memory":"500Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}}` | Default resources requests and limits for flyteagent deployment |
-| flyteagent.service | object | `{"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"type":"ClusterIP"}` | Service settings for flyteagent |
-| flyteagent.serviceAccount | object | `{"annotations":{},"create":true,"imagePullSecrets":[]}` | Configuration for service accounts for flyteagent |
-| flyteagent.serviceAccount.annotations | object | `{}` | Annotations for ServiceAccount attached to flyteagent pods |
-| flyteagent.serviceAccount.create | bool | `true` | Should a service account be created for flyteagent |
-| flyteagent.serviceAccount.imagePullSecrets | list | `[]` | ImagePullSecrets to automatically assign to the service account |
-| flyteagent.tolerations | list | `[]` | tolerations for flyteagent deployment |
 | flyteconsole.affinity | object | `{}` | affinity for Flyteconsole deployment |
 | flyteconsole.enabled | bool | `true` |  |
 | flyteconsole.ga.enabled | bool | `false` |  |

diff --git a/charts/flyte-core/values.yaml b/charts/flyte-core/values.yaml
@@ -204,61 +204,6 @@ datacatalog:
 
 flyteagent:
   enabled: true
-  # -- Replicas count for flyteagent deployment
-  replicaCount: 1
-  image:
-    # -- Docker image for flyteagent deployment
-    repository: ghcr.io/flyteorg/flyteagent
-    # -- Docker image tag
-    tag: 1.6.2b1
-    # -- Docker image pull policy
-    pullPolicy: IfNotPresent
-  ports:
-    containerPort: 8000
-    name: agent-grpc
-  # -- Default resources requests and limits for flyteagent deployment
-  resources:
-    limits:
-      cpu: 500m
-      ephemeral-storage: 100Mi
-      memory: 500Mi
-    requests:
-      cpu: 10m
-      ephemeral-storage: 50Mi
-      memory: 50Mi
-  # -- Default regex string for searching configuration files
-  configPath: /etc/flyteagent/config/*.yaml
-  # -- Service settings for flyteagent
-  service:
-    annotations:
-      projectcontour.io/upstream-protocol.h2c: grpc
-    type: ClusterIP
-  # -- Configuration for service accounts for flyteagent
-  serviceAccount:
-    # -- Should a service account be created for flyteagent
-    create: true
-    # -- Annotations for ServiceAccount attached to flyteagent pods
-    annotations: {}
-    # -- ImagePullSecrets to automatically assign to the service account
-    imagePullSecrets: []
-  # -- Annotations for flyteagent pods
-  podAnnotations: {}
-  # -- nodeSelector for flyteagent deployment
-  nodeSelector: {}
-  # -- tolerations for flyteagent deployment
-  tolerations: []
-  # -- affinity for flyteagent deployment
-  affinity: {}
-  # -- Appends additional volumes to the deployment spec. May include template values.
-  additionalVolumes: []
-  # -- Appends additional volume mounts to the main container's spec. May include template values.
-  additionalVolumeMounts: []
-  # -- Appends additional containers to the deployment spec. May include template values.
-  additionalContainers: []
-  # -- Appends extra command line arguments to the main command
-  extraArgs: {}
-  # -- Sets priorityClassName for datacatalog pod(s).
-  priorityClassName: ""
 
 #
 # FLYTEPROPELLER SETTINGS
@@ -735,7 +680,9 @@ configmap:
         default-cpus: 100m
         default-memory: 100Mi
       agent-service:
-        defaultGrpcEndpoint: flyteagent.flyte.svc.cluster.local:8000
+        defaultAgent:
+          endpoint: flyteagent.flyte.svc.cluster.local:8000
+          insecure: true
         supportedTaskTypes:
           - bigquery_query_job_task