Merge branch 'experimental' into development

NeuraLegion · Jan 22, 2024 · 758aa9a · 758aa9a
2 parents d596d55 + 549f1ef
commit 758aa9a
Show file tree

Hide file tree

Showing 15 changed files with 291 additions and 390 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - development
+      - experimental
 
 jobs:
   packages:

diff --git a/charts/brokencrystals/Chart.yaml b/charts/brokencrystals/Chart.yaml
@@ -4,7 +4,7 @@ description: |
   Benchmark application that uses modern technologies and implements a set of
   common security vulnerabilities
 type: application
-version: 0.0.22
+version: 0.0.38
 keywords:
   - brokencrystals
   - brkn
diff --git a/charts/brokencrystals/templates/_helpers.tpl b/charts/brokencrystals/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "brokencrystals.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 50 | trimSuffix "-" }}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -27,7 +27,7 @@ If release name contains chart name it will be used as a full name.
 Create chart name and version as used by the chart label.
 */}}
 {{- define "brokencrystals.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 50 | trimSuffix "-" }}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*

diff --git a/charts/brokencrystals/templates/bc-postgres-deployment.yaml b/charts/brokencrystals/templates/bc-postgres-deployment.yaml
diff --git a/charts/brokencrystals/templates/bc-prod-deployment.yaml b/charts/brokencrystals/templates/bc-prod-deployment.yaml
diff --git a/charts/brokencrystals/templates/bc-prod-proxy-deployment.yaml b/charts/brokencrystals/templates/bc-prod-proxy-deployment.yaml
diff --git a/charts/brokencrystals/templates/config-keycloak-postgres.yaml b/charts/brokencrystals/templates/config-keycloak-postgres.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "brokencrystals.fullname" . }}-keycloak-postgres
+  namespace: {{ .Release.Namespace }}
+data:
+  postgresql.conf.sample: |
+    listen_addresses = '*'
+    port = 5433
diff --git a/charts/brokencrystals/templates/config.yaml → ...encrystals/templates/config-postgres.yaml b/charts/brokencrystals/templates/config.yaml → ...encrystals/templates/config-postgres.yaml
diff --git a/...rystals/templates/nginx-proxy-config.yaml → ...rokencrystals/templates/config-proxy.yaml b/...rystals/templates/nginx-proxy-config.yaml → ...rokencrystals/templates/config-proxy.yaml
@@ -23,24 +23,24 @@ data:
         }
 
         location /api {
-            proxy_pass http://{{ include "brokencrystals.fullname" . }}-nodejs:3000;
+            proxy_pass http://127.0.0.1:3000;
         }
 
         location /swagger {
-            proxy_pass http://{{ include "brokencrystals.fullname" . }}-nodejs:3000;
+            proxy_pass http://127.0.0.1:3000;
         }
 
         location /graphiql {
-            proxy_pass http://{{ include "brokencrystals.fullname" . }}-nodejs:3000;
+            proxy_pass http://127.0.0.1:3000;
         }
 
         location /graphql {
-            proxy_pass http://{{ include "brokencrystals.fullname" . }}-nodejs:3000;
+            proxy_pass http://127.0.0.1:3000;
         }
 
         location /put.raw {
             rewrite put.raw /api/file/raw?path=./gil.txt break;
-            proxy_pass http://{{ include "brokencrystals.fullname" . }}-nodejs:3000;
+            proxy_pass http://127.0.0.1:3000;
         }
     
         location ~* ^/(config\.js|config\.json|\.htaccess|\.env|\.nginx\.conf|\.robots\.txt)$ {