diff --git a/deploy/Chart.yaml b/deploy/Chart.yaml index 97da6b0f..c995e983 100644 --- a/deploy/Chart.yaml +++ b/deploy/Chart.yaml @@ -27,6 +27,11 @@ dependencies: version: "0.0.1" repository: "file://./api-service" condition: api-service.enabled + - name: api-service + version: "0.0.1" + repository: "file://./api-service" + condition: api-service-k8s.enabled + alias: api-service-k8s # Keywords for Helm repository search keywords: diff --git a/deploy/api-service/templates/_helpers.tpl b/deploy/api-service/templates/_helpers.tpl index f6667039..8c3f63d9 100644 --- a/deploy/api-service/templates/_helpers.tpl +++ b/deploy/api-service/templates/_helpers.tpl @@ -50,3 +50,17 @@ Selector labels {{- printf "http://controller.%s.svc.cluster.local:8080" .Values.metadata.namespace -}} {{ end }} {{ end }} + +{{- define "api-service.scheduleType" -}} + {{ if .Values.scheduleType }} + {{- .Values.scheduleType -}} + {{ else }} + {{- printf "k8s" .Values.metadata.namespace -}} + {{ end }} +{{ end }} + +{{- define "api-service.qps" -}} +{{- if .Values.qps }}{{ printf "%v" .Values.qps }}{{ else }}{{ "10" }}{{ end }} +{{- end }} + + diff --git a/deploy/api-service/templates/deployment.yaml b/deploy/api-service/templates/deployment.yaml index 94ebd536..eddc9375 100644 --- a/deploy/api-service/templates/deployment.yaml +++ b/deploy/api-service/templates/deployment.yaml @@ -39,6 +39,10 @@ spec: - {{ include "api-service.backendAddr" . }} - --schedule-addr - {{ include "api-service.scheduleAddr" . }} + - --schedule-type + - {{ include "api-service.scheduleType" . }} + - --qps + - {{ include "api-service.qps" . | quote }} ports: - name: http containerPort: {{ .Values.service.port }} diff --git a/deploy/controller/templates/_helpers.tpl b/deploy/controller/templates/_helpers.tpl index 795c350e..35f07be1 100644 --- a/deploy/controller/templates/_helpers.tpl +++ b/deploy/controller/templates/_helpers.tpl @@ -76,5 +76,5 @@ Create the name of the service account to use Sandbox namespace */}} {{- define "controller.sandboxNamespace" -}} -{{- .Values.sandboxNamespace | default "aenvsandbox" }} +{{- .Values.sandboxNamespace | default "aenv-sandbox" }} {{- end }} diff --git a/deploy/controller/templates/deployment.yaml b/deploy/controller/templates/deployment.yaml index 11f2e3bd..f5e2fcd5 100644 --- a/deploy/controller/templates/deployment.yaml +++ b/deploy/controller/templates/deployment.yaml @@ -48,8 +48,11 @@ spec: args: - --namespace - {{ include "controller.sandboxNamespace" . }} - - --leader-elect - - {{ .Values.leaderElect | quote }} + {{- if .Values.leaderElect }} + - --leader-elect=true + {{- else }} + - --leader-elect=false + {{- end }} ports: - name: http containerPort: {{ .Values.service.port }} @@ -67,6 +70,9 @@ spec: periodSeconds: 5 successThreshold: 1 timeoutSeconds: 1 + env: + - name: SERVICE_DOMAIN_SUFFIX + value: {{ .Values.serviceDomainSuffix | quote }} resources: {{ toYaml .Values.resources | nindent 12 }} {{- if .Values.podTemplates }} diff --git a/deploy/controller/values.yaml b/deploy/controller/values.yaml index 71f0a4da..5c4ec4a7 100644 --- a/deploy/controller/values.yaml +++ b/deploy/controller/values.yaml @@ -8,7 +8,7 @@ name: controller metadata: namespace: aenv -sandboxNamespace: aenvsandbox +sandboxNamespace: aenv-sandbox # Namespace configuration namespace: diff --git a/deploy/controller/values/prod.yaml b/deploy/controller/values/prod.yaml index 1521de47..d45f391b 100644 --- a/deploy/controller/values/prod.yaml +++ b/deploy/controller/values/prod.yaml @@ -3,7 +3,7 @@ metadata: namespace: aenv -sandboxNamespace: aenvsandbox +sandboxNamespace: aenv-sandbox storageAddr: "" leaderElect: true diff --git a/deploy/envhub/templates/deployment.yaml b/deploy/envhub/templates/deployment.yaml index 42a7ffc8..44547897 100644 --- a/deploy/envhub/templates/deployment.yaml +++ b/deploy/envhub/templates/deployment.yaml @@ -35,24 +35,16 @@ spec: image: {{ .Values.image }} imagePullPolicy: {{.Values.imagePullPolicy }} env: - - name: ACI_ACCESS + - name: OSS_ENDPOINT valueFrom: secretKeyRef: - name: envhub-secret - key: ACI_ACCESS - - name: ACI_SECRET + name: oss-secret + key: oss-endpoint + - name: OSS_BUCKET valueFrom: secretKeyRef: - name: envhub-secret - key: ACI_SECRET - {{- if .Values.oss.endpoint }} - - name: OSS_ENDPOINT - value: {{ .Values.oss.endpoint | quote }} - {{- end }} - {{- if .Values.oss.bucket }} - - name: OSS_BUCKET - value: {{ .Values.oss.bucket | quote }} - {{- end }} + name: oss-secret + key: oss-bucket - name: OSS_KEY_PREFIX value: {{ .Values.oss.keyPrefix | quote }} - name: OSS_REGION @@ -60,13 +52,13 @@ spec: - name: OSS_ACCESS_KEY_ID valueFrom: secretKeyRef: - name: envhub-secret - key: OSS_ACCESS_KEY_ID + name: oss-secret + key: oss-ak - name: OSS_ACCESS_KEY_SECRET valueFrom: secretKeyRef: - name: envhub-secret - key: OSS_ACCESS_KEY_SECRET + name: oss-secret + key: oss-sk args: - --storage-backend @@ -79,6 +71,12 @@ spec: - {{ .Values.service.port | quote }} - --metrics-port - {{ .Values.service.metricsPort | quote }} + {{if .Values.deploy.templateId}} + - --template-id={{ .Values.deploy.templateId }} + {{end}} + {{if .Values.deploy.callbackURL}} + - --callback-url={{ .Values.deploy.callbackURL }} + {{end}} ports: - name: http containerPort: {{ .Values.service.port }} diff --git a/deploy/envhub/templates/secret.yaml b/deploy/envhub/templates/secret.yaml index 9456a3fd..d82e7db3 100644 --- a/deploy/envhub/templates/secret.yaml +++ b/deploy/envhub/templates/secret.yaml @@ -1,13 +1,60 @@ -# 创建Secret +# 为 envhub namespace 创建 OSS secret apiVersion: v1 kind: Secret metadata: - name: envhub-secret + name: oss-secret namespace: {{ .Values.metadata.namespace }} type: Opaque data: - # base64编码的值 - ACI_ACCESS: "" - ACI_SECRET: "" - OSS_ACCESS_KEY_ID: "" - OSS_ACCESS_KEY_SECRET: "" + # OSS credentials (base64 encoded) + {{- if .Values.oss.accessKeyId }} + oss-ak: {{ .Values.oss.accessKeyId | b64enc | quote }} + {{- else }} + oss-ak: "" + {{- end }} + {{- if .Values.oss.accessKeySecret }} + oss-sk: {{ .Values.oss.accessKeySecret | b64enc | quote }} + {{- else }} + oss-sk: "" + {{- end }} + {{- if .Values.oss.endpoint }} + oss-endpoint: {{ .Values.oss.endpoint | b64enc | quote }} + {{- else }} + oss-endpoint: "" + {{- end }} + {{- if .Values.oss.bucket }} + oss-bucket: {{ .Values.oss.bucket | b64enc | quote }} + {{- else }} + oss-bucket: "" + {{- end }} +--- +# 为 aenv-sandbox namespace 创建相同的 OSS secret +# 用于 service pod 访问 OSS +apiVersion: v1 +kind: Secret +metadata: + name: oss-secret + namespace: {{ .Values.global.sandboxNamespace }} +type: Opaque +data: + # OSS credentials (base64 encoded) + {{- if .Values.oss.accessKeyId }} + oss-ak: {{ .Values.oss.accessKeyId | b64enc | quote }} + {{- else }} + oss-ak: "" + {{- end }} + {{- if .Values.oss.accessKeySecret }} + oss-sk: {{ .Values.oss.accessKeySecret | b64enc | quote }} + {{- else }} + oss-sk: "" + {{- end }} + {{- if .Values.oss.endpoint }} + oss-endpoint: {{ .Values.oss.endpoint | b64enc | quote }} + {{- else }} + oss-endpoint: "" + {{- end }} + {{- if .Values.oss.bucket }} + oss-bucket: {{ .Values.oss.bucket | b64enc | quote }} + {{- else }} + oss-bucket: "" + {{- end }} diff --git a/deploy/envhub/values.yaml b/deploy/envhub/values.yaml index 5bc1b60b..6c425f30 100644 --- a/deploy/envhub/values.yaml +++ b/deploy/envhub/values.yaml @@ -33,6 +33,10 @@ podSecurityContext: {} securityContext: {} +deploy: + templateId: "" + callbackURL: "" + service: type: LoadBalancer port: 8083 @@ -67,5 +71,5 @@ oss: bucket: "" # OSS bucket name, e.g., "your-bucket-name" keyPrefix: "" # Key prefix for OSS objects region: "" # OSS region， e.g. "cn-hangzhou" - # Access credentials are loaded from secret (OSS_ACCESS_KEY_ID and OSS_ACCESS_KEY_SECRET) - # or from environment variables + accessKeyId: "" # OSS Access Key ID (will be base64 encoded in secret) + accessKeySecret: "" # OSS Access Key Secret (will be base64 encoded in secret) diff --git a/deploy/redis/values.yaml b/deploy/redis/values.yaml index 3166f44f..6dcfb10a 100644 --- a/deploy/redis/values.yaml +++ b/deploy/redis/values.yaml @@ -49,7 +49,7 @@ persistence: storageClassName: "" accessModes: - ReadWriteOnce - size: 10Gi + size: 5Gi # Redis 配置（无密码模式） redis: