-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into deployment-strategy
- Loading branch information
Showing
30 changed files
with
854 additions
and
172 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,16 +2,13 @@ apiVersion: v2 | |
| name: studio | ||
| description: A Helm chart for Kubernetes | ||
| type: application | ||
| version: 0.4.3 | ||
| appVersion: "v2.27.0" | ||
| version: 0.6.1 | ||
| appVersion: "v2.29.0" | ||
| maintainers: | ||
| - name: iterative | ||
| email: [email protected] | ||
| icon: "https://static.iterative.ai/logo/studio.svg" | ||
| dependencies: | ||
| - name: nginx | ||
| version: "13.2.30" | ||
| repository: "https://charts.bitnami.com/bitnami" | ||
| - name: redis | ||
| condition: redis.enabled | ||
| version: "17.14.3" | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| server { | ||
| listen 80; | ||
| access_log /dev/stdout; | ||
| error_log /dev/stdout debug; | ||
|
|
||
| {{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }} | ||
| rewrite /{{ include "studio.basePath" . }}/(.*) /$1 break; | ||
| {{- end }} | ||
|
|
||
| location / { | ||
| proxy_set_header Host $http_host; | ||
| proxy_set_header X-Real-IP $remote_addr; | ||
| proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
| proxy_set_header X-Forwarded-Proto $scheme; | ||
| proxy_pass http://backend; | ||
| } | ||
| } | ||
|
|
||
| upstream backend { | ||
| server 127.0.0.1:8000; | ||
| } | ||
|
|
||
| # Health check endpoint | ||
| server { | ||
| access_log /dev/null main; | ||
| error_log /dev/null info; | ||
|
|
||
| listen 8080; | ||
| location / { | ||
| return 200 'OK'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| server { | ||
| listen 80; | ||
| server_name _; | ||
| access_log /dev/stdout; | ||
| error_log /dev/stdout debug; | ||
|
|
||
| root /blobvault; | ||
|
|
||
| add_header 'Access-Control-Allow-Origin' '*'; | ||
| add_header 'Access-Control-Allow-Credentials' 'true'; | ||
| add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; | ||
| add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Studio-Trace-Id'; | ||
|
|
||
| {{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }} | ||
| rewrite /{{ include "studio.basePath" . }}/blobvault/(.*) /$1 break; | ||
| {{- else }} | ||
| rewrite /blobvault/(.*) /$1 break; | ||
| {{- end }} | ||
|
|
||
| location ~ \.gz$ { | ||
| if ($request_method = 'OPTIONS') { | ||
| add_header 'Access-Control-Max-Age' 1728000; | ||
| add_header 'Content-Type' 'text/plain charset=UTF-8'; | ||
| add_header 'Content-Length' 0; | ||
| return 204; | ||
| } | ||
| if ($request_method = 'GET') { | ||
| add_header Content-Encoding gzip; | ||
| } | ||
| gzip off; | ||
| types { } default_type "application/json"; | ||
| } | ||
|
|
||
| location /blobvault { | ||
| if ($request_method = 'OPTIONS') { | ||
| add_header 'Access-Control-Max-Age' 1728000; | ||
| add_header 'Content-Type' 'text/plain charset=UTF-8'; | ||
| add_header 'Content-Length' 0; | ||
| return 204; | ||
| } | ||
|
|
||
| gzip on; | ||
|
|
||
| try_files $uri $uri/ =404; | ||
| } | ||
| } | ||
|
|
||
| # Health check endpoint | ||
| server { | ||
| access_log /dev/null main; | ||
| error_log /dev/null info; | ||
|
|
||
| listen 8080; | ||
| location / { | ||
| return 200 'OK'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| user nginx; | ||
| worker_processes auto; | ||
|
|
||
| error_log /var/log/nginx/error.log notice; | ||
| pid /var/run/nginx.pid; | ||
|
|
||
| events { | ||
| worker_connections 1024; | ||
| } | ||
|
|
||
| http { | ||
| include /etc/nginx/mime.types; | ||
| default_type application/octet-stream; | ||
|
|
||
| log_format main '$remote_addr - $remote_user [$time_local] "$request" ' | ||
| '$status $body_bytes_sent "$http_referer" ' | ||
| '"$http_user_agent" "$http_x_forwarded_for"'; | ||
|
|
||
| access_log /dev/stdout main; | ||
| error_log /dev/stdout info; | ||
|
|
||
| sendfile on; | ||
| tcp_nopush on; | ||
|
|
||
| server_tokens off; | ||
|
|
||
| keepalive_timeout 65; | ||
|
|
||
| gzip on; | ||
|
|
||
|
|
||
| include /etc/nginx/conf.d/*.conf; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{.Release.Name}}-leo | ||
| data: | ||
| {{- with .Values.studioLeo.envVars}} | ||
| {{- toYaml . | nindent 2 }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{ .Release.Name }}-nginx | ||
| data: | ||
| {{ ( tpl (.Files.Glob "nginx/*").AsConfig . ) | indent 2 }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| {{- if ((.Values.pgBouncer).enabled) -}} | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: {{.Release.Name}}-pgbouncer | ||
| labels: | ||
| {{- include "pgbouncer.labels" . | nindent 4 }} | ||
| spec: | ||
| {{- if not .Values.pgBouncer.autoscaling.enabled }} | ||
| replicas: {{ .Values.pgBouncer.replicaCount }} | ||
| {{- end }} | ||
| selector: | ||
| matchLabels: | ||
| {{- include "pgbouncer.selectorLabels" . | nindent 6 }} | ||
| template: | ||
| metadata: | ||
| annotations: | ||
| checksum/secret-pgbouncer: {{ include (print $.Template.BasePath "/secret-pgbouncer.yaml") . | sha256sum }} | ||
| {{- include "studio.checksum" . | indent 8 }} | ||
| {{- with .Values.pgBouncer.podAnnotations }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| labels: | ||
| {{- include "pgbouncer.selectorLabels" . | nindent 8 }} | ||
| spec: | ||
| {{- with .Values.imagePullSecrets }} | ||
| imagePullSecrets: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| serviceAccountName: {{ .Values.pgBouncer.serviceAccountName }} | ||
| securityContext: | ||
| {{- with .Values.pgBouncer.podSecurityContext }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| containers: | ||
| - name: pgbouncer | ||
| securityContext: | ||
| {{- toYaml .Values.pgBouncer.securityContext | nindent 12 }} | ||
| image: "{{ .Values.pgBouncer.image.repository }}:{{ .Values.pgBouncer.image.tag }}" | ||
| imagePullPolicy: {{ .Values.pgBouncer.image.pullPolicy }} | ||
| resources: | ||
| {{- toYaml .Values.pgBouncer.resources | nindent 12 }} | ||
| env: | ||
| - name: PGBOUNCER_PORT | ||
| value: "6432" | ||
| envFrom: | ||
| - secretRef: | ||
| name: pgbouncer | ||
| {{- if .Values.pgBouncer.envFromSecret }} | ||
| - secretRef: | ||
| name: {{ .Values.pgBouncer.envFromSecret }} | ||
| {{- end }} | ||
| ports: | ||
| - name: pgbouncer | ||
| containerPort: 6432 | ||
| protocol: TCP | ||
| {{- with .Values.pgBouncer.nodeSelector }} | ||
| nodeSelector: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.pgBouncer.affinity }} | ||
| affinity: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.pgBouncer.tolerations }} | ||
| tolerations: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- end }} |
Oops, something went wrong.