fix: standardize component naming to hyphenated format

.github/workflows/merge.yml

@@ -59,9 +59,9 @@ jobs:
         name: [quarkus, fastapi]
         include:
           - name: quarkus
-            baseUrl: https://quickstart-openshift-backends-test-backendjava.apps.silver.devops.gov.bc.ca
+            baseUrl: https://quickstart-openshift-backends-test-backend-java.apps.silver.devops.gov.bc.ca
           - name: fastapi
-            baseUrl: https://quickstart-openshift-backends-test-backendpy.apps.silver.devops.gov.bc.ca
+            baseUrl: https://quickstart-openshift-backends-test-backend-py.apps.silver.devops.gov.bc.ca
     steps:
       - uses: actions/checkout@v6
         name: Checkout
@@ -100,12 +100,12 @@ jobs:
       environment: prod
       db_user: appproxy
       params: --set global.autoscaling=true
-        --set backendPy.pdb.enabled=true
-        --set backendGo.pdb.enabled=true
-        --set backendJava.pdb.enabled=true
-        --set backendGo.deploymentStrategy=RollingUpdate
-        --set backendPy.deploymentStrategy=RollingUpdate
-        --set backendJava.deploymentStrategy=RollingUpdate
+        --set backend-py.pdb.enabled=true
+        --set backend-go.pdb.enabled=true
+        --set backend-java.pdb.enabled=true
+        --set backend-go.deploymentStrategy=RollingUpdate
+        --set backend-py.deploymentStrategy=RollingUpdate
+        --set backend-java.deploymentStrategy=RollingUpdate
       tag: ${{ inputs.tag }}
 
   promote:

.github/workflows/pentests.yml

@@ -19,7 +19,7 @@ jobs:
       PREFIX: ${{ github.event.repository.name }}-test
     strategy:
       matrix:
-        name: [backendGo, backendJava, backendPy]
+        name: [backend-go, backend-java, backend-py]
     steps:
       - name: ZAP Scan
         uses: zaproxy/action-full-scan@3c58388149901b9a03b7718852c5ba889646c27c # v0.13.0

.github/workflows/pr-validate.yml

@@ -17,8 +17,8 @@ jobs:
     uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-validate.yml@d9b3d32fb3f03c4699c2dce83ddfff042cd31a1f # v1.0.0
     with:
       markdown_links: |
-        - [Java](https://${{ github.event.repository.name }}-${{ github.event.number }}-backendJava.apps.silver.devops.gov.bc.ca)
-        - [Py](https://${{ github.event.repository.name }}-${{ github.event.number }}-backendPy.apps.silver.devops.gov.bc.ca)
+        - [Java](https://${{ github.event.repository.name }}-${{ github.event.number }}-backend-java.apps.silver.devops.gov.bc.ca)
+        - [Py](https://${{ github.event.repository.name }}-${{ github.event.number }}-backend-py.apps.silver.devops.gov.bc.ca)
 
   results:
     name: Validate Results

charts/app/templates/backendJava-knp.yaml → charts/app/templates/backend-java-knp.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   podSelector:
     matchLabels:
-      app.kubernetes.io/name: backendjava
+      app.kubernetes.io/name: backend-java
       app.kubernetes.io/instance: {{ .Release.Name }}
   ingress:
     - from:
@@ -33,7 +33,7 @@ spec:
       from:
         - podSelector:
             matchLabels:
-              app.kubernetes.io/name: backendjava
+              app.kubernetes.io/name: backend-java
               app.kubernetes.io/instance: {{ .Release.Name }}
   policyTypes:
     - Ingress

charts/app/templates/backendJava/templates/_helpers.tpl → charts/app/templates/backend-java/templates/_helpers.tpl

@@ -1,19 +1,19 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "backendJava.name" -}}
-{{- printf "backendjava" }}
+{{- define "backend-java.name" -}}
+{{- printf "backend-java" }}
 {{- end }}
 
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "backendJava.fullname" -}}
-{{- $componentName := include "backendJava.name" .  }}
-{{- if .Values.backendJava.fullnameOverride }}
-{{- .Values.backendJava.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- define "backend-java.fullname" -}}
+{{- $componentName := include "backend-java.name" .  }}
+{{- if index .Values "backend-java" "fullnameOverride" }}
+{{- index .Values "backend-java" "fullnameOverride" | trunc 63 | trimSuffix "-" }}
 {{- else }}
 {{- printf "%s-%s" .Release.Name $componentName | trunc 63 | trimSuffix "-" }}
 {{- end }}
@@ -22,20 +22,20 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Common labels
 */}}
-{{- define "backendJava.labels" -}}
-{{ include "backendJava.selectorLabels" . }}
+{{- define "backend-java.labels" -}}
+{{ include "backend-java.selectorLabels" . }}
 {{- if .Values.global.tag }}
 app.kubernetes.io/image-version: {{ .Values.global.tag | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-app.kubernetes.io/short-name: {{ include "backendJava.name" . }}
+app.kubernetes.io/short-name: {{ include "backend-java.name" . }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "backendJava.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "backendJava.name" . }}
+{{- define "backend-java.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "backend-java.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 

charts/app/templates/backendJava/templates/deployment.yaml → charts/app/templates/backend-java/templates/deployment.yaml

@@ -1,38 +1,38 @@
-{{- if .Values.backendJava.enabled }}
+{{- if (index .Values "backend-java").enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "backendJava.fullname" . }}
+  name: {{ include "backend-java.fullname" . }}
   labels:
-    {{- include "backendJava.labels" . | nindent 4 }}
+    {{- include "backend-java.labels" . | nindent 4 }}
 spec:
   strategy:
-    type: {{ .Values.backendJava.deploymentStrategy }}
-  {{- if not .Values.backendJava.autoscaling.enabled }}
-  replicas: {{ .Values.backendJava.replicaCount }}
+    type: {{ (index .Values "backend-java").deploymentStrategy }}
+  {{- if not (index .Values "backend-java").autoscaling.enabled }}
+  replicas: {{ (index .Values "backend-java").replicaCount }}
   {{- end }}
   selector:
     matchLabels:
-      {{- include "backendJava.selectorLabels" . | nindent 6 }}
+      {{- include "backend-java.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       annotations:
         rollme: {{ randAlphaNum 5 | quote }}
       labels:
-        {{- include "backendJava.labels" . | nindent 8 }}
+        {{- include "backend-java.labels" . | nindent 8 }}
     spec:
-      {{- if .Values.backendJava.podSecurityContext }}
+      {{- if (index .Values "backend-java").podSecurityContext }}
       securityContext:
-        {{- toYaml .Values.backendJava.podSecurityContext | nindent 12 }}
+        {{- toYaml (index .Values "backend-java").podSecurityContext | nindent 12 }}
       {{- end }}
       containers:
-        - name: {{ include "backendJava.fullname" . }}
-          {{- if .Values.backendJava.securityContext }}
+        - name: {{ include "backend-java.fullname" . }}
+          {{- if (index .Values "backend-java").securityContext }}
           securityContext:
-            {{- toYaml .Values.backendJava.securityContext | nindent 12 }}
+            {{- toYaml (index .Values "backend-java").securityContext | nindent 12 }}
           {{- end }}
           image: "{{.Values.global.registry}}/{{.Values.global.repository}}/backend-java:{{ .Values.global.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ default "Always" .Values.backendJava.imagePullPolicy }}
+          imagePullPolicy: {{ default "Always" (index .Values "backend-java").imagePullPolicy }}
           envFrom:
             - secretRef:
                 name: {{.Release.Name}}-java
@@ -43,7 +43,7 @@ spec:
               value: info
           ports:
             - name: http
-              containerPort: {{ .Values.backendJava.service.targetPort }}
+              containerPort: {{ (index .Values "backend-java").service.targetPort }}
               protocol: TCP
           startupProbe:
             httpGet:
@@ -79,11 +79,11 @@ spec:
             requests:
               cpu: 20m
               memory: 150Mi
-      {{- with .Values.backendJava.nodeSelector }}
+      {{- with (index .Values "backend-java").nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.backendJava.tolerations }}
+      {{- with (index .Values "backend-java").tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -95,7 +95,7 @@ spec:
                   - key: app.kubernetes.io/name
                     operator: In
                     values:
-                      - {{ include "backendJava.fullname" . }}
+                      - {{ include "backend-java.fullname" . }}
                   - key: app.kubernetes.io/instance
                     operator: In
                     values:

charts/app/templates/backendJava/templates/hpa.yaml → charts/app/templates/backend-java/templates/hpa.yaml

@@ -1,18 +1,18 @@
 {{- if .Values.global.autoscaling }}
-{{- if and .Values.backendJava.autoscaling .Values.backendJava.autoscaling.enabled }}
+{{- if and (index .Values "backend-java").autoscaling (index .Values "backend-java").autoscaling.enabled }}
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "backendJava.fullname" . }}
+  name: {{ include "backend-java.fullname" . }}
   labels:
-    {{- include "backendJava.labels" . | nindent 4 }}
+    {{- include "backend-java.labels" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ include "backendJava.fullname" . }}
-  minReplicas: {{ .Values.backendJava.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.backendJava.autoscaling.maxReplicas }}
+    name: {{ include "backend-java.fullname" . }}
+  minReplicas: {{ (index .Values "backend-java").autoscaling.minReplicas }}
+  maxReplicas: {{ (index .Values "backend-java").autoscaling.maxReplicas }}
   behavior:
     scaleDown:
       stabilizationWindowSeconds: 300
@@ -35,21 +35,21 @@ spec:
           periodSeconds: 30
       selectPolicy: Max
   metrics:
-    {{- if .Values.backendJava.autoscaling.targetCPUUtilizationPercentage }}
+    {{- if (index .Values "backend-java").autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: {{ .Values.backendJava.autoscaling.targetCPUUtilizationPercentage }}
+          averageUtilization: {{ (index .Values "backend-java").autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
-    {{- if .Values.backendJava.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- if (index .Values "backend-java").autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
         target:
           type: Utilization
-          averageUtilization: {{ .Values.backendJava.autoscaling.targetMemoryUtilizationPercentage }}
+          averageUtilization: {{ (index .Values "backend-java").autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
 {{- end }}
 {{- end }}

charts/app/templates/backend-java/templates/pdb.yaml

@@ -0,0 +1,15 @@
+{{- if and (index .Values "backend-java").pdb  (index .Values "backend-java").pdb.enabled }}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "backend-java.fullname" . }}
+  labels:
+    {{- include "backend-java.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "backend-java.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  minAvailable: {{ (index .Values "backend-java").pdb.minAvailable }}
+{{- end }}

charts/app/templates/backend-java/templates/route.yaml

@@ -0,0 +1,20 @@
+{{- if (index .Values "backend-java").enabled }}
+---
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  labels:
+    {{- include "backend-java.labels" . | nindent 4 }}
+  name: {{ include "backend-java.fullname" . }}
+spec:
+  host: {{ include "backend-java.fullname" . }}.{{ .Values.global.domain }}
+  port:
+    targetPort: http
+  to:
+    kind: Service
+    name: {{ include "backend-java.fullname" . }}
+    weight: 100
+  tls:
+    termination: edge
+    insecureEdgeTerminationPolicy: Redirect
+{{- end }}

charts/app/templates/backend-java/templates/service.yaml

@@ -0,0 +1,18 @@
+{{- if (index .Values "backend-java").enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "backend-java.fullname" . }}
+  labels:
+    {{- include "backend-java.labels" . | nindent 4 }}
+spec:
+  type: {{ (index .Values "backend-java").service.type }}
+  ports:
+    - port: {{ (index .Values "backend-java").service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "backend-java.selectorLabels" . | nindent 4 }}
+{{- end }}

charts/app/templates/backendPy-knp.yaml → charts/app/templates/backend-py-knp.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   podSelector:
     matchLabels:
-      app.kubernetes.io/name: backendpy
+      app.kubernetes.io/name: backend-py
       app.kubernetes.io/instance: {{ .Release.Name }}
   ingress:
     - from:
@@ -33,7 +33,7 @@ spec:
       from:
         - podSelector:
             matchLabels:
-              app.kubernetes.io/name: backendpy
+              app.kubernetes.io/name: backend-py
               app.kubernetes.io/instance: {{ .Release.Name }}
   policyTypes:
     - Ingress

charts/app/templates/backendPy/templates/_helpers.tpl → charts/app/templates/backend-py/templates/_helpers.tpl

@@ -1,19 +1,19 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "backendPy.name" -}}
-{{- printf "backendpy" }}
+{{- define "backend-py.name" -}}
+{{- printf "backend-py" }}
 {{- end }}
 
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "backendPy.fullname" -}}
-{{- $componentName := include "backendPy.name" .  }}
-{{- if .Values.backendPy.fullnameOverride }}
-{{- .Values.backendPy.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- define "backend-py.fullname" -}}
+{{- $componentName := include "backend-py.name" .  }}
+{{- if index .Values "backend-py" "fullnameOverride" }}
+{{- index .Values "backend-py" "fullnameOverride" | trunc 63 | trimSuffix "-" }}
 {{- else }}
 {{- printf "%s-%s" .Release.Name $componentName | trunc 63 | trimSuffix "-" }}
 {{- end }}
@@ -22,20 +22,20 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Common labels
 */}}
-{{- define "backendPy.labels" -}}
-{{ include "backendPy.selectorLabels" . }}
+{{- define "backend-py.labels" -}}
+{{ include "backend-py.selectorLabels" . }}
 {{- if .Values.global.tag }}
 app.kubernetes.io/image-version: {{ .Values.global.tag | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-app.kubernetes.io/short-name: {{ include "backendPy.name" . }}
+app.kubernetes.io/short-name: {{ include "backend-py.name" . }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "backendPy.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "backendPy.name" . }}
+{{- define "backend-py.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "backend-py.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 

charts/app/templates/backendPy/templates/configmap.yaml → charts/app/templates/backend-py/templates/configmap.yaml

@@ -1,11 +1,11 @@
-{{- if .Values.backendPy.enabled -}}
+{{- if (index .Values "backend-py").enabled -}}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "backendPy.fullname" . }}
+  name: {{ include "backend-py.fullname" . }}
   labels:
-    {{- include "backendPy.labels" . | nindent 4 }}
+    {{- include "backend-py.labels" . | nindent 4 }}
 data:
   logger.conf: |
     [loggers]