diff --git a/templates/api-config.yml b/templates/api-config.yml new file mode 100644 index 0000000000000000000000000000000000000000..73808c7f3459d3e9982def9d5200a2b6ff756222 --- /dev/null +++ b/templates/api-config.yml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{include "name" .}}-api-config +data: + endpoint: {{include "name" .}}-pg-service:5432 diff --git a/templates/api-deployment.yml b/templates/api-deployment.yml new file mode 100644 index 0000000000000000000000000000000000000000..b93bded91673ffd26fc5c2ad9a3f2db706d3aa13 --- /dev/null +++ b/templates/api-deployment.yml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: {{include "name" .}}-api-deployment + name: {{include "name" .}}-api-deployment +spec: + replicas: 3 + selector: + matchLabels: + app: {{include "name" .}}-api-deployment + strategy: {} + template: + metadata: + labels: + app: {{include "name" .}}-api-deployment + spec: + containers: + - image: registry.gitlab.com/takima-school/images/cdb/api:latest + name: simple-app + resources: + limits: + memory: "720Mi" + cpu: "390m" + ports: + - containerPort: 8080 + env: + - name: POSTGRES_DB + valueFrom: + configMapKeyRef: + name: pg-config + key: name + - name: POSTGRES_USER + valueFrom: + secretKeyRef: + name: db-secret + key: user + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: db-secret + key: password + - name: DB_ENDPOINT + valueFrom: + configMapKeyRef: + name: api-config + key: endpoint + imagePullSecrets: + - name: takima-school-registry +status: {} diff --git a/templates/api-ingress.yml b/templates/api-ingress.yml new file mode 100644 index 0000000000000000000000000000000000000000..bee221772225a68999270f2828edab7af99405cc --- /dev/null +++ b/templates/api-ingress.yml @@ -0,0 +1,18 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + kubernetes.io/ingress.class: nginx + name: {{include "name" .}}-api-ingress +spec: + rules: + - host: api.asejourne.takima.school + http: + paths: + - backend: + service: + name: {{include "name" .}}-api-service + port: + number: 80 + path: / + pathType: Prefix diff --git a/templates/api-service.yml b/templates/api-service.yml new file mode 100644 index 0000000000000000000000000000000000000000..c1bb7682545ce5ba0c830de3be3ad78a3bc3cebe --- /dev/null +++ b/templates/api-service.yml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{include "name" .}}-api-service +spec: + selector: + app: {{include "name" .}}-api-deployment + ports: + - protocol: TCP + port: 80 + targetPort: 8080 diff --git a/templates/front-config.yml b/templates/front-config.yml index da89df77a97e1c3bee1c975c1c7dbb9db99547b5..a4f99068598b1d1ed846c4ce8a6ce0ee6d3d72ab 100644 --- a/templates/front-config.yml +++ b/templates/front-config.yml @@ -1,14 +1,14 @@ -{{- if .Values.front.enabled }} - {{- $apiUrl := "" }} - {{- if .Values.api.ingress.tlsEnabled }} - {{- $apiUrl = printf "https://%s" .Values.api.ingress.host | quote }} - {{- else }} - {{- $apiUrl = printf "http://%s" .Values.api.ingress.host | quote }} - {{- end }} +{{- if .Values.front.enabled -}} + {{- $apiUrl := "" -}} + {{- if .Values.api.ingress.tlsEnabled -}} + {{- $apiUrl = printf "https://%s" .Values.api.ingress.host | quote -}} + {{- else -}} + {{- $apiUrl = printf "http://%s" .Values.api.ingress.host | quote -}} + {{- end -}} apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Values.name }}-front + name: {{ include "name" . }}-front data: API_URL: {{ $apiUrl }} -{{- end }} \ No newline at end of file +{{- end -}} \ No newline at end of file diff --git a/templates/front-deployment.yml b/templates/front-deployment.yml index fa7c697c84c6b69bc07da8282ea9a3952024706f..67748186ac3f2b9e1465f4a7dad705ca45aa059e 100644 --- a/templates/front-deployment.yml +++ b/templates/front-deployment.yml @@ -1,8 +1,8 @@ -{{- if .Values.front.enabled }} +{{- if .Values.front.enabled -}} apiVersion: apps/v1 kind: Deployment metadata: - name: {{ .Values.name }}-front + name: {{ include "name" . }}-front labels: app: front spec: @@ -63,6 +63,6 @@ spec: - name: API_URL valueFrom: configMapKeyRef: - name: {{ .Values.name }}-front + name: {{ include "name" . }}-front key: API_URL -{{- end }} \ No newline at end of file +{{- end -}} \ No newline at end of file diff --git a/templates/front-ingress.yml b/templates/front-ingress.yml index 8513bb5bc872270f3785ecc4f51469e7b2b881cc..c081063aee64e7dff8e10f5041e4db01df149d87 100644 --- a/templates/front-ingress.yml +++ b/templates/front-ingress.yml @@ -1,10 +1,10 @@ -{{- if .Values.front.enabled }} +{{- if .Values.front.enabled -}} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: annotations: kubernetes.io/ingress.class: nginx - name: {{ .Values.name }}-front + name: {{ include "name" . }}-front spec: rules: - host: {{ .Values.front.ingress.host }} @@ -12,15 +12,15 @@ spec: paths: - backend: service: - name: {{ .Values.name }}-front + name: {{ include "name" . }}-front port: number: 80 path: / pathType: Prefix - {{- if .Values.front.ingress.tlsEnabled }} + {{- if .Values.front.ingress.tlsEnabled -}} tls: - hosts: - {{ .Values.front.ingress.host }} secretName: app-wildcard - {{- end }} -{{- end }} \ No newline at end of file + {{- end -}} +{{- end -}} \ No newline at end of file diff --git a/templates/front-service.yml b/templates/front-service.yml index 8031d1a9e190946393c8359877c954bfb10ec2d5..50a46db91e2ca84e83468fd461b3ab6cd2630c03 100644 --- a/templates/front-service.yml +++ b/templates/front-service.yml @@ -1,8 +1,8 @@ -{{- if .Values.front.enabled }} +{{- if .Values.front.enabled -}} apiVersion: v1 kind: Service metadata: - name: {{ .Values.name }}-front + name: {{ include "name" . }}-front spec: selector: app: front @@ -10,4 +10,4 @@ spec: - protocol: TCP port: 80 targetPort: 8080 -{{- end }} \ No newline at end of file +{{- end -}} \ No newline at end of file diff --git a/templates/helper.tpl b/templates/helper.tpl new file mode 100644 index 0000000000000000000000000000000000000000..3665e79a8c06ec932d20e38d3d10d5849a330a6f --- /dev/null +++ b/templates/helper.tpl @@ -0,0 +1,4 @@ +{{- define "name" -}} +{{- $name := default .Chart.Name .Values.name -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} \ No newline at end of file diff --git a/templates/pg-config.yml b/templates/pg-config.yml new file mode 100644 index 0000000000000000000000000000000000000000..d7592472ab69e0272638b4828f6ae5390d7830c7 --- /dev/null +++ b/templates/pg-config.yml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: pg-config +data: + name: "db" + db_path: "/var/lib/postgresql/data/pgdata" diff --git a/templates/pg-credentials.yml b/templates/pg-credentials.yml new file mode 100644 index 0000000000000000000000000000000000000000..642c1b0b72079ebdcaf33743f16362cc98c77d24 --- /dev/null +++ b/templates/pg-credentials.yml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Secret +metadata: + name: db-secret +type: Opaque +data: + user: ZGItdXNlcg== + password: ZGItcGFzc3dvcmQ= \ No newline at end of file diff --git a/templates/pg-service.yml b/templates/pg-service.yml new file mode 100644 index 0000000000000000000000000000000000000000..ec145da32e823f131a367f2e6e137f09f35a6ff2 --- /dev/null +++ b/templates/pg-service.yml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{include "name" .}}-pg-service +spec: + selector: + app: {{include "name" .}}-pg-deployment + ports: + - protocol: TCP + port: 5432 + targetPort: 5432 diff --git a/templates/pg-statefulSet.yml b/templates/pg-statefulSet.yml new file mode 100644 index 0000000000000000000000000000000000000000..e332e7b1844b364a7ee7949b2065e806c539ff0b --- /dev/null +++ b/templates/pg-statefulSet.yml @@ -0,0 +1,60 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + labels: + app: {{include "name" .}}-pg-deployment + name: {{include "name" .}}-pg-deployment +spec: + replicas: 1 + selector: + matchLabels: + app: {{include "name" .}}-pg-deployment + serviceName: {{include "name" .}}-pg-service + template: + metadata: + labels: + app: {{include "name" .}}-pg-deployment + spec: + containers: + - image: registry.takima.io/school/proxy/postgres:latest + volumeMounts: + - mountPath: /var/lib/postgresql/data + name: {{include "name" .}}-pg-data + name: {{include "name" .}}-pg + resources: + limits: + memory: "512Mi" + cpu: "390m" + ports: + - containerPort: 5432 + env: + - name: POSTGRES_DB + valueFrom: + configMapKeyRef: + name: pg-config + key: name + - name: POSTGRES_USER + valueFrom: + secretKeyRef: + name: db-secret + key: user + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: db-secret + key: password + - name: PGDATA + valueFrom: + configMapKeyRef: + name: pg-config + key: db_path + imagePullSecrets: + - name: takima-school-registry + volumeClaimTemplates: + - metadata: + name: {{include "name" .}}-pg-data + spec: + accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 1Gi