Skip to content
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.

Sign up for GitHub

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

app internal update #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

app internal update #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions api/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed api/helm/charts/redis-12.7.7.tgz
View file
Open in desktop
Binary file not shown.
68 changes: 4 additions & 64 deletions api/helm/index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ entries:
category: Database
apiVersion: v2
appVersion: 11.10.0
created: "2021-04-12T13:29:06.9550107Z"
created: "2021-06-07T09:47:58.2668684Z"
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
Expand Down Expand Up @@ -34,47 +34,13 @@ entries:
urls:
- charts/postgresql-10.1.1.tgz
version: 10.1.1
redis:
- annotations:
category: Database
apiVersion: v2
appVersion: 6.0.11
created: "2021-04-12T13:29:06.9826521Z"
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
tags:
- bitnami-common
version: 1.x.x
description: Open source, advanced key-value store. It is often referred to as
a data structure server since keys can contain strings, hashes, lists, sets
and sorted sets.
digest: 2d70861d16fc410ed6d6c818b97f7b0d519031147e5c7b42c5691d4c38742c44
home: https://github.com/bitnami/charts/tree/master/bitnami/redis
icon: https://bitnami.com/assets/stacks/redis/img/redis-stack-220x234.png
keywords:
- redis
- keyvalue
- database
maintainers:
- email: [email protected]
name: Bitnami
- email: [email protected]
name: desaintmartin
name: redis
sources:
- https://github.com/bitnami/bitnami-docker-redis
- http://redis.io/
urls:
- charts/redis-12.7.7.tgz
version: 12.7.7
waardepapieren-balie:
- apiVersion: v1
appVersion: V1.0
created: "2021-04-12T13:29:06.8506671Z"
created: "2021-06-07T09:47:58.2465021Z"
description: Naast deze JSON rest API is er ook een [graphql](/graphql) interface
beschikbaar.
digest: ab1b7e1ed691c41e25ed54a6f93e1a14fc95acf0223c4b2c8e08691308562728
digest: 74382e7dee2ba6f4c050d78d407aea4f4fbdad4c52e759abcad08298494fc6ac
home: https://www.conduction.nl
icon: https://conductionnl.github.io/images/conduction_avatar_blue_on_transparant.svg
keywords:
Expand All @@ -94,30 +60,4 @@ entries:
urls:
- waardepapieren-balie-0.1.0.tgz
version: 0.1.0
waardepapieren-ballie:
- apiVersion: v1
appVersion: V1.0
created: "2021-04-12T13:29:06.926262Z"
description: Naast deze JSON rest API is er ook een [graphql](/graphql) interface
beschikbaar.
digest: 73299431a2774e84ddc4fcf927fb11c1f27bf25755194659e5236ba06a14e06b
home: https://www.conduction.nl
icon: https://conductionnl.github.io/images/conduction_avatar_blue_on_transparant.svg
keywords:
- commonground
- haven
- nlx
- component
maintainers:
- email: [email protected]
name: Ruben van der Linde
- email: [email protected]
name: Conduction
name: waardepapieren-ballie
sources:
- https://commonground.conduction.nl/
- https://www.commonground.nl/
urls:
- waardepapieren-ballie-0.1.0.tgz
version: 0.1.0
generated: "2021-04-12T13:29:06.8249981Z"
generated: "2021-06-07T09:47:58.2352539Z"
17 changes: 9 additions & 8 deletions api/helm/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@ data:
app-auth: {{ .Values.settings.authorisationEnabled | quote }}
app-audittrail: {{ .Values.settings.audittrailEnabled | quote }}
app-notification: {{ .Values.settings.notificationEnabled | quote }}


{{ if (eq $.Values.settings.type "application" ) }}
redis-host: {{ printf "%s-redis-headless" $redisServiceName | quote }}
redis-port: {{ .Values.redis.redisPort | toString | quote }}
digispoof-location: {{ .Values.commonground.digispoof.location }}
eherkenning-location: {{ .Values.commonground.eherkenning.location }}
{{ end }}

cache: {{ .Values.settings.cache | quote }}
env: {{ .Values.settings.env | quote }}
debug: {{ .Values.settings.debug | quote }}
trusted-proxies: {{ join "," .Values.settings.trustedProxies }}
trusted-hosts: {{ .Values.settings.trustedHosts | quote }}
php-service: {{ .Values.settings.name }}-{{ .Values.settings.env }}-php
php-service: {{ .Values.settings.name }}-{{ .Values.settings.env }}-php

{{- if (eq $.Values.settings.type "application" ) }}
redis-host: {{ printf "%s-redis" $redisServiceName | quote }}
redis-port: {{ .Values.redis.redisPort | toString | quote }}
digispoof-location: { { .Values.commonground.digispoof.location } }
eherkenning-location: { { .Values.commonground.eherkenning.location } }
{{-end }}
44 changes: 22 additions & 22 deletions api/helm/templates/php-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,7 @@ spec:
secretKeyRef:
name: {{ template "fullname" . }}
key: app_application_key
- name: APP_URL
{{- if and (eq $.Values.settings.env "prod") (eq $.Values.settings.type "component") }}
value: https://{{ $.Values.settings.domain }}/api/{{ $.Values.settings.majorVersion }}/{{ $.Values.settings.subpath }}
{{- else if and (eq $.Values.settings.env "prod") $.Values.settings.subpath }}
value: https://{{ $.Values.settings.domain }}/{{ $.Values.settings.subpath }}
{{- else if eq $.Values.settings.env "prod" }}
value: https://{{ $.Values.settings.domain }}
{{- else if eq $.Values.settings.type "component" }}
value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}/api/{{ $.Values.settings.majorVersion }}/{{ $.Values.settings.subpath }}
{{- else if $.Values.settings.subpath }}
value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}/{{ $.Values.settings.subpath }}
{{- else }}
value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}
{{- end }}
{{- if (eq $.Values.settings.type "application" ) }}
{{- if (eq $.Values.settings.type "application" ) }}
- name: REDIS_HOST
valueFrom:
configMapKeyRef:
Expand All @@ -177,15 +163,29 @@ spec:
key: redis-port
- name: APP_DIGISPOOF_LOCATION
valueFrom:
configMapKeyRef:
name: {{ template "fullname" . }}
key: digispoof-location
configMapKeyRef:
name: {{ template "fullname" . }}
key: digispoof-location
- name: APP_EHERKENNING_LOCATION
valueFrom:
configMapKeyRef:
name: {{ template "fullname" . }}
key: eherkenning-location
{{-end }}
configMapKeyRef:
name: {{ template "fullname" . }}
key: eherkenning-location
{{- end }}
- name: APP_URL
{{- if and (eq $.Values.settings.env "prod") (eq $.Values.settings.type "component") }}
value: https://{{ $.Values.settings.domain }}/api/{{ $.Values.settings.majorVersion }}/{{ $.Values.settings.subpath }}
{{- else if and (eq $.Values.settings.env "prod") $.Values.settings.subpath }}
value: https://{{ $.Values.settings.domain }}/{{ $.Values.settings.subpath }}
{{- else if eq $.Values.settings.env "prod" }}
value: https://{{ $.Values.settings.domain }}
{{- else if eq $.Values.settings.type "component" }}
value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}/api/{{ $.Values.settings.majorVersion }}/{{ $.Values.settings.subpath }}
{{- else if $.Values.settings.subpath }}
value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}/{{ $.Values.settings.subpath }}
{{- else }}
value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}
{{- end }}
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- if .Values.nodeSelector }}
Expand Down
3 changes: 2 additions & 1 deletion api/helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ settings:
cache: false
type: application
id:
internal: false
replicaCount: 1
corsAllowOrigin: ['*']
trustedHosts: '^.+$'
Expand Down Expand Up @@ -89,7 +90,7 @@ postgresql:
# Persistent Volume Storage configuration.
# ref: https://kubernetes.io/docs/user-guide/persistent-volumes
persistence:
enabled: false
enabled: true
pullPolicy: IfNotPresent
# image:
# repository: postgres
Expand Down
Binary file modified api/helm/waardepapieren-balie-0.1.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file removed api/helm/waardepapieren-ballie-0.1.0.tgz
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions api/public/schema/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2439,12 +2439,12 @@ definitions:
description: 'The moment this request was created'
type: string
format: date-time
example: '2021-04-12 13:31:28'
example: '2021-06-07 09:47:30'
dateModified:
description: 'The moment this request last Modified'
type: string
format: date-time
example: '2021-04-12 13:31:28'
example: '2021-06-07 09:47:30'
required: []
AuditTrail-write:
properties:
Expand Down Expand Up @@ -2492,12 +2492,12 @@ definitions:
description: 'The moment this request was created'
type: string
format: date-time
example: '2021-04-12 13:31:28'
example: '2021-06-07 09:47:30'
dateModified:
description: 'The moment this request last Modified'
type: string
format: date-time
example: '2021-04-12 13:31:28'
example: '2021-06-07 09:47:30'
required: []
ChangeLog-write:
properties:
Expand Down