Skip to content

Commit 9be7c7c

Browse files
committed
build: upgrade helm chart
1 parent a897d25 commit 9be7c7c

File tree

6 files changed

+60
-7
lines changed

6 files changed

+60
-7
lines changed

deploy/helm/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ description: SpaceONE File Manager Helm chart for Kubernetes
44

55
type: application
66

7-
version: 1.3.6
7+
version: 1.3.7
88
appVersion: 1.x.y
99

deploy/helm/config/nginx.conf

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
user nginx;
2+
worker_processes auto;
3+
error_log /var/log/nginx/error.log warn;
4+
5+
pid /var/run/nginx.pid;
6+
7+
events {
8+
worker_connections 1024;
9+
}
10+
11+
http {
12+
include /etc/nginx/mime.types;
13+
default_type application/octet-stream;
14+
15+
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
16+
'$status $body_bytes_sent "$http_referer" '
17+
'"$http_user_agent" "$http_x_forwarded_for"';
18+
19+
access_log /var/log/nginx/access.log main;
20+
21+
sendfile on;
22+
tcp_nopush on;
23+
24+
keepalive_timeout 65;
25+
26+
server_tokens off;
27+
28+
include /etc/nginx/conf.d/*.conf;
29+
}

deploy/helm/config/proxy.conf

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
server {
2+
listen 80;
3+
4+
access_log /var/log/nginx/spaceone-access.log main;
5+
error_log /var/log/nginx/spaceone-error.log warn;
6+
7+
location / {
8+
proxy_pass http://localhost:8000/;
9+
10+
proxy_set_header Host $host;
11+
proxy_set_header X-Real-IP $remote_addr;
12+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
13+
}
14+
}

deploy/helm/templates/deployment-worker.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
resources:
4444
{{- toYaml .Values.resources.worker | nindent 12 }}
4545
{{- end }}
46-
command: ['spaceone', 'run','scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}']
46+
command: ['spaceone', 'run', 'scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}']
4747
volumeMounts:
4848
- name: default-conf
4949
mountPath: /opt/spaceone/{{ .Values.name }}/config/config.yaml
+5-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{{- if .Values.enabled }}
22
{{- if .Values.rest }}
3+
{{- if .Values.ingress.rest.enabled }}
34
apiVersion: networking.k8s.io/v1
45
kind: Ingress
56
metadata:
67
name: {{ .Values.name }}-rest
78
namespace: {{ .Values.global.namespace | default .Release.Namespace }}
89
annotations:
9-
{{- range $key, $value := .Values.ingress.annotations }}
10+
{{- range $key, $value := .Values.ingress.rest.annotations }}
1011
{{- if not (eq $key "nil") }}
1112
{{ $key }}: {{ $value | quote }}
1213
{{- end }}
@@ -16,13 +17,14 @@ spec:
1617
rules:
1718
- http:
1819
paths:
19-
- path: {{ .Values.ingress.path }}
20+
- path: {{ .Values.ingress.rest.path }}
2021
pathType: Prefix
2122
backend:
2223
service:
2324
name: {{ .Values.name }}-rest
2425
port:
25-
number: {{ .Values.ingress.servicePort }}
26+
number: {{ .Values.ingress.rest.servicePort }}
27+
{{- end }}
2628
{{- end }}
2729
{{- end }}
2830

deploy/helm/values.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,17 @@ application:
5555
AWSS3Connector:
5656
aws_access_key_id: my_key
5757
aws_secret_access_key: my_secret_key
58-
reigon_name: default_region
58+
region_name: default_region
5959
bucket_name: default_bucket
6060

61+
application_rest:
62+
BACKEND: AWSS3Connector
63+
CONNECTORS:
64+
AWSS3Connector:
65+
aws_access_key_id: my_key
66+
aws_secret_access_key: my_secret_key
67+
region_name: default_region
68+
bucket_name: default_bucket
6169
# BACKEND: ConsulConnector
6270
# CONNECTORS:
6371
# ConsulConnector:
@@ -69,7 +77,7 @@ application_scheduler: {}
6977
# Overwrite worker config
7078
application_worker: {}
7179

72-
application_rest: {}
80+
7381

7482

7583
##########################

0 commit comments

Comments
 (0)