diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f0cf1be --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,5 @@ + +include: + - project: 'developerdurp/yml' + ref: main + file: 'pipelines/helm.yml' diff --git a/charts/DurpAPI/templates/ingress/api.yaml b/charts/DurpAPI/templates/ingress/api.yaml deleted file mode 100644 index f1d077a..0000000 --- a/charts/DurpAPI/templates/ingress/api.yaml +++ /dev/null @@ -1,37 +0,0 @@ -{{ if .Values.ingress.enabled }} -apiVersion: traefik.containo.us/v1alpha1 -kind: IngressRoute -metadata: - name: "{{ .Chart.Name }}-ingress" -spec: - entryPoints: - - websecure - routes: - - match: Host("{{ .Values.ingress.host }}") && PathPrefix(`/`) - middlewares: - - name: authentik-proxy-provider - namespace: traefik - kind: Rule - services: - - name: "{{ .Chart.Name }}-service" - port: {{ .Values.service.port }} - tls: - secretName: {{ .Values.ingress.tls }} -{{ end }} - ---- - -{{ if .Values.ingress.enabled }} -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ .Values.ingress.tls }} -spec: - secretName: {{ .Values.ingress.tls }} - issuerRef: - name: {{ .Values.ingress.clusterissuer }} - kind: ClusterIssuer - commonName: {{ .Values.ingress.host }} - dnsNames: - - {{ .Values.ingress.host }} -{{ end }} \ No newline at end of file diff --git a/charts/DurpAPI/Chart.yaml b/charts/api/Chart.yaml similarity index 87% rename from charts/DurpAPI/Chart.yaml rename to charts/api/Chart.yaml index 125884d..7a272d3 100644 --- a/charts/DurpAPI/Chart.yaml +++ b/charts/api/Chart.yaml @@ -9,3 +9,4 @@ dependencies: - name: postgresql version: 12.5.* repository: https://charts.bitnami.com/bitnami + condition: postgresql.enabled diff --git a/charts/DurpAPI/templates/deployments/api.yaml b/charts/api/templates/deployments/api.yaml similarity index 95% rename from charts/DurpAPI/templates/deployments/api.yaml rename to charts/api/templates/deployments/api.yaml index c88d434..201ae38 100644 --- a/charts/DurpAPI/templates/deployments/api.yaml +++ b/charts/api/templates/deployments/api.yaml @@ -35,4 +35,4 @@ spec: value: {{ default .Chart.Version .Values.deployment.tag }} envFrom: - secretRef: - name: {{ .Values.deployment.secretfile }} \ No newline at end of file + name: {{ .Values.deployment.secretfile }} diff --git a/charts/DurpAPI/templates/hpa/api.yaml b/charts/api/templates/hpa/api.yaml similarity index 100% rename from charts/DurpAPI/templates/hpa/api.yaml rename to charts/api/templates/hpa/api.yaml diff --git a/charts/DurpAPI/templates/service/api.yaml b/charts/api/templates/service/api.yaml similarity index 100% rename from charts/DurpAPI/templates/service/api.yaml rename to charts/api/templates/service/api.yaml diff --git a/charts/DurpAPI/values.yaml b/charts/api/values.yaml similarity index 81% rename from charts/DurpAPI/values.yaml rename to charts/api/values.yaml index 1c787a4..da3a5db 100644 --- a/charts/DurpAPI/values.yaml +++ b/charts/api/values.yaml @@ -20,16 +20,13 @@ deployment: path: /api/health/getHealth port: 8080 -ingress: - enabled: false - clusterissuer: letsencrypt-production - host: durpapi.durp.info - tls: durpapi-tls - service: type: ClusterIP port: 80 targetport: 8080 swagger: - host: api.durp.info/durpapi \ No newline at end of file + host: api.durp.info + +postgresql: + enabled: false