From 393c43429bd5c7d36982f08fa497a06fb7d17e94 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sun, 15 Oct 2023 15:46:43 +0800 Subject: [PATCH 01/10] add-agent-default-minio-env Signed-off-by: Future Outlier --- charts/flyteagent/README.md | 2 +- .../templates/agent/deployment.yaml | 32 ++++++++++++++----- charts/flyteagent/values.yaml | 3 ++ .../agent/flyte_agent_helm_generated.yaml | 3 ++ .../manifests/complete-agent.yaml | 7 ++-- .../sandbox-bundled/manifests/complete.yaml | 4 +-- docker/sandbox-bundled/manifests/dev.yaml | 4 +-- 7 files changed, 40 insertions(+), 15 deletions(-) diff --git a/charts/flyteagent/README.md b/charts/flyteagent/README.md index c45f994816..31a0d0e04e 100644 --- a/charts/flyteagent/README.md +++ b/charts/flyteagent/README.md @@ -12,7 +12,7 @@ A Helm chart for Flyte agent | additionalVolumeMounts | list | `[]` | Appends additional volume mounts to the main container's spec. May include template values. | | additionalVolumes | list | `[]` | Appends additional volumes to the deployment spec. May include template values. | | affinity | object | `{}` | affinity for flyteagent deployment | -| agentSecret.secretData | object | `{"data":{"username":"User"}}` | Specify your Secret (with sensitive data) or pseudo-manifest (without sensitive data). | +| agentSecret.secretData | object | `{"data":{"FLYTE_AWS_ACCESS_KEY_ID":"minio","FLYTE_AWS_ENDPOINT":"http://flyte-sandbox-minio.flyte:9000","FLYTE_AWS_SECRET_ACCESS_KEY":"miniostorage","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 | diff --git a/charts/flyteagent/templates/agent/deployment.yaml b/charts/flyteagent/templates/agent/deployment.yaml index a8b7a3889e..f82fd0da7d 100644 --- a/charts/flyteagent/templates/agent/deployment.yaml +++ b/charts/flyteagent/templates/agent/deployment.yaml @@ -26,28 +26,44 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: "{{ .Values.image.pullPolicy }}" name: flyteagent - volumeMounts: {{- include "agentSecret.volumeMount" . | nindent 8 }} ports: - containerPort: {{ .Values.ports.containerPort }} name: {{ .Values.ports.name }} resources: {{- toYaml .Values.resources | nindent 10 }} + env: + - name: FLYTE_AWS_ENDPOINT + valueFrom: + secretKeyRef: + name: {{ template "flyteagent.name" . }} + key: FLYTE_AWS_ENDPOINT + - name: FLYTE_AWS_ACCESS_KEY_ID + valueFrom: + secretKeyRef: + name: {{ template "flyteagent.name" . }} + key: FLYTE_AWS_ACCESS_KEY_ID + - name: FLYTE_AWS_SECRET_ACCESS_KEY + valueFrom: + secretKeyRef: + name: {{ template "flyteagent.name" . }} + key: FLYTE_AWS_SECRET_ACCESS_KEY + volumeMounts: {{- include "agentSecret.volumeMount" . | nindent 10 }} {{- with .Values.additionalVolumeMounts -}} - {{ tpl (toYaml .) $ | nindent 8 }} + {{ tpl (toYaml .) $ | nindent 10 }} {{- end }} {{- with .Values.additionalContainers -}} - {{- tpl (toYaml .) $ | nindent 6}} + {{- tpl (toYaml .) $ | nindent 8}} {{- end }} serviceAccountName: {{ template "flyteagent.name" . }} - volumes: {{- include "agentSecret.volume" . | nindent 6 }} + volumes: {{- include "agentSecret.volume" . | nindent 8 }} {{- with .Values.additionalVolumes -}} - {{ tpl (toYaml .) $ | nindent 6 }} + {{ tpl (toYaml .) $ | nindent 8 }} {{- end }} {{- with .Values.nodeSelector }} - nodeSelector: {{ tpl (toYaml .) $ | nindent 8 }} + nodeSelector: {{ tpl (toYaml .) $ | nindent 10 }} {{- end }} {{- with .Values.affinity }} - affinity: {{ tpl (toYaml .) $ | nindent 8 }} + affinity: {{ tpl (toYaml .) $ | nindent 10 }} {{- end }} {{- with .Values.tolerations }} - tolerations: {{ tpl (toYaml .) $ | nindent 8 }} + tolerations: {{ tpl (toYaml .) $ | nindent 10 }} {{- end }} diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml index 8a40180e45..9379a33c5e 100755 --- a/charts/flyteagent/values.yaml +++ b/charts/flyteagent/values.yaml @@ -16,6 +16,9 @@ agentSecret: secretData: data: username: User + FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 + FLYTE_AWS_ACCESS_KEY_ID: minio + FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage # -- Replicas count for flyteagent deployment replicaCount: 1 diff --git a/deployment/agent/flyte_agent_helm_generated.yaml b/deployment/agent/flyte_agent_helm_generated.yaml index 89f3835892..b7e735fdd4 100644 --- a/deployment/agent/flyte_agent_helm_generated.yaml +++ b/deployment/agent/flyte_agent_helm_generated.yaml @@ -19,6 +19,9 @@ metadata: namespace: flyte type: Opaque data: + FLYTE_AWS_ACCESS_KEY_ID: minio + FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 + FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage username: User --- # Source: flyteagent/templates/agent/service.yaml diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index b18c5ac84e..848812bff7 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: R2JRWFVRYThnRFVLbHpuSA== + haSharedSecret: Wk9VRzZ1a1BjNDk3MHlteQ== proxyPassword: "" proxyUsername: "" kind: Secret @@ -874,6 +874,9 @@ type: Opaque --- apiVersion: v1 data: + FLYTE_AWS_ACCESS_KEY_ID: minio + FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 + FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage username: User kind: Secret metadata: @@ -1409,7 +1412,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 0ee1553aec7c03152a0a44e7b1a82985795774412a779f7b607a57e59f42c8ef + checksum/secret: 4683cf4a765862d5c9e0d509cfbcc2cc90991ddf90bf6a23ef9d81d1fd3f4687 labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index d7f6e8b0cc..7433ce29e8 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -805,7 +805,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: d1l6eWRCOXBJcFhiNEo5QQ== + haSharedSecret: ZWNvaDR4SFpTWEljYmpKdw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1366,7 +1366,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 2f5b6d46fd3276b5b25c8a537298beb6943b13b0b21900db8b2da23e166f0593 + checksum/secret: b309ba8b2b4bd6f3ef7d57302a4273efa0caaf58aef9c292f6a27a9107fbba80 labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 4f3f0592e8..2824758cd2 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: UkFsUVRMRndZeTNJUVNFSA== + haSharedSecret: dGpvMnBNMlZ1QnhOS1c0Tg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 25a046ef1aaf34ffb59f7b92554e1cfd0015b9a11f7f165ce06bba31e3bced1b + checksum/secret: 0a47ea847e68c844e9b427914d1dc1a2d74e9d8e8716f05365a5ad55d3e95272 labels: app: docker-registry release: flyte-sandbox From 78280011a33481b68b06806ce9ef1c2f2c485030 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 17 Oct 2023 15:40:02 +0800 Subject: [PATCH 02/10] correct env Signed-off-by: Future Outlier --- charts/flyteagent/README.md | 2 +- .../templates/agent/deployment.yaml | 34 +++++++------------ charts/flyteagent/values.yaml | 5 +-- .../agent/flyte_agent_helm_generated.yaml | 10 ++++-- .../manifests/complete-agent.yaml | 14 +++++--- .../sandbox-bundled/manifests/complete.yaml | 4 +-- docker/sandbox-bundled/manifests/dev.yaml | 4 +-- 7 files changed, 35 insertions(+), 38 deletions(-) diff --git a/charts/flyteagent/README.md b/charts/flyteagent/README.md index 31a0d0e04e..c45f994816 100644 --- a/charts/flyteagent/README.md +++ b/charts/flyteagent/README.md @@ -12,7 +12,7 @@ A Helm chart for Flyte agent | additionalVolumeMounts | list | `[]` | Appends additional volume mounts to the main container's spec. May include template values. | | additionalVolumes | list | `[]` | Appends additional volumes to the deployment spec. May include template values. | | affinity | object | `{}` | affinity for flyteagent deployment | -| agentSecret.secretData | object | `{"data":{"FLYTE_AWS_ACCESS_KEY_ID":"minio","FLYTE_AWS_ENDPOINT":"http://flyte-sandbox-minio.flyte:9000","FLYTE_AWS_SECRET_ACCESS_KEY":"miniostorage","username":"User"}}` | Specify your Secret (with sensitive data) or pseudo-manifest (without sensitive data). | +| 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 | diff --git a/charts/flyteagent/templates/agent/deployment.yaml b/charts/flyteagent/templates/agent/deployment.yaml index f82fd0da7d..243dedbe70 100644 --- a/charts/flyteagent/templates/agent/deployment.yaml +++ b/charts/flyteagent/templates/agent/deployment.yaml @@ -26,44 +26,36 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: "{{ .Values.image.pullPolicy }}" name: flyteagent + volumeMounts: {{- include "agentSecret.volumeMount" . | nindent 8 }} ports: - containerPort: {{ .Values.ports.containerPort }} name: {{ .Values.ports.name }} resources: {{- toYaml .Values.resources | nindent 10 }} env: - name: FLYTE_AWS_ENDPOINT - valueFrom: - secretKeyRef: - name: {{ template "flyteagent.name" . }} - key: FLYTE_AWS_ENDPOINT + value: http://flyte-sandbox-minio.flyte:9000 - name: FLYTE_AWS_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: {{ template "flyteagent.name" . }} - key: FLYTE_AWS_ACCESS_KEY_ID + value: minio - name: FLYTE_AWS_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: {{ template "flyteagent.name" . }} - key: FLYTE_AWS_SECRET_ACCESS_KEY - volumeMounts: {{- include "agentSecret.volumeMount" . | nindent 10 }} + value: miniostorage + {{- with .Values.additionalVolumeMounts -}} - {{ tpl (toYaml .) $ | nindent 10 }} + {{ tpl (toYaml .) $ | nindent 8 }} {{- end }} {{- with .Values.additionalContainers -}} - {{- tpl (toYaml .) $ | nindent 8}} + {{- tpl (toYaml .) $ | nindent 6}} {{- end }} serviceAccountName: {{ template "flyteagent.name" . }} - volumes: {{- include "agentSecret.volume" . | nindent 8 }} + volumes: {{- include "agentSecret.volume" . | nindent 6 }} {{- with .Values.additionalVolumes -}} - {{ tpl (toYaml .) $ | nindent 8 }} + {{ tpl (toYaml .) $ | nindent 6 }} {{- end }} {{- with .Values.nodeSelector }} - nodeSelector: {{ tpl (toYaml .) $ | nindent 10 }} + nodeSelector: {{ tpl (toYaml .) $ | nindent 8 }} {{- end }} {{- with .Values.affinity }} - affinity: {{ tpl (toYaml .) $ | nindent 10 }} + affinity: {{ tpl (toYaml .) $ | nindent 8 }} {{- end }} {{- with .Values.tolerations }} - tolerations: {{ tpl (toYaml .) $ | nindent 10 }} - {{- end }} + tolerations: {{ tpl (toYaml .) $ | nindent 8 }} + {{- end }} \ No newline at end of file diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml index 9379a33c5e..9c7dbcb470 100755 --- a/charts/flyteagent/values.yaml +++ b/charts/flyteagent/values.yaml @@ -16,9 +16,6 @@ agentSecret: secretData: data: username: User - FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 - FLYTE_AWS_ACCESS_KEY_ID: minio - FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage # -- Replicas count for flyteagent deployment replicaCount: 1 @@ -74,4 +71,4 @@ additionalContainers: [] # -- Appends extra command line arguments to the main command extraArgs: {} # -- Sets priorityClassName for datacatalog pod(s). -priorityClassName: "" +priorityClassName: "" \ No newline at end of file diff --git a/deployment/agent/flyte_agent_helm_generated.yaml b/deployment/agent/flyte_agent_helm_generated.yaml index b7e735fdd4..d8df4819e0 100644 --- a/deployment/agent/flyte_agent_helm_generated.yaml +++ b/deployment/agent/flyte_agent_helm_generated.yaml @@ -19,9 +19,6 @@ metadata: namespace: flyte type: Opaque data: - FLYTE_AWS_ACCESS_KEY_ID: minio - FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 - FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage username: User --- # Source: flyteagent/templates/agent/service.yaml @@ -96,6 +93,13 @@ spec: cpu: 500m ephemeral-storage: 200Mi memory: 200Mi + env: + - name: FLYTE_AWS_ENDPOINT + value: http://flyte-sandbox-minio.flyte:9000 + - name: FLYTE_AWS_ACCESS_KEY_ID + value: minio + - name: FLYTE_AWS_SECRET_ACCESS_KEY + value: miniostorage serviceAccountName: flyteagent volumes: - name: flyteagent diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 848812bff7..6bdd8d9ce7 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: Wk9VRzZ1a1BjNDk3MHlteQ== + haSharedSecret: ajd1UVlZZ2QyUUxaNXR4Zg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -874,9 +874,6 @@ type: Opaque --- apiVersion: v1 data: - FLYTE_AWS_ACCESS_KEY_ID: minio - FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 - FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage username: User kind: Secret metadata: @@ -1412,7 +1409,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 4683cf4a765862d5c9e0d509cfbcc2cc90991ddf90bf6a23ef9d81d1fd3f4687 + checksum/secret: 5cf3faf4eed585ffebe715ccf3dc0ef080458a5f77bae5a88b3ec484a94dda79 labels: app: docker-registry release: flyte-sandbox @@ -1741,6 +1738,13 @@ spec: - command: - pyflyte - serve + env: + - name: FLYTE_AWS_ENDPOINT + value: http://flyte-sandbox-minio.flyte:9000 + - name: FLYTE_AWS_ACCESS_KEY_ID + value: minio + - name: FLYTE_AWS_ACCESS_KEY_ID + value: miniostorage image: ghcr.io/flyteorg/flyteagent:1.9.1 imagePullPolicy: IfNotPresent name: flyteagent diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index 7433ce29e8..6c5ab30976 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -805,7 +805,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: ZWNvaDR4SFpTWEljYmpKdw== + haSharedSecret: Y1ZLdWdlUmVmd0tIQ2VtQQ== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1366,7 +1366,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: b309ba8b2b4bd6f3ef7d57302a4273efa0caaf58aef9c292f6a27a9107fbba80 + checksum/secret: ed525b6108c5910670ac492ac6235ffd5d318e93c398ba63d8ab4e77aed37329 labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 2824758cd2..53fbcab388 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: dGpvMnBNMlZ1QnhOS1c0Tg== + haSharedSecret: aXluYVlFbzYyNFg0dXFFVw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 0a47ea847e68c844e9b427914d1dc1a2d74e9d8e8716f05365a5ad55d3e95272 + checksum/secret: 1eb98cf6e7143719e34310e638ebbca8b7359932fc2c34cb80f40808d2cdbebe labels: app: docker-registry release: flyte-sandbox From 2d404d92a04abe8eaf3827d0b7a1fab3f94c6b6c Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 17 Oct 2023 20:22:47 +0800 Subject: [PATCH 03/10] json defaultEnvs Signed-off-by: Future Outlier --- charts/flyteagent/README.md | 3 ++- charts/flyteagent/templates/agent/deployment.yaml | 9 +++------ charts/flyteagent/values.yaml | 4 ++++ deployment/agent/flyte_agent_helm_generated.yaml | 9 +++------ .../sandbox-bundled/manifests/complete-agent.yaml | 13 +++++-------- docker/sandbox-bundled/manifests/complete.yaml | 4 ++-- docker/sandbox-bundled/manifests/dev.yaml | 4 ++-- 7 files changed, 21 insertions(+), 25 deletions(-) diff --git a/charts/flyteagent/README.md b/charts/flyteagent/README.md index c45f994816..f5e1e82eca 100644 --- a/charts/flyteagent/README.md +++ b/charts/flyteagent/README.md @@ -9,8 +9,9 @@ A Helm chart for Flyte agent | Key | Type | Default | Description | |-----|------|---------|-------------| | additionalContainers | list | `[]` | Appends additional containers to the deployment spec. May include template values. | +| additionalEnvs | object | `{"FLYTE_AWS_ACCESS_KEY_ID":"minio","FLYTE_AWS_ENDPOINT":"http://flyte-sandbox-minio.flyte:9000","FLYTE_AWS_SECRET_ACCESS_KEY":"miniostorage"}` | Appends additional volumes to the deployment spec. May include template values. | | additionalVolumeMounts | list | `[]` | Appends additional volume mounts to the main container's spec. May include template values. | -| additionalVolumes | list | `[]` | Appends additional volumes to the deployment spec. May include template values. | +| additionalVolumes | list | `[]` | | | affinity | object | `{}` | affinity for flyteagent deployment | | agentSecret.secretData | object | `{"data":{"username":"User"}}` | Specify your Secret (with sensitive data) or pseudo-manifest (without sensitive data). | | commonAnnotations | object | `{}` | | diff --git a/charts/flyteagent/templates/agent/deployment.yaml b/charts/flyteagent/templates/agent/deployment.yaml index 243dedbe70..3b29614690 100644 --- a/charts/flyteagent/templates/agent/deployment.yaml +++ b/charts/flyteagent/templates/agent/deployment.yaml @@ -32,12 +32,9 @@ spec: name: {{ .Values.ports.name }} resources: {{- toYaml .Values.resources | nindent 10 }} env: - - name: FLYTE_AWS_ENDPOINT - value: http://flyte-sandbox-minio.flyte:9000 - - name: FLYTE_AWS_ACCESS_KEY_ID - value: minio - - name: FLYTE_AWS_SECRET_ACCESS_KEY - value: miniostorage + {{- with .Values.additionalEnvs }} + {{- toYaml . | nindent 10 }} + {{- end }} {{- with .Values.additionalVolumeMounts -}} {{ tpl (toYaml .) $ | nindent 8 }} diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml index 9c7dbcb470..14bcf87f20 100755 --- a/charts/flyteagent/values.yaml +++ b/charts/flyteagent/values.yaml @@ -63,6 +63,10 @@ tolerations: [] # -- affinity for flyteagent deployment affinity: {} # -- Appends additional volumes to the deployment spec. May include template values. +additionalEnvs: + FLYTE_AWS_ENDPOINT: "http://flyte-sandbox-minio.flyte:9000" + FLYTE_AWS_ACCESS_KEY_ID: "minio" + FLYTE_AWS_SECRET_ACCESS_KEY: "miniostorage" additionalVolumes: [] # -- Appends additional volume mounts to the main container's spec. May include template values. additionalVolumeMounts: [] diff --git a/deployment/agent/flyte_agent_helm_generated.yaml b/deployment/agent/flyte_agent_helm_generated.yaml index d8df4819e0..797f3fe83d 100644 --- a/deployment/agent/flyte_agent_helm_generated.yaml +++ b/deployment/agent/flyte_agent_helm_generated.yaml @@ -94,12 +94,9 @@ spec: ephemeral-storage: 200Mi memory: 200Mi env: - - name: FLYTE_AWS_ENDPOINT - value: http://flyte-sandbox-minio.flyte:9000 - - name: FLYTE_AWS_ACCESS_KEY_ID - value: minio - - name: FLYTE_AWS_SECRET_ACCESS_KEY - value: miniostorage + FLYTE_AWS_ACCESS_KEY_ID: minio + FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 + FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage serviceAccountName: flyteagent volumes: - name: flyteagent diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 6bdd8d9ce7..a0acaa59df 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: ajd1UVlZZ2QyUUxaNXR4Zg== + haSharedSecret: amN4SVhXb3Zmc3doNmw2Qw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1409,7 +1409,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 5cf3faf4eed585ffebe715ccf3dc0ef080458a5f77bae5a88b3ec484a94dda79 + checksum/secret: 349f7af6f1eb97cb0e23b0440cc72a803bf2b3b05f32d8647c7129c6e6bac1e7 labels: app: docker-registry release: flyte-sandbox @@ -1739,12 +1739,9 @@ spec: - pyflyte - serve env: - - name: FLYTE_AWS_ENDPOINT - value: http://flyte-sandbox-minio.flyte:9000 - - name: FLYTE_AWS_ACCESS_KEY_ID - value: minio - - name: FLYTE_AWS_ACCESS_KEY_ID - value: miniostorage + FLYTE_AWS_ACCESS_KEY_ID: minio + FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 + FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage image: ghcr.io/flyteorg/flyteagent:1.9.1 imagePullPolicy: IfNotPresent name: flyteagent diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index 6c5ab30976..cfd68b40ce 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -805,7 +805,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: Y1ZLdWdlUmVmd0tIQ2VtQQ== + haSharedSecret: dnlZYmN4WHlzdG1vdldVbw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1366,7 +1366,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: ed525b6108c5910670ac492ac6235ffd5d318e93c398ba63d8ab4e77aed37329 + checksum/secret: 9cf2de69b3b24211fd9ef188463e5886356101feaa61d32da2b487f655712087 labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 53fbcab388..c9ede59644 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: aXluYVlFbzYyNFg0dXFFVw== + haSharedSecret: aXZ4TUlWQkdlRjdBZ082Wg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 1eb98cf6e7143719e34310e638ebbca8b7359932fc2c34cb80f40808d2cdbebe + checksum/secret: c47cf84a6f55b56d96e76b22944ee1824d63996e4e4f8c0496188cfcf78878a9 labels: app: docker-registry release: flyte-sandbox From 82258e2b635b5d40b82b5db7590bcede0b037074 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 17 Oct 2023 21:40:01 +0800 Subject: [PATCH 04/10] add - in env Signed-off-by: Future Outlier --- charts/flyteagent/README.md | 2 +- charts/flyteagent/templates/agent/deployment.yaml | 1 - charts/flyteagent/values.yaml | 6 +++--- deployment/agent/flyte_agent_helm_generated.yaml | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/charts/flyteagent/README.md b/charts/flyteagent/README.md index f5e1e82eca..a488a8761c 100644 --- a/charts/flyteagent/README.md +++ b/charts/flyteagent/README.md @@ -9,7 +9,7 @@ A Helm chart for Flyte agent | Key | Type | Default | Description | |-----|------|---------|-------------| | additionalContainers | list | `[]` | Appends additional containers to the deployment spec. May include template values. | -| additionalEnvs | object | `{"FLYTE_AWS_ACCESS_KEY_ID":"minio","FLYTE_AWS_ENDPOINT":"http://flyte-sandbox-minio.flyte:9000","FLYTE_AWS_SECRET_ACCESS_KEY":"miniostorage"}` | Appends additional volumes to the deployment spec. May include template values. | +| additionalEnvs | list | `[{"FLYTE_AWS_ENDPOINT":"http://flyte-sandbox-minio.flyte:9000"},{"FLYTE_AWS_ACCESS_KEY_ID":"minio"},{"FLYTE_AWS_SECRET_ACCESS_KEY":"miniostorage"}]` | Appends additional volumes to the deployment spec. May include template values. | | additionalVolumeMounts | list | `[]` | Appends additional volume mounts to the main container's spec. May include template values. | | additionalVolumes | list | `[]` | | | affinity | object | `{}` | affinity for flyteagent deployment | diff --git a/charts/flyteagent/templates/agent/deployment.yaml b/charts/flyteagent/templates/agent/deployment.yaml index 3b29614690..4accc00548 100644 --- a/charts/flyteagent/templates/agent/deployment.yaml +++ b/charts/flyteagent/templates/agent/deployment.yaml @@ -35,7 +35,6 @@ spec: {{- with .Values.additionalEnvs }} {{- toYaml . | nindent 10 }} {{- end }} - {{- with .Values.additionalVolumeMounts -}} {{ tpl (toYaml .) $ | nindent 8 }} {{- end }} diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml index 14bcf87f20..e5076a1a39 100755 --- a/charts/flyteagent/values.yaml +++ b/charts/flyteagent/values.yaml @@ -64,9 +64,9 @@ tolerations: [] affinity: {} # -- Appends additional volumes to the deployment spec. May include template values. additionalEnvs: - FLYTE_AWS_ENDPOINT: "http://flyte-sandbox-minio.flyte:9000" - FLYTE_AWS_ACCESS_KEY_ID: "minio" - FLYTE_AWS_SECRET_ACCESS_KEY: "miniostorage" + - FLYTE_AWS_ENDPOINT: "http://flyte-sandbox-minio.flyte:9000" + - FLYTE_AWS_ACCESS_KEY_ID: "minio" + - FLYTE_AWS_SECRET_ACCESS_KEY: "miniostorage" additionalVolumes: [] # -- Appends additional volume mounts to the main container's spec. May include template values. additionalVolumeMounts: [] diff --git a/deployment/agent/flyte_agent_helm_generated.yaml b/deployment/agent/flyte_agent_helm_generated.yaml index 797f3fe83d..f7cde2fce8 100644 --- a/deployment/agent/flyte_agent_helm_generated.yaml +++ b/deployment/agent/flyte_agent_helm_generated.yaml @@ -94,9 +94,9 @@ spec: ephemeral-storage: 200Mi memory: 200Mi env: - FLYTE_AWS_ACCESS_KEY_ID: minio - FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 - FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage + - FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 + - FLYTE_AWS_ACCESS_KEY_ID: minio + - FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage serviceAccountName: flyteagent volumes: - name: flyteagent From ab2e771d006aaa0c04bea0b598f91d25737baefc Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 17 Oct 2023 22:18:56 +0800 Subject: [PATCH 05/10] success Signed-off-by: Future Outlier --- charts/flyteagent/README.md | 2 +- charts/flyteagent/values.yaml | 12 +++++++++--- deployment/agent/flyte_agent_helm_generated.yaml | 9 ++++++--- .../sandbox-bundled/manifests/complete-agent.yaml | 13 ++++++++----- docker/sandbox-bundled/manifests/complete.yaml | 4 ++-- docker/sandbox-bundled/manifests/dev.yaml | 4 ++-- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/charts/flyteagent/README.md b/charts/flyteagent/README.md index a488a8761c..e098129c15 100644 --- a/charts/flyteagent/README.md +++ b/charts/flyteagent/README.md @@ -9,7 +9,7 @@ A Helm chart for Flyte agent | Key | Type | Default | Description | |-----|------|---------|-------------| | additionalContainers | list | `[]` | Appends additional containers to the deployment spec. May include template values. | -| additionalEnvs | list | `[{"FLYTE_AWS_ENDPOINT":"http://flyte-sandbox-minio.flyte:9000"},{"FLYTE_AWS_ACCESS_KEY_ID":"minio"},{"FLYTE_AWS_SECRET_ACCESS_KEY":"miniostorage"}]` | Appends additional volumes to the deployment spec. May include template values. | +| additionalEnvs | list | `[{"name":"FLYTE_AWS_ENDPOINT","value":"http://flyte-sandbox-minio.flyte:9000"},{"name":"FLYTE_AWS_ACCESS_KEY_ID","value":"minio"},{"name":"FLYTE_AWS_SECRET_ACCESS_KEY","value":"miniostorage"}]` | Appends additional volumes to the deployment spec. May include template values. | | additionalVolumeMounts | list | `[]` | Appends additional volume mounts to the main container's spec. May include template values. | | additionalVolumes | list | `[]` | | | affinity | object | `{}` | affinity for flyteagent deployment | diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml index e5076a1a39..3f4d7358d6 100755 --- a/charts/flyteagent/values.yaml +++ b/charts/flyteagent/values.yaml @@ -64,9 +64,15 @@ tolerations: [] affinity: {} # -- Appends additional volumes to the deployment spec. May include template values. additionalEnvs: - - FLYTE_AWS_ENDPOINT: "http://flyte-sandbox-minio.flyte:9000" - - FLYTE_AWS_ACCESS_KEY_ID: "minio" - - FLYTE_AWS_SECRET_ACCESS_KEY: "miniostorage" + - name: FLYTE_AWS_ENDPOINT + value: http://flyte-sandbox-minio.flyte:9000 + - name: FLYTE_AWS_ACCESS_KEY_ID + value: minio + - name: FLYTE_AWS_SECRET_ACCESS_KEY + value: miniostorage + # - FLYTE_AWS_ENDPOINT: "http://flyte-sandbox-minio.flyte:9000" + # - FLYTE_AWS_ACCESS_KEY_ID: "minio" + # - FLYTE_AWS_SECRET_ACCESS_KEY: "miniostorage" additionalVolumes: [] # -- Appends additional volume mounts to the main container's spec. May include template values. additionalVolumeMounts: [] diff --git a/deployment/agent/flyte_agent_helm_generated.yaml b/deployment/agent/flyte_agent_helm_generated.yaml index f7cde2fce8..e5a4f565bb 100644 --- a/deployment/agent/flyte_agent_helm_generated.yaml +++ b/deployment/agent/flyte_agent_helm_generated.yaml @@ -94,9 +94,12 @@ spec: ephemeral-storage: 200Mi memory: 200Mi env: - - FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 - - FLYTE_AWS_ACCESS_KEY_ID: minio - - FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage + - name: FLYTE_AWS_ENDPOINT + value: http://flyte-sandbox-minio.flyte:9000 + - name: FLYTE_AWS_ACCESS_KEY_ID + value: minio + - name: FLYTE_AWS_SECRET_ACCESS_KEY + value: miniostorage serviceAccountName: flyteagent volumes: - name: flyteagent diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index a0acaa59df..04400ef7d3 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: amN4SVhXb3Zmc3doNmw2Qw== + haSharedSecret: RThjVW4yWWF6dGlIQ2tOYg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1409,7 +1409,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 349f7af6f1eb97cb0e23b0440cc72a803bf2b3b05f32d8647c7129c6e6bac1e7 + checksum/secret: f164680c6421ae79123453ab95a4f90d319da826d81a1eb6bbda4bbd310a6a85 labels: app: docker-registry release: flyte-sandbox @@ -1739,9 +1739,12 @@ spec: - pyflyte - serve env: - FLYTE_AWS_ACCESS_KEY_ID: minio - FLYTE_AWS_ENDPOINT: http://flyte-sandbox-minio.flyte:9000 - FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage + - name: FLYTE_AWS_ENDPOINT + value: http://flyte-sandbox-minio.flyte:9000 + - name: FLYTE_AWS_ACCESS_KEY_ID + value: minio + - name: FLYTE_AWS_SECRET_ACCESS_KEY + value: miniostorage image: ghcr.io/flyteorg/flyteagent:1.9.1 imagePullPolicy: IfNotPresent name: flyteagent diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index cfd68b40ce..b74927ba58 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -805,7 +805,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: dnlZYmN4WHlzdG1vdldVbw== + haSharedSecret: WWpTazlHM0NEN0RDWXBsRQ== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1366,7 +1366,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 9cf2de69b3b24211fd9ef188463e5886356101feaa61d32da2b487f655712087 + checksum/secret: 6bd8edf1561619500f1fe1efbd6c8751afd5190ac39e58e2d708bd35cd3cffda labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index c9ede59644..5f8d976395 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: aXZ4TUlWQkdlRjdBZ082Wg== + haSharedSecret: SHJlWmhXNVJlRXIxaVBzTQ== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: c47cf84a6f55b56d96e76b22944ee1824d63996e4e4f8c0496188cfcf78878a9 + checksum/secret: 760354d4663fe6bcc1c2397caad4b25623497042b47287c6178a03ebcd50d613 labels: app: docker-registry release: flyte-sandbox From 7f65b913f3e4ea02dde279f08822bd0abba80557 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 17 Oct 2023 22:19:28 +0800 Subject: [PATCH 06/10] success Signed-off-by: Future Outlier --- charts/flyteagent/values.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml index 3f4d7358d6..db37befff2 100755 --- a/charts/flyteagent/values.yaml +++ b/charts/flyteagent/values.yaml @@ -70,9 +70,6 @@ additionalEnvs: value: minio - name: FLYTE_AWS_SECRET_ACCESS_KEY value: miniostorage - # - FLYTE_AWS_ENDPOINT: "http://flyte-sandbox-minio.flyte:9000" - # - FLYTE_AWS_ACCESS_KEY_ID: "minio" - # - FLYTE_AWS_SECRET_ACCESS_KEY: "miniostorage" additionalVolumes: [] # -- Appends additional volume mounts to the main container's spec. May include template values. additionalVolumeMounts: [] From 999db0b98874eb33c1df016d410bece231179ddb Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Wed, 18 Oct 2023 16:20:00 +0800 Subject: [PATCH 07/10] annotations Signed-off-by: Future Outlier --- charts/flyteagent/README.md | 4 ++-- charts/flyteagent/values.yaml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/flyteagent/README.md b/charts/flyteagent/README.md index e098129c15..16f0433859 100644 --- a/charts/flyteagent/README.md +++ b/charts/flyteagent/README.md @@ -9,9 +9,9 @@ A Helm chart for Flyte agent | Key | Type | Default | Description | |-----|------|---------|-------------| | additionalContainers | list | `[]` | Appends additional containers to the deployment spec. May include template values. | -| additionalEnvs | list | `[{"name":"FLYTE_AWS_ENDPOINT","value":"http://flyte-sandbox-minio.flyte:9000"},{"name":"FLYTE_AWS_ACCESS_KEY_ID","value":"minio"},{"name":"FLYTE_AWS_SECRET_ACCESS_KEY","value":"miniostorage"}]` | Appends additional volumes to the deployment spec. May include template values. | +| additionalEnvs | list | `[{"name":"FLYTE_AWS_ENDPOINT","value":"http://flyte-sandbox-minio.flyte:9000"},{"name":"FLYTE_AWS_ACCESS_KEY_ID","value":"minio"},{"name":"FLYTE_AWS_SECRET_ACCESS_KEY","value":"miniostorage"}]` | additionalEnvs for flyteagent deployment | | additionalVolumeMounts | list | `[]` | Appends additional volume mounts to the main container's spec. May include template values. | -| additionalVolumes | list | `[]` | | +| additionalVolumes | list | `[]` | Appends additional volumes to the deployment spec. May include template values. | | affinity | object | `{}` | affinity for flyteagent deployment | | agentSecret.secretData | object | `{"data":{"username":"User"}}` | Specify your Secret (with sensitive data) or pseudo-manifest (without sensitive data). | | commonAnnotations | object | `{}` | | diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml index db37befff2..6fda169985 100755 --- a/charts/flyteagent/values.yaml +++ b/charts/flyteagent/values.yaml @@ -62,7 +62,7 @@ nodeSelector: {} tolerations: [] # -- affinity for flyteagent deployment affinity: {} -# -- Appends additional volumes to the deployment spec. May include template values. +# -- additionalEnvs for flyteagent deployment additionalEnvs: - name: FLYTE_AWS_ENDPOINT value: http://flyte-sandbox-minio.flyte:9000 @@ -70,6 +70,7 @@ additionalEnvs: value: minio - name: FLYTE_AWS_SECRET_ACCESS_KEY value: miniostorage +# -- 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: [] From 877667451e358503387ac63f978225fe63b6a65b Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Thu, 19 Oct 2023 13:05:38 +0800 Subject: [PATCH 08/10] move minio credential to flyteagent only Signed-off-by: Future Outlier --- charts/flyteagent/README.md | 1 - .../flyteagent/templates/agent/deployment.yaml | 4 ---- charts/flyteagent/values.yaml | 8 -------- .../agent/flyte_agent_helm_generated.yaml | 7 ------- .../kustomize/complete-agent/kustomization.yaml | 3 +++ .../kustomize/complete-agent/patch.yaml | 17 +++++++++++++++++ .../manifests/complete-agent.yaml | 5 ++--- docker/sandbox-bundled/manifests/complete.yaml | 4 ++-- docker/sandbox-bundled/manifests/dev.yaml | 4 ++-- 9 files changed, 26 insertions(+), 27 deletions(-) create mode 100644 docker/sandbox-bundled/kustomize/complete-agent/patch.yaml diff --git a/charts/flyteagent/README.md b/charts/flyteagent/README.md index 16f0433859..c45f994816 100644 --- a/charts/flyteagent/README.md +++ b/charts/flyteagent/README.md @@ -9,7 +9,6 @@ A Helm chart for Flyte agent | Key | Type | Default | Description | |-----|------|---------|-------------| | additionalContainers | list | `[]` | Appends additional containers to the deployment spec. May include template values. | -| additionalEnvs | list | `[{"name":"FLYTE_AWS_ENDPOINT","value":"http://flyte-sandbox-minio.flyte:9000"},{"name":"FLYTE_AWS_ACCESS_KEY_ID","value":"minio"},{"name":"FLYTE_AWS_SECRET_ACCESS_KEY","value":"miniostorage"}]` | additionalEnvs for flyteagent deployment | | additionalVolumeMounts | list | `[]` | Appends additional volume mounts to the main container's spec. May include template values. | | additionalVolumes | list | `[]` | Appends additional volumes to the deployment spec. May include template values. | | affinity | object | `{}` | affinity for flyteagent deployment | diff --git a/charts/flyteagent/templates/agent/deployment.yaml b/charts/flyteagent/templates/agent/deployment.yaml index 4accc00548..3f1ed94f1e 100644 --- a/charts/flyteagent/templates/agent/deployment.yaml +++ b/charts/flyteagent/templates/agent/deployment.yaml @@ -31,10 +31,6 @@ spec: - containerPort: {{ .Values.ports.containerPort }} name: {{ .Values.ports.name }} resources: {{- toYaml .Values.resources | nindent 10 }} - env: - {{- with .Values.additionalEnvs }} - {{- toYaml . | nindent 10 }} - {{- end }} {{- with .Values.additionalVolumeMounts -}} {{ tpl (toYaml .) $ | nindent 8 }} {{- end }} diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml index 6fda169985..9c7dbcb470 100755 --- a/charts/flyteagent/values.yaml +++ b/charts/flyteagent/values.yaml @@ -62,14 +62,6 @@ nodeSelector: {} tolerations: [] # -- affinity for flyteagent deployment affinity: {} -# -- additionalEnvs for flyteagent deployment -additionalEnvs: - - name: FLYTE_AWS_ENDPOINT - value: http://flyte-sandbox-minio.flyte:9000 - - name: FLYTE_AWS_ACCESS_KEY_ID - value: minio - - name: FLYTE_AWS_SECRET_ACCESS_KEY - value: miniostorage # -- 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. diff --git a/deployment/agent/flyte_agent_helm_generated.yaml b/deployment/agent/flyte_agent_helm_generated.yaml index e5a4f565bb..89f3835892 100644 --- a/deployment/agent/flyte_agent_helm_generated.yaml +++ b/deployment/agent/flyte_agent_helm_generated.yaml @@ -93,13 +93,6 @@ spec: cpu: 500m ephemeral-storage: 200Mi memory: 200Mi - env: - - name: FLYTE_AWS_ENDPOINT - value: http://flyte-sandbox-minio.flyte:9000 - - name: FLYTE_AWS_ACCESS_KEY_ID - value: minio - - name: FLYTE_AWS_SECRET_ACCESS_KEY - value: miniostorage serviceAccountName: flyteagent volumes: - name: flyteagent diff --git a/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml b/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml index 3c6d5c6e5e..145388ca2f 100644 --- a/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml +++ b/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml @@ -10,3 +10,6 @@ helmCharts: namespace: flyte resources: - ../namespace.yaml + +patchesStrategicMerge: + - patch.yaml diff --git a/docker/sandbox-bundled/kustomize/complete-agent/patch.yaml b/docker/sandbox-bundled/kustomize/complete-agent/patch.yaml new file mode 100644 index 0000000000..37c4e8604b --- /dev/null +++ b/docker/sandbox-bundled/kustomize/complete-agent/patch.yaml @@ -0,0 +1,17 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: flyteagent + namespace: flyte +spec: + template: + spec: + containers: + - name: flyteagent + env: + - name: FLYTE_AWS_ENDPOINT + value: http://flyte-sandbox-minio.flyte:9000 + - name: FLYTE_AWS_ACCESS_KEY_ID + value: minio + - name: FLYTE_AWS_SECRET_ACCESS_KEY + value: miniostorage diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 04400ef7d3..e537fef738 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: RThjVW4yWWF6dGlIQ2tOYg== + haSharedSecret: NlhtNUl5amRScVFNVHVPRQ== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1409,7 +1409,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: f164680c6421ae79123453ab95a4f90d319da826d81a1eb6bbda4bbd310a6a85 + checksum/secret: 4816300df83f72e9be3652c291978fb2e05b80b8afcc3dfd6812f4aa28d5f640 labels: app: docker-registry release: flyte-sandbox @@ -1727,7 +1727,6 @@ spec: app.kubernetes.io/name: flyteagent template: metadata: - annotations: null labels: app.kubernetes.io/instance: flyteagent app.kubernetes.io/managed-by: Helm diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index b74927ba58..4893470813 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -805,7 +805,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: WWpTazlHM0NEN0RDWXBsRQ== + haSharedSecret: dVREVFFlOUx5dWtyRzNhNg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1366,7 +1366,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 6bd8edf1561619500f1fe1efbd6c8751afd5190ac39e58e2d708bd35cd3cffda + checksum/secret: b96da081475b0e9dc4818925c2b987d4a03f4ae8cdd13c5646882144c377d80f labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 5f8d976395..ede3676233 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: SHJlWmhXNVJlRXIxaVBzTQ== + haSharedSecret: dng0dkhOTDZTYzNVWXQweQ== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 760354d4663fe6bcc1c2397caad4b25623497042b47287c6178a03ebcd50d613 + checksum/secret: bc60a1502c30ce6508ac0b78e0b15a13e624a5671ca81548f1782cb21e540d58 labels: app: docker-registry release: flyte-sandbox From d03f73cf512d3a28f8eae9fd101337e117b4cc2e Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Thu, 19 Oct 2023 13:24:23 +0800 Subject: [PATCH 09/10] Update values.yaml Signed-off-by: Future-Outlier --- charts/flyteagent/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml index 9c7dbcb470..8a40180e45 100755 --- a/charts/flyteagent/values.yaml +++ b/charts/flyteagent/values.yaml @@ -71,4 +71,4 @@ additionalContainers: [] # -- Appends extra command line arguments to the main command extraArgs: {} # -- Sets priorityClassName for datacatalog pod(s). -priorityClassName: "" \ No newline at end of file +priorityClassName: "" From 5616996a72d91493cef8337d3ae5baae14d0a6b3 Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Thu, 19 Oct 2023 13:24:41 +0800 Subject: [PATCH 10/10] Update deployment.yaml Signed-off-by: Future-Outlier --- charts/flyteagent/templates/agent/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/flyteagent/templates/agent/deployment.yaml b/charts/flyteagent/templates/agent/deployment.yaml index 3f1ed94f1e..a8b7a3889e 100644 --- a/charts/flyteagent/templates/agent/deployment.yaml +++ b/charts/flyteagent/templates/agent/deployment.yaml @@ -50,4 +50,4 @@ spec: {{- end }} {{- with .Values.tolerations }} tolerations: {{ tpl (toYaml .) $ | nindent 8 }} - {{- end }} \ No newline at end of file + {{- end }}