diff --git a/rnd/infra/helm/autogpt-market/.helmignore b/rnd/infra/helm/autogpt-market/.helmignore new file mode 100644 index 000000000..0e8a0eb36 --- /dev/null +++ b/rnd/infra/helm/autogpt-market/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/rnd/infra/helm/autogpt-market/Chart.yaml b/rnd/infra/helm/autogpt-market/Chart.yaml new file mode 100644 index 000000000..72544a095 --- /dev/null +++ b/rnd/infra/helm/autogpt-market/Chart.yaml @@ -0,0 +1,9 @@ +apiVersion: v2 +name: autogpt-market +description: A Helm chart for Market + +type: application + +version: 0.1.0 + +appVersion: "1.0.0" diff --git a/rnd/infra/helm/autogpt-market/templates/NOTES.txt b/rnd/infra/helm/autogpt-market/templates/NOTES.txt new file mode 100644 index 000000000..585e8704a --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "autogpt-market.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "autogpt-market.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "autogpt-market.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "autogpt-market.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/rnd/infra/helm/autogpt-market/templates/_helpers.tpl b/rnd/infra/helm/autogpt-market/templates/_helpers.tpl new file mode 100644 index 000000000..344a7d8a9 --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "autogpt-market.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "autogpt-market.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "autogpt-market.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "autogpt-market.labels" -}} +helm.sh/chart: {{ include "autogpt-market.chart" . }} +{{ include "autogpt-market.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "autogpt-market.selectorLabels" -}} +app.kubernetes.io/name: {{ include "autogpt-market.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "autogpt-market.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "autogpt-market.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/rnd/infra/helm/autogpt-market/templates/backendconfig.yaml b/rnd/infra/helm/autogpt-market/templates/backendconfig.yaml new file mode 100644 index 000000000..e7f7c8a8f --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/backendconfig.yaml @@ -0,0 +1,26 @@ +apiVersion: cloud.google.com/v1 +kind: BackendConfig +metadata: + name: {{ include "autogpt-market.fullname" . }} +spec: + customRequestHeaders: + headers: + - "Access-Control-Allow-Origin:{{ .Values.cors.allowOrigin }}" + - "Access-Control-Allow-Methods:{{ .Values.cors.allowMethods | join "," }}" + - "Access-Control-Allow-Headers:{{ .Values.cors.allowHeaders | join "," }}" + - "Access-Control-Max-Age:{{ .Values.cors.maxAge }}" + {{- if .Values.cors.allowCredentials }} + - "Access-Control-Allow-Credentials:true" + {{- end }} + customResponseHeaders: + headers: + - "Access-Control-Allow-Origin:{{ .Values.cors.allowOrigin }}" + - "Access-Control-Allow-Methods:{{ .Values.cors.allowMethods | join "," }}" + - "Access-Control-Allow-Headers:{{ .Values.cors.allowHeaders | join "," }}" + - "Access-Control-Max-Age:{{ .Values.cors.maxAge }}" + {{- if .Values.cors.allowCredentials }} + - "Access-Control-Allow-Credentials:true" + {{- end }} + timeoutSec: 1800 + connectionDraining: + drainingTimeoutSec: 1800 \ No newline at end of file diff --git a/rnd/infra/helm/autogpt-market/templates/configmap.yaml b/rnd/infra/helm/autogpt-market/templates/configmap.yaml new file mode 100644 index 000000000..23e161917 --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/configmap.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "autogpt-market.fullname" . }}-config + labels: + {{- include "autogpt-market.labels" . | nindent 4 }} +data: + {{- range $key, $value := .Values.env }} + {{ $key }}: {{ $value | quote }} + {{- end }} \ No newline at end of file diff --git a/rnd/infra/helm/autogpt-market/templates/deployment.yaml b/rnd/infra/helm/autogpt-market/templates/deployment.yaml new file mode 100644 index 000000000..a1b10c22e --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/deployment.yaml @@ -0,0 +1,80 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "autogpt-market.fullname" . }} + labels: + {{- include "autogpt-market.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "autogpt-market.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "autogpt-market.labels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "autogpt-market.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + envFrom: + - configMapRef: + name: {{ include "autogpt-market.fullname" . }}-config + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + livenessProbe: + {{- toYaml .Values.livenessProbe | nindent 12 }} + readinessProbe: + {{- toYaml .Values.readinessProbe | nindent 12 }} + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} + {{- end }} + - name: cloud-sql-proxy + image: "{{ .Values.cloudSqlProxy.image.repository }}:{{ .Values.cloudSqlProxy.image.tag }}" + args: + - "--structured-logs" + {{- if .Values.cloudSqlProxy.usePrivateIp }} + - "--private-ip" + {{- end }} + - "--port={{ .Values.cloudSqlProxy.port }}" + - "{{ .Values.cloudSqlProxy.instanceConnectionName }}" + {{- with .Values.volumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/rnd/infra/helm/autogpt-market/templates/frontendconfig.yaml b/rnd/infra/helm/autogpt-market/templates/frontendconfig.yaml new file mode 100644 index 000000000..a66df4acd --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/frontendconfig.yaml @@ -0,0 +1,8 @@ +apiVersion: networking.gke.io/v1beta1 +kind: FrontendConfig +metadata: + name: {{ include "autogpt-market.fullname" . }}-frontend-config +spec: + redirectToHttps: + enabled: true + responseCodeName: MOVED_PERMANENTLY_DEFAULT diff --git a/rnd/infra/helm/autogpt-market/templates/hpa.yaml b/rnd/infra/helm/autogpt-market/templates/hpa.yaml new file mode 100644 index 000000000..08844f8e1 --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "autogpt-market.fullname" . }} + labels: + {{- include "autogpt-market.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "autogpt-market.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/rnd/infra/helm/autogpt-market/templates/ingress.yaml b/rnd/infra/helm/autogpt-market/templates/ingress.yaml new file mode 100644 index 000000000..933a42f99 --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "autogpt-market.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "autogpt-market.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/rnd/infra/helm/autogpt-market/templates/managedcert.yaml b/rnd/infra/helm/autogpt-market/templates/managedcert.yaml new file mode 100644 index 000000000..2a0f5a048 --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/managedcert.yaml @@ -0,0 +1,7 @@ +apiVersion: networking.gke.io/v1 +kind: ManagedCertificate +metadata: + name: {{ include "autogpt-market.fullname" . }}-cert +spec: + domains: + - {{ .Values.domain }} \ No newline at end of file diff --git a/rnd/infra/helm/autogpt-market/templates/service.yaml b/rnd/infra/helm/autogpt-market/templates/service.yaml new file mode 100644 index 000000000..ca126063d --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "autogpt-market.fullname" . }} + labels: + {{- include "autogpt-market.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "autogpt-market.selectorLabels" . | nindent 4 }} diff --git a/rnd/infra/helm/autogpt-market/templates/serviceaccount.yaml b/rnd/infra/helm/autogpt-market/templates/serviceaccount.yaml new file mode 100644 index 000000000..dae3bc325 --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "autogpt-market.serviceAccountName" . }} + labels: + {{- include "autogpt-market.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/rnd/infra/helm/autogpt-market/templates/tests/test-connection.yaml b/rnd/infra/helm/autogpt-market/templates/tests/test-connection.yaml new file mode 100644 index 000000000..2aa417fff --- /dev/null +++ b/rnd/infra/helm/autogpt-market/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "autogpt-market.fullname" . }}-test-connection" + labels: + {{- include "autogpt-market.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "autogpt-market.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/rnd/infra/helm/autogpt-market/values.dev.yaml b/rnd/infra/helm/autogpt-market/values.dev.yaml new file mode 100644 index 000000000..f894822be --- /dev/null +++ b/rnd/infra/helm/autogpt-market/values.dev.yaml @@ -0,0 +1,102 @@ +# dev values, overwrite base values as needed. + +image: + repository: us-east1-docker.pkg.dev/agpt-dev/agpt-market-dev/agpt-market-dev + pullPolicy: Always + tag: "latest" + +serviceAccount: + annotations: + iam.gke.io/gcp-service-account: "dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" + name: "dev-agpt-market-sa" + +service: + type: ClusterIP + port: 8000 + targetPort: 8000 + annotations: + cloud.google.com/neg: '{"ingress": true}' + beta.cloud.google.com/backend-config: '{"default": "autogpt-market"}' + +ingress: + enabled: true + className: "gce" + annotations: + kubernetes.io/ingress.class: gce + kubernetes.io/ingress.global-static-ip-name: "agpt-dev-agpt-market-ip" + networking.gke.io/managed-certificates: "autogpt-market-cert" + kubernetes.io/ingress.allow-http: "false" + hosts: + - host: dev-market.agpt.co + paths: + - path: / + pathType: Prefix + backend: + service: + name: autogpt-market + port: 8000 + defaultBackend: + service: + name: autogpt-market + port: + number: 8000 + +resources: + requests: + cpu: 200m + memory: 1Gi + limits: + cpu: 2 + memory: 2Gi + +livenessProbe: + httpGet: + path: /health + port: 8000 + initialDelaySeconds: 60 + periodSeconds: 20 + timeoutSeconds: 10 + failureThreshold: 12 +readinessProbe: + httpGet: + path: /health + port: 8000 + initialDelaySeconds: 60 + periodSeconds: 20 + timeoutSeconds: 10 + failureThreshold: 12 + +domain: "dev-market.agpt.co" + +cloudSqlProxy: + image: + repository: gcr.io/cloud-sql-connectors/cloud-sql-proxy + tag: 2.11.4 + instanceConnectionName: "agpt-dev:us-central1:agpt-server-dev" + port: 5432 + resources: + requests: + memory: "2Gi" + cpu: "1" + +cors: + allowOrigin: "https://dev-builder.agpt.co" + allowMethods: + - "GET" + - "POST" + - "PUT" + - "DELETE" + - "OPTIONS" + allowHeaders: + - "Content-Type" + - "Authorization" + maxAge: 3600 + allowCredentials: true + +env: + APP_ENV: "dev" + ENABLE_AUTH: "true" + SUPABASE_JWT_SECRET: "" + SUPABASE_ANON_KEY: "" + SUPABASE_URL: "" + DATABASE_URL: "" \ No newline at end of file diff --git a/rnd/infra/helm/autogpt-market/values.yaml b/rnd/infra/helm/autogpt-market/values.yaml new file mode 100644 index 000000000..b5227f5f0 --- /dev/null +++ b/rnd/infra/helm/autogpt-market/values.yaml @@ -0,0 +1,107 @@ +# Default values for autogpt-market. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: nginx + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 80 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +livenessProbe: + httpGet: + path: / + port: http +readinessProbe: + httpGet: + path: / + port: http + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: [] +# - name: foo +# secret: +# secretName: mysecret +# optional: false + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: [] +# - name: foo +# mountPath: "/etc/foo" +# readOnly: true + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/rnd/infra/helm/autogpt-server/templates/frontendconfig.yaml b/rnd/infra/helm/autogpt-server/templates/frontendconfig.yaml index 2aae1db38..91848af93 100644 --- a/rnd/infra/helm/autogpt-server/templates/frontendconfig.yaml +++ b/rnd/infra/helm/autogpt-server/templates/frontendconfig.yaml @@ -1,3 +1,4 @@ +apiVersion: networking.gke.io/v1beta1 kind: FrontendConfig metadata: name: {{ include "autogpt-server.fullname" . }}-frontend-config diff --git a/rnd/infra/terraform/environments/dev.tfvars b/rnd/infra/terraform/environments/dev.tfvars index 0dc6cd83c..3b868ea5c 100644 --- a/rnd/infra/terraform/environments/dev.tfvars +++ b/rnd/infra/terraform/environments/dev.tfvars @@ -7,9 +7,9 @@ subnet_cidr = "10.0.0.0/24" cluster_name = "dev-gke-cluster" node_count = 3 node_pool_name = "dev-main-pool" -machine_type = "e2-medium" +machine_type = "e2-highmem-4" disk_size_gb = 100 -static_ip_names = ["agpt-server-ip", "agpt-builder-ip", "agpt-ws-server-ip"] +static_ip_names = ["agpt-server-ip", "agpt-builder-ip", "agpt-ws-server-ip", "agpt-market-ip"] service_accounts = { @@ -24,6 +24,10 @@ service_accounts = { "dev-agpt-ws-server-sa" = { display_name = "AutoGPT Dev WebSocket Server Account" description = "Service account for agpt dev websocket server" + }, + "dev-agpt-market-sa" = { + display_name = "AutoGPT Dev Market Server Account" + description = "Service account for agpt dev market server" } } @@ -42,6 +46,11 @@ workload_identity_bindings = { service_account_name = "dev-agpt-ws-server-sa" namespace = "dev-agpt" ksa_name = "dev-agpt-ws-server-sa" + }, + "dev-agpt-market-workload-identity" = { + service_account_name = "dev-agpt-market-sa" + namespace = "dev-agpt" + ksa_name = "dev-agpt-market-sa" } } @@ -49,34 +58,41 @@ role_bindings = { "roles/container.developer" = [ "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com" + "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com", + "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" ], "roles/cloudsql.client" = [ "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", + "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" ], "roles/cloudsql.editor" = [ "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com" + "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", + "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" ], "roles/cloudsql.instanceUser" = [ "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com" + "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", + "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" ], "roles/iam.workloadIdentityUser" = [ "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com" + "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com", + "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" ] "roles/compute.networkUser" = [ "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com" + "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com", + "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" ], "roles/container.hostServiceAgentUser" = [ "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com" + "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com", + "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" ] } diff --git a/rnd/market/Dockerfile b/rnd/market/Dockerfile index ffb1ace7b..52a691131 100644 --- a/rnd/market/Dockerfile +++ b/rnd/market/Dockerfile @@ -26,6 +26,7 @@ ENV POETRY_VERSION=1.8.3 \ RUN pip3 install poetry COPY rnd/market /app/rnd/market +COPY rnd/autogpt_libs /app/rnd/autogpt_libs WORKDIR /app/rnd/market diff --git a/rnd/market/market/app.py b/rnd/market/market/app.py index 0350e241d..54cdd0802 100644 --- a/rnd/market/market/app.py +++ b/rnd/market/market/app.py @@ -62,9 +62,10 @@ app.add_middleware(fastapi.middleware.gzip.GZipMiddleware, minimum_size=1000) app.add_middleware( middleware_class=fastapi.middleware.cors.CORSMiddleware, allow_origins=[ - # Currently, we allow only next.js dev server "http://localhost:3000", "http://127.0.0.1:3000", + "http://127.0.0.1:3000", + "https://dev-builder.agpt.co" ], allow_credentials=True, allow_methods=["*"],