Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ data:
region: ${INFRA_MIDDLEWARES_S3_COS_REGION}
secret_id: ${INFRA_MIDDLEWARES_S3_COS_SECRETID}
secret_key: ${INFRA_MIDDLEWARES_S3_COS_SECRETKEY}
# 调用 AGS API 时的 STS 临时凭证配置(非必填,为空时回退到 secret_id/secret_key 长期 AK/SK)
assume_role:
role_arn: "{{ dig "components" "s3" "cos" "stsRoleArn" "" .Values.global }}"
duration_seconds: 3600
refresh_ahead_seconds: 300
public_sandbox_instance_id: ${PUBLIC_SANDBOX_INSTANCE_ID} # 公共沙箱固定实例ID(用于目录预创建)
public_sandbox_token: ${PUBLIC_SANDBOX_TOKEN} # 公共沙箱固定访问token(用于目录预创建)
default_tool_id: ${DEFAULT_TOOL_ID}
Expand Down
12 changes: 12 additions & 0 deletions incubator/adp/charts/adp-agent-exec-env/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,18 @@ spec:
value: TKE
- name: ADP_HOST
value: "{{ .Values.global.scheme }}://{{ .Values.global.clb }}"
{{- if .Values.global.components.s3.cos.enableSts }}
- name: ADP_ASSUME_ROLE_SECRET_ID
valueFrom:
secretKeyRef:
name: infra-credentials
key: ADP_ASSUME_ROLE_SECRET_ID
- name: ADP_ASSUME_ROLE_SECRET_KEY
valueFrom:
secretKeyRef:
name: infra-credentials
key: ADP_ASSUME_ROLE_SECRET_KEY
{{- end }}
{{- if eq .Values.global.clusterSize "minimal" }}
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion incubator/adp/charts/adp-agent-exec-env/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
adp-agent-exec-env:
url: "{{ .Values.global.imageRegistry }}/tke-market/agent-exec-env:3_2607151712_stable_iaas_v4.0.3.0_db398f83_private"
url: "{{ .Values.global.imageRegistry }}/tke-market/agent-exec-env:5_2608011502_stable_iaas_v4.0.3.0_56296a3b_private"
resources:
limits:
cpu: 4
Expand Down
14 changes: 10 additions & 4 deletions incubator/adp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,17 @@ global:
# 是否启用 COS STS 临时凭证模式(非必填,默认 false)
# 为 true 时,仅通过 STS 模式访问 COS 资源,禁止使用永久 secretId/secretKey;此时 stsRoleArn 必填
enableSts: false
# COS STS 模式的角色标识(enableSts=true 时必填)
# COS STS 模式的角色标识(enableSts=true 时必填,enableSts=false时无需配置
# 需在腾讯云控制台创建 CAM 角色,并授予以下权限策略:
# QcloudTsearchFullAccess、QcloudHunYuanFullAccess、QcloudOCRFullAccess、
# QcloudLKEAPFullAccess、QcloudCOSFullAccess
stsRoleArn: "qcs::cam::uin/1000000XXXXX:roleName/AaaBbbCcc"
# QcloudTsearchFullAccess: 检索分析服务(Tsearch)全读写访问权限
# QcloudHunYuanFullAccess: 腾讯混元大模型(Hunyuan)全读写访问权限
# QcloudOCRFullAccess: 文字识别全读写访问权限
# QcloudLKEAPFullAccess: ADP原子能力权限
# QcloudCOSFullAccess: 对象存储(COS)全读写访问权限
# QcloudWSAFullAccess: 联网搜索API(WSA)全读写访问权限
# QcloudAGSFullAccess: Agent 沙箱服务(AGS)全读写访问权限(启用agentRuntime需要授权该权限,用于调用ags api创建沙箱)
# QcloudAccessForCAM_QCSLinkedRoleInsirui: 用于cam访问其他云服务资源(启用agentRuntime需要授权该权限,用于将角色传递给沙箱实例)
stsRoleArn: ""

# 消息队列CKafka版 https://console.cloud.tencent.com/ckafka/instance
kafka:
Expand Down
Loading