Skip to content

build: upgrade helm chart #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 31, 2024
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
2 changes: 1 addition & 1 deletion deploy/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ description: SpaceONE File Manager Helm chart for Kubernetes

type: application

version: 1.3.6
version: 1.3.7
appVersion: 1.x.y

29 changes: 29 additions & 0 deletions deploy/helm/config/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
user nginx;
worker_processes auto;
error_log /var/log/nginx/error.log warn;

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 /var/log/nginx/access.log main;

sendfile on;
tcp_nopush on;

keepalive_timeout 65;

server_tokens off;

include /etc/nginx/conf.d/*.conf;
}
14 changes: 14 additions & 0 deletions deploy/helm/config/proxy.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
server {
listen 80;

access_log /var/log/nginx/spaceone-access.log main;
error_log /var/log/nginx/spaceone-error.log warn;

location / {
proxy_pass http://localhost:8000/;

proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
2 changes: 1 addition & 1 deletion deploy/helm/templates/deployment-worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
resources:
{{- toYaml .Values.resources.worker | nindent 12 }}
{{- end }}
command: ['spaceone', 'run','scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}']
command: ['spaceone', 'run', 'scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}']
volumeMounts:
- name: default-conf
mountPath: /opt/spaceone/{{ .Values.name }}/config/config.yaml
Expand Down
8 changes: 5 additions & 3 deletions deploy/helm/templates/ingress-rest.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{{- if .Values.enabled }}
{{- if .Values.rest }}
{{- if .Values.ingress.rest.enabled }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Values.name }}-rest
namespace: {{ .Values.global.namespace | default .Release.Namespace }}
annotations:
{{- range $key, $value := .Values.ingress.annotations }}
{{- range $key, $value := .Values.ingress.rest.annotations }}
{{- if not (eq $key "nil") }}
{{ $key }}: {{ $value | quote }}
{{- end }}
Expand All @@ -16,13 +17,14 @@ spec:
rules:
- http:
paths:
- path: {{ .Values.ingress.path }}
- path: {{ .Values.ingress.rest.path }}
pathType: Prefix
backend:
service:
name: {{ .Values.name }}-rest
port:
number: {{ .Values.ingress.servicePort }}
number: {{ .Values.ingress.rest.servicePort }}
{{- end }}
{{- end }}
{{- end }}

12 changes: 10 additions & 2 deletions deploy/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,17 @@ application:
AWSS3Connector:
aws_access_key_id: my_key
aws_secret_access_key: my_secret_key
reigon_name: default_region
region_name: default_region
bucket_name: default_bucket

application_rest:
BACKEND: AWSS3Connector
CONNECTORS:
AWSS3Connector:
aws_access_key_id: my_key
aws_secret_access_key: my_secret_key
region_name: default_region
bucket_name: default_bucket
# BACKEND: ConsulConnector
# CONNECTORS:
# ConsulConnector:
Expand All @@ -69,7 +77,7 @@ application_scheduler: {}
# Overwrite worker config
application_worker: {}

application_rest: {}



##########################
Expand Down
Loading