From 356ec69e44eb9bb8a69984cf1e8453f2eec135d3 Mon Sep 17 00:00:00 2001 From: Ruben van der Linde Date: Thu, 19 Dec 2019 13:02:04 +0100 Subject: [PATCH] camelCase to snake_case --- INSTALLATION.md | 6 +++--- api/config/packages/api_platform.yaml | 2 +- api/helm/templates/php-deployment.yaml | 5 +++++ api/helm/values.yaml | 9 +++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/INSTALLATION.md b/INSTALLATION.md index 2579f429..919d7f17 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -113,9 +113,9 @@ $ helm install --name vrc-prod ./api/helm --kubeconfig="api/helm/kubeconfig.yaml Or update if you want to update an existing one ```CLI -$ helm upgrade pc-dev ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=dev --set settings.env=dev,settings.debug=1 -$ helm upgrade pc-stag ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=stag --set settings.env=stag,settings.debug=0 -$ helm upgrade pc-prod ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=prod --set settings.env=prod,settings.debug=0 +$ helm upgrade vrc-dev ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=dev --set settings.env=dev,settings.debug=1 +$ helm upgrade vrc-stag ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=stag --set settings.env=stag,settings.debug=0 +$ helm upgrade vrc-prod ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=prod --set settings.env=prod,settings.debug=0 ``` Or del if you want to delete an existing one diff --git a/api/config/packages/api_platform.yaml b/api/config/packages/api_platform.yaml index 11f8555f..6fd42010 100644 --- a/api/config/packages/api_platform.yaml +++ b/api/config/packages/api_platform.yaml @@ -46,7 +46,7 @@ api_platform: enable_re_doc: true # In the NL api strategie we use snake case for naming - # name_converter: 'Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter' + name_converter: 'Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter' # Lets confirm to JSON-HA: first, as per common ground. But allow other serializers formats: diff --git a/api/helm/templates/php-deployment.yaml b/api/helm/templates/php-deployment.yaml index 611e5d39..ac1a81c4 100644 --- a/api/helm/templates/php-deployment.yaml +++ b/api/helm/templates/php-deployment.yaml @@ -82,6 +82,11 @@ spec: configMapKeyRef: name: {{ template "fullname" . }} key: app-domain + - name: APP_SUBDOMAIN + valueFrom: + configMapKeyRef: + name: {{ template "fullname" . }} + key: app-domain # organization - name: ORGANIZATION_NAME valueFrom: diff --git a/api/helm/values.yaml b/api/helm/values.yaml index a7994e4c..7bdd72bf 100644 --- a/api/helm/values.yaml +++ b/api/helm/values.yaml @@ -10,15 +10,12 @@ settings: version: V.0.1 description: ''Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.'' repro: 'https://github.com/ConductionNL/Proto-component-commonground' - subdomain: pc + domain: conduction.nl domains: - conduction.nl - # - vng.cloud - # - zaakonline.nl - # - larping.eu - # - common-ground.dev - # - trouwplanner.online + - zaakonline.nl - huwelijksplanner.online + - common-ground.dev organisationName: Conduction email: info@conduction.nl country: Netherlands