From 1cd0e4887fa3f98c5d1fcf5ced202cbc36418733 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 18 Dec 2023 14:09:57 +0800 Subject: [PATCH] test Signed-off-by: Future Outlier --- .github/workflows/single-binary.yml | 2 +- charts/flyte-binary/README.md | 5 --- charts/flyte-binary/values.yaml | 20 +++++---- .../flyte_sandbox_binary_helm_generated.yaml | 11 +---- ...patch.yaml => add-agent-secret-patch.yaml} | 0 .../enable-agent-service-patch.yaml | 43 +++++++++++++++++++ .../complete-agent/kustomization.yaml | 3 +- .../manifests/complete-agent.yaml | 6 +-- .../sandbox-bundled/manifests/complete.yaml | 15 ++----- docker/sandbox-bundled/manifests/dev.yaml | 4 +- 10 files changed, 66 insertions(+), 43 deletions(-) rename docker/sandbox-bundled/kustomize/complete-agent/{patch.yaml => add-agent-secret-patch.yaml} (100%) create mode 100644 docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml diff --git a/.github/workflows/single-binary.yml b/.github/workflows/single-binary.yml index 9a2c19a52c..b3c924b0f9 100644 --- a/.github/workflows/single-binary.yml +++ b/.github/workflows/single-binary.yml @@ -170,7 +170,7 @@ jobs: cpu: "0" memory: "0" EOF - flytectl demo start --image flyte-sandbox-bundled:local --imagePullPolicy Never + flytectl demo start --image flyte-sandbox-bundled:local --disable-agent --imagePullPolicy Never - name: Install Python dependencies run: | python -m pip install --upgrade pip diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index c4fa8cfc5e..40480c3a19 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -21,11 +21,6 @@ Chart for basic single Flyte executable deployment | clusterResourceTemplates.labels | object | `{}` | | | commonAnnotations | object | `{}` | | | commonLabels | object | `{}` | | -| configuration.agentService.defaultAgent.defaultTimeout | string | `"10s"` | | -| configuration.agentService.defaultAgent.endpoint | string | `"dns:///flyteagent.flyte.svc.cluster.local:8000"` | | -| configuration.agentService.defaultAgent.insecure | bool | `true` | | -| configuration.agentService.defaultAgent.timeouts.GetTask | string | `"10s"` | | -| configuration.agentService.supportedTaskTypes[0] | string | `"default_task"` | | | configuration.annotations | object | `{}` | | | configuration.auth.authorizedUris | list | `[]` | | | configuration.auth.clientSecretsExternalSecretRef | string | `""` | | diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml index 48ae2c47dd..0caad1f87c 100644 --- a/charts/flyte-binary/values.yaml +++ b/charts/flyte-binary/values.yaml @@ -161,16 +161,18 @@ configuration: # tag CoPilot sidecar image tag tag: v1.10.6 # FLYTECOPILOT_TAG # agentService Flyte Agent configuration - agentService: - defaultAgent: - endpoint: "dns:///flyteagent.flyte.svc.cluster.local:8000" - insecure: true - timeouts: - GetTask: 10s - defaultTimeout: 10s + # -- Uncomment to enable agentService for Flyte Agent + # Note: You should ensure that the agent server is started, otherwise the Flyte cluster will fail to start. + # agentService: + # defaultAgent: + # endpoint: "dns:///flyteagent.flyte.svc.cluster.local:8000" + # insecure: true + # timeouts: + # GetTask: 10s + # defaultTimeout: 10s # Uncomment and modify to include configuration for Flyte Agent - supportedTaskTypes: - - default_task + # supportedTaskTypes: + # - default_task # externalConfigMap Specify an existing, external ConfigMap to use as configuration for Flyte # If set, no Flyte configuration will be generated by this chart externalConfigMap: "" diff --git a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml index 2e667f1256..2b0d197af3 100644 --- a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml +++ b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml @@ -123,15 +123,6 @@ data: kubernetes-enabled: false cloudwatch-enabled: false stackdriver-enabled: false - agent-service: - defaultAgent: - defaultTimeout: 10s - endpoint: dns:///flyteagent.flyte.svc.cluster.local:8000 - insecure: true - timeouts: - GetTask: 10s - supportedTaskTypes: - - default_task 002-database.yaml: | database: postgres: @@ -367,7 +358,7 @@ spec: app.kubernetes.io/instance: flyte app.kubernetes.io/component: flyte-binary annotations: - checksum/configuration: 51494d8c2f3a6df2711d789217155f1e1b60e782dcbfd4564bfcccda24700576 + checksum/configuration: 94a584c983cfe1077f02569ae00f81c4fddae4505901006eda76d9338bd3dda2 checksum/configuration-secret: d5d93f4e67780b21593dc3799f0f6682aab0765e708e4020939975d14d44f929 checksum/cluster-resource-templates: 7dfa59f3d447e9c099b8f8ffad3af466fecbc9cf9f8c97295d9634254a55d4ae spec: diff --git a/docker/sandbox-bundled/kustomize/complete-agent/patch.yaml b/docker/sandbox-bundled/kustomize/complete-agent/add-agent-secret-patch.yaml similarity index 100% rename from docker/sandbox-bundled/kustomize/complete-agent/patch.yaml rename to docker/sandbox-bundled/kustomize/complete-agent/add-agent-secret-patch.yaml diff --git a/docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml b/docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml new file mode 100644 index 0000000000..744d4dc174 --- /dev/null +++ b/docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml @@ -0,0 +1,43 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: flyte-sandbox-config + namespace: flyte +data: + 001-plugins.yaml: | + tasks: + task-plugins: + default-for-task-types: + container: container + container_array: k8s-array + sidecar: sidecar + enabled-plugins: + - container + - sidecar + - k8s-array + - agent-service + plugins: + logs: + kubernetes-enabled: true + kubernetes-template-uri: http://localhost:30080/kubernetes-dashboard/#/log/{{.namespace }}/{{ .podName }}/pod?namespace={{ .namespace }} + cloudwatch-enabled: false + stackdriver-enabled: false + k8s: + co-pilot: + image: "cr.flyte.org/flyteorg/flytecopilot:v1.10.6" + k8s-array: + logs: + config: + kubernetes-enabled: true + kubernetes-template-uri: http://localhost:30080/kubernetes-dashboard/#/log/{{.namespace }}/{{ .podName }}/pod?namespace={{ .namespace }} + cloudwatch-enabled: false + stackdriver-enabled: false + agent-service: + defaultAgent: + defaultTimeout: 10s + endpoint: dns:///flyteagent.flyte.svc.cluster.local:8000 + insecure: true + timeouts: + GetTask: 10s + supportedTaskTypes: + - default_task diff --git a/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml b/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml index 145388ca2f..e32b079ebb 100644 --- a/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml +++ b/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml @@ -12,4 +12,5 @@ resources: - ../namespace.yaml patchesStrategicMerge: - - patch.yaml + - add-agent-secret-patch.yaml + - enable-agent-service-patch.yaml diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 4380b96277..08445fc8de 100644 --- 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: ZnNFaHlpM01FZjRaQmNJSA== + haSharedSecret: VnNLQkt1MkNRdU5ZNW5Qbg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1246,7 +1246,7 @@ spec: metadata: annotations: checksum/cluster-resource-templates: 6fd9b172465e3089fcc59f738b92b8dc4d8939360c19de8ee65f68b0e7422035 - checksum/configuration: 6755bdc74789d7e2a80161a9f811e41ea3c0cf12bab5cb0820c7c8539b4b88fe + checksum/configuration: e2233c2adb914be363ec4fae808ed60ffb230367503f73643f011e728b853b49 checksum/configuration-secret: 09216ffaa3d29e14f88b1f30af580d02a2a5e014de4d750b7f275cc07ed4e914 labels: app.kubernetes.io/component: flyte-binary @@ -1411,7 +1411,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 727daf2e5024ea4e541b87b717e6f9a8706552e0ae461f82b2e5260ad564766c + checksum/secret: 0e36815292c3911f2ddfbc1ff2873e7b4d381137432bcc4170b51998a1aed73f labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index 2b5b9d3168..8b5f2dd6d4 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -465,15 +465,6 @@ data: kubernetes-template-uri: http://localhost:30080/kubernetes-dashboard/#/log/{{.namespace }}/{{ .podName }}/pod?namespace={{ .namespace }} cloudwatch-enabled: false stackdriver-enabled: false - agent-service: - defaultAgent: - defaultTimeout: 10s - endpoint: dns:///flyteagent.flyte.svc.cluster.local:8000 - insecure: true - timeouts: - GetTask: 10s - supportedTaskTypes: - - default_task 002-database.yaml: | database: postgres: @@ -805,7 +796,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: UlI4aW9PaVFzcFpyRzhkTA== + haSharedSecret: Nk5nc2I1Z1hUQWNzZlRlZw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1203,7 +1194,7 @@ spec: metadata: annotations: checksum/cluster-resource-templates: 6fd9b172465e3089fcc59f738b92b8dc4d8939360c19de8ee65f68b0e7422035 - checksum/configuration: 6755bdc74789d7e2a80161a9f811e41ea3c0cf12bab5cb0820c7c8539b4b88fe + checksum/configuration: e2233c2adb914be363ec4fae808ed60ffb230367503f73643f011e728b853b49 checksum/configuration-secret: 09216ffaa3d29e14f88b1f30af580d02a2a5e014de4d750b7f275cc07ed4e914 labels: app.kubernetes.io/component: flyte-binary @@ -1368,7 +1359,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: cb0b9e32c83fba67eefca5b8cd0a3375b07f5d5d29f6dab9a092f91ccf7bd200 + checksum/secret: 934b019b16c54af8ddc25635c1adb29fce1455104785a83174dd888253d2d7cf labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index b934b7e602..238c49a1d7 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: QzZJWkZlOTBQOUZxTUlvcA== + haSharedSecret: N0ROQTB2SzlwdzhQbGhzZQ== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: dd543013ea0e17fb3c9b7be54fe7c6063e8f15ad6e0887596011ddd7f22f1540 + checksum/secret: 0bd53dff0e2df9a37450086b3c49f08a1294e704a0839ce2c7ffa3ae2fc8ccf5 labels: app: docker-registry release: flyte-sandbox