Update Services name

NeuraLegion · Dec 15, 2023 · f0d6b30 · f0d6b30
1 parent 81a38b9
commit f0d6b30
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - service_naming_issue
 
 jobs:
   packages:

diff --git a/charts/brokencrystals/templates/_helpers.tpl b/charts/brokencrystals/templates/_helpers.tpl
@@ -12,13 +12,13 @@ If release name contains chart name it will be used as a full name.
 */}}
 {{- define "brokencrystals.fullname" -}}
 {{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- .Values.fullnameOverride | trunc 40 | trimSuffix "-" }}
 {{- else }}
 {{- $name := default .Chart.Name .Values.nameOverride }}
 {{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- .Release.Name | trunc 40 | trimSuffix "-" }}
 {{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- printf "%s-%s" .Release.Name $name | trunc 40 | trimSuffix "-" }}
 {{- end }}
 {{- end }}
 {{- end }}

diff --git a/charts/brokencrystals/templates/bc-postgres-deployment.yaml b/charts/brokencrystals/templates/bc-postgres-deployment.yaml
@@ -49,7 +49,7 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "brokencrystals.fullname" . }}-postgres-prod-service
+  name: {{ include "brokencrystals.fullname" . }}-postgres-prod
   namespace: {{ .Release.Namespace }}
 spec:
   selector:

diff --git a/charts/brokencrystals/templates/bc-prod-deployment.yaml b/charts/brokencrystals/templates/bc-prod-deployment.yaml
@@ -25,7 +25,7 @@ spec:
               value: "https://{{ .Values.ingress.url }}"
      #         value: "https://brokencrystals.com"
             - name: DATABASE_HOST
-              value: "{{ include "brokencrystals.fullname" . }}-postgres-prod-service"
+              value: "{{ include "brokencrystals.fullname" . }}-postgres-prod"
             - name: DATABASE_SCHEMA
               value: "bc"
             - name: DATABASE_USER

diff --git a/charts/brokencrystals/templates/bc-prod-proxy-deployment.yaml b/charts/brokencrystals/templates/bc-prod-proxy-deployment.yaml
@@ -22,7 +22,7 @@ spec:
             - name: URL
               value: "https://{{ .Values.ingress.url }}"
             - name: DATABASE_HOST
-              value: "{{ include "brokencrystals.fullname" . }}-postgres-prod-service"
+              value: "{{ include "brokencrystals.fullname" . }}-postgres-prod"
             - name: DATABASE_SCHEMA
               value: "bc"
             - name: DATABASE_USER
@@ -78,7 +78,7 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "brokencrystals.fullname" . }}-nodejs-proxy-prod-service
+  name: {{ include "brokencrystals.fullname" . }}-nodejs-proxy-prod
   namespace: {{ .Release.Namespace }}
 spec:
   selector:

diff --git a/charts/brokencrystals/templates/ingress.yaml b/charts/brokencrystals/templates/ingress.yaml
@@ -24,7 +24,7 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: {{ include "brokencrystals.fullname" . }}-nodejs-proxy-prod-service
+                name: {{ include "brokencrystals.fullname" . }}-nodejs-proxy-prod
                 port:
                   number: 80
 
@@ -54,6 +54,6 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: {{ include "brokencrystals.fullname" . }}-keycloak-prod-service
+                name: {{ include "brokencrystals.fullname" . }}-keycloak-prod
                 port:
                   number: 8080
diff --git a/charts/brokencrystals/templates/keycloak-deployment.yaml b/charts/brokencrystals/templates/keycloak-deployment.yaml
@@ -34,7 +34,7 @@ spec:
             - name: DB_VENDOR
               value: "POSTGRES"
             - name: DB_ADDR
-              value: "{{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod-service"
+              value: "{{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod"
             - name: DB_DATABASE
               value: "keycloak"
             - name: DB_SCHEMA
@@ -66,7 +66,7 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "brokencrystals.fullname" . }}-keycloak-prod-service
+  name: {{ include "brokencrystals.fullname" . }}-keycloak-prod
   namespace: {{ .Release.Namespace }}
 spec:
   selector:

diff --git a/charts/brokencrystals/templates/keycloak-postgres-deployment.yaml b/charts/brokencrystals/templates/keycloak-postgres-deployment.yaml
@@ -40,7 +40,7 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod-service
+  name: {{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod
   namespace: {{ .Release.Namespace }}
 spec:
   selector:
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       push:
         branches:
           - master
+          - service_naming_issue
     jobs:
       packages:
@@ Expand Down @@