diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml index 932ca9cca8..2fa1f4c63b 100644 --- a/charts/flyte-binary/values.yaml +++ b/charts/flyte-binary/values.yaml @@ -382,8 +382,7 @@ enabled_plugins: - container - sidecar - k8s-array - # -- Uncomment to enable agent service - # - agent-service + - agent-service default-for-task-types: container: container sidecar: sidecar diff --git a/docker/sandbox-bundled/kustomize/complete-agent/flyteagent_patch.yaml b/docker/sandbox-bundled/kustomize/complete-agent/flyteagent_patch.yaml deleted file mode 100644 index 6553649ae7..0000000000 --- a/docker/sandbox-bundled/kustomize/complete-agent/flyteagent_patch.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: flyte-sandbox-config -data: - 001-plugins.yaml: | - tasks: - task-plugins: - default-for-task-types: - container: container - container_array: k8s-array - sidecar: sidecar - enabled-plugins: - - agent-service - - container - - sidecar - - k8s-array - 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:v0.0.33" - 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 diff --git a/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml b/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml index 640dd430df..3c6d5c6e5e 100644 --- a/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml +++ b/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml @@ -10,10 +10,3 @@ helmCharts: namespace: flyte resources: - ../namespace.yaml - -patches: - - path: ./flyteagent_patch.yaml - target: - kind: ConfigMap - name: flyte-sandbox-config - diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 0f33835ada..c081e95b6a 100644 --- a/docker/sandbox-bundled/manifests/complete-agent.yaml +++ b/docker/sandbox-bundled/manifests/complete-agent.yaml @@ -456,10 +456,10 @@ data: container_array: k8s-array sidecar: sidecar enabled-plugins: - - agent-service - container - sidecar - k8s-array + - agent-service plugins: logs: kubernetes-enabled: true @@ -807,7 +807,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: NXl3SE1KUGNtSkhhSzRvZw== + haSharedSecret: eVY3MzFRdjVuTUtVNkJ2Tw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1237,7 +1237,7 @@ spec: metadata: annotations: checksum/cluster-resource-templates: 6fd9b172465e3089fcc59f738b92b8dc4d8939360c19de8ee65f68b0e7422035 - checksum/configuration: 2bc4d1f1b07e67182a10a59b5eeb2c8dda57d8f0d98d3869fa6e773518690cac + checksum/configuration: 7f44628a274eee8a93d71643705b34f0d5ae672b350c64fa9ea5b20a03de604d checksum/configuration-secret: 09216ffaa3d29e14f88b1f30af580d02a2a5e014de4d750b7f275cc07ed4e914 labels: app.kubernetes.io/component: flyte-binary @@ -1400,7 +1400,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 0320675aa65bc42cb25ac844bb59fee74e49647b65669c21f2dfa3e39c597810 + checksum/secret: d773d0c3d533f1e32c4708e7d20fdd350cd6026517194a0e9f2525f1e8dc3a4a labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index 531b832c16..616f5629d6 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -448,6 +448,7 @@ data: - container - sidecar - k8s-array + - agent-service plugins: logs: kubernetes-enabled: true @@ -795,7 +796,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: bWxDVllzS0hSMEJQZ1gzRw== + haSharedSecret: eUp3NTVTZ3RpRUp0NEhBNQ== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1193,7 +1194,7 @@ spec: metadata: annotations: checksum/cluster-resource-templates: 6fd9b172465e3089fcc59f738b92b8dc4d8939360c19de8ee65f68b0e7422035 - checksum/configuration: 2bc4d1f1b07e67182a10a59b5eeb2c8dda57d8f0d98d3869fa6e773518690cac + checksum/configuration: 7f44628a274eee8a93d71643705b34f0d5ae672b350c64fa9ea5b20a03de604d checksum/configuration-secret: 09216ffaa3d29e14f88b1f30af580d02a2a5e014de4d750b7f275cc07ed4e914 labels: app.kubernetes.io/component: flyte-binary @@ -1356,7 +1357,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: afc08c65d94baab28d716ec39643a79f8441760856b59764bc61205459e64d1f + checksum/secret: 4870c07b2cab42edd7ea782204e2ad225d2c82d5c4f3f74aebd59a6f76293591 labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 56290e715d..b9f1cd9e51 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: R1BqenhQZWNVSXdjUnRGbQ== + haSharedSecret: Y1dWb0I2NXpmSUxtZFJBRA== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: e65a7cfaef722d164cb5a04c2e6f49daf8e2a76de4737dfd05c5120b833fd65f + checksum/secret: 9cfe892587af60802fd5c44efb44f44fca5ca5f5081a3f04c1ba944029aca54e labels: app: docker-registry release: flyte-sandbox