Skip to content

Commit d79939e

Browse files
CopilotDerekRoberts
Copilot
and
DerekRoberts
authored
fix: standardize component naming to hyphenated format (#421)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: DerekRoberts <4391600+DerekRoberts@users.noreply.github.com>
1 parent 260c522 commit d79939e

File tree

26 files changed

+203
-205
lines changed

26 files changed

+203
-205
lines changed

‎.github/workflows/merge.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
name: [quarkus, fastapi]
6060
include:
6161
- name: quarkus
62-
baseUrl: https://quickstart-openshift-backends-test-backendjava.apps.silver.devops.gov.bc.ca
62+
baseUrl: https://quickstart-openshift-backends-test-backend-java.apps.silver.devops.gov.bc.ca
6363
- name: fastapi
64-
baseUrl: https://quickstart-openshift-backends-test-backendpy.apps.silver.devops.gov.bc.ca
64+
baseUrl: https://quickstart-openshift-backends-test-backend-py.apps.silver.devops.gov.bc.ca
6565
steps:
6666
- uses: actions/checkout@v6
6767
name: Checkout
@@ -100,12 +100,10 @@ jobs:
100100
environment: prod
101101
db_user: appproxy
102102
params: --set global.autoscaling=true
103-
--set backendPy.pdb.enabled=true
104-
--set backendGo.pdb.enabled=true
105-
--set backendJava.pdb.enabled=true
106-
--set backendGo.deploymentStrategy=RollingUpdate
107-
--set backendPy.deploymentStrategy=RollingUpdate
108-
--set backendJava.deploymentStrategy=RollingUpdate
103+
--set backend-py.pdb.enabled=true
104+
--set backend-java.pdb.enabled=true
105+
--set backend-py.deploymentStrategy=RollingUpdate
106+
--set backend-java.deploymentStrategy=RollingUpdate
109107
tag: ${{ inputs.tag }}
110108

111109
promote:

‎.github/workflows/pr-validate.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-validate.yml@6d695dd755fa9255ea4bde335890516beb6f95e4 # v1.0.1
1818
with:
1919
markdown_links: |
20-
- [Java](https://${{ github.event.repository.name }}-${{ github.event.number }}-backendJava.apps.silver.devops.gov.bc.ca)
21-
- [Py](https://${{ github.event.repository.name }}-${{ github.event.number }}-backendPy.apps.silver.devops.gov.bc.ca)
20+
- [Java](https://${{ github.event.repository.name }}-${{ github.event.number }}-backend-java.apps.silver.devops.gov.bc.ca)
21+
- [Py](https://${{ github.event.repository.name }}-${{ github.event.number }}-backend-py.apps.silver.devops.gov.bc.ca)
2222
2323
results:
2424
name: Validate Results

charts/app/templates/backendJava-knp.yaml renamed to charts/app/templates/backend-java-knp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
spec:
88
podSelector:
99
matchLabels:
10-
app.kubernetes.io/name: backendjava
10+
app.kubernetes.io/name: backend-java
1111
app.kubernetes.io/instance: {{ .Release.Name }}
1212
ingress:
1313
- from:
@@ -33,7 +33,7 @@ spec:
3333
from:
3434
- podSelector:
3535
matchLabels:
36-
app.kubernetes.io/name: backendjava
36+
app.kubernetes.io/name: backend-java
3737
app.kubernetes.io/instance: {{ .Release.Name }}
3838
policyTypes:
3939
- Ingress

charts/app/templates/backendJava-secret.yaml renamed to charts/app/templates/backend-java-secret.yaml

File renamed without changes.

charts/app/templates/backendJava/templates/_helpers.tpl renamed to charts/app/templates/backend-java/templates/_helpers.tpl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{{/*
22
Expand the name of the chart.
33
*/}}
4-
{{- define "backendJava.name" -}}
5-
{{- printf "backendjava" }}
4+
{{- define "backend-java.name" -}}
5+
{{- printf "backend-java" }}
66
{{- end }}
77

88
{{/*
99
Create a default fully qualified app name.
1010
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
1111
If release name contains chart name it will be used as a full name.
1212
*/}}
13-
{{- define "backendJava.fullname" -}}
14-
{{- $componentName := include "backendJava.name" . }}
15-
{{- if .Values.backendJava.fullnameOverride }}
16-
{{- .Values.backendJava.fullnameOverride | trunc 63 | trimSuffix "-" }}
13+
{{- define "backend-java.fullname" -}}
14+
{{- $componentName := include "backend-java.name" . }}
15+
{{- if index .Values "backend-java" "fullnameOverride" }}
16+
{{- index .Values "backend-java" "fullnameOverride" | trunc 63 | trimSuffix "-" }}
1717
{{- else }}
1818
{{- printf "%s-%s" .Release.Name $componentName | trunc 63 | trimSuffix "-" }}
1919
{{- end }}
@@ -22,20 +22,20 @@ If release name contains chart name it will be used as a full name.
2222
{{/*
2323
Common labels
2424
*/}}
25-
{{- define "backendJava.labels" -}}
26-
{{ include "backendJava.selectorLabels" . }}
25+
{{- define "backend-java.labels" -}}
26+
{{ include "backend-java.selectorLabels" . }}
2727
{{- if .Values.global.tag }}
2828
app.kubernetes.io/image-version: {{ .Values.global.tag | quote }}
2929
{{- end }}
3030
app.kubernetes.io/managed-by: {{ .Release.Service }}
31-
app.kubernetes.io/short-name: {{ include "backendJava.name" . }}
31+
app.kubernetes.io/short-name: {{ include "backend-java.name" . }}
3232
{{- end }}
3333

3434
{{/*
3535
Selector labels
3636
*/}}
37-
{{- define "backendJava.selectorLabels" -}}
38-
app.kubernetes.io/name: {{ include "backendJava.name" . }}
37+
{{- define "backend-java.selectorLabels" -}}
38+
app.kubernetes.io/name: {{ include "backend-java.name" . }}
3939
app.kubernetes.io/instance: {{ .Release.Name }}
4040
{{- end }}
4141

charts/app/templates/backendJava/templates/deployment.yaml renamed to charts/app/templates/backend-java/templates/deployment.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
{{- if .Values.backendJava.enabled }}
1+
{{- if (index .Values "backend-java").enabled }}
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
5-
name: {{ include "backendJava.fullname" . }}
5+
name: {{ include "backend-java.fullname" . }}
66
labels:
7-
{{- include "backendJava.labels" . | nindent 4 }}
7+
{{- include "backend-java.labels" . | nindent 4 }}
88
spec:
99
strategy:
10-
type: {{ .Values.backendJava.deploymentStrategy }}
11-
{{- if not .Values.backendJava.autoscaling.enabled }}
12-
replicas: {{ .Values.backendJava.replicaCount }}
10+
type: {{ (index .Values "backend-java").deploymentStrategy }}
11+
{{- if not (index .Values "backend-java").autoscaling.enabled }}
12+
replicas: {{ (index .Values "backend-java").replicaCount }}
1313
{{- end }}
1414
selector:
1515
matchLabels:
16-
{{- include "backendJava.selectorLabels" . | nindent 6 }}
16+
{{- include "backend-java.selectorLabels" . | nindent 6 }}
1717
template:
1818
metadata:
1919
annotations:
2020
rollme: {{ randAlphaNum 5 | quote }}
2121
labels:
22-
{{- include "backendJava.labels" . | nindent 8 }}
22+
{{- include "backend-java.labels" . | nindent 8 }}
2323
spec:
24-
{{- if .Values.backendJava.podSecurityContext }}
24+
{{- if (index .Values "backend-java").podSecurityContext }}
2525
securityContext:
26-
{{- toYaml .Values.backendJava.podSecurityContext | nindent 12 }}
26+
{{- toYaml (index .Values "backend-java").podSecurityContext | nindent 12 }}
2727
{{- end }}
2828
containers:
29-
- name: {{ include "backendJava.fullname" . }}
30-
{{- if .Values.backendJava.securityContext }}
29+
- name: {{ include "backend-java.fullname" . }}
30+
{{- if (index .Values "backend-java").securityContext }}
3131
securityContext:
32-
{{- toYaml .Values.backendJava.securityContext | nindent 12 }}
32+
{{- toYaml (index .Values "backend-java").securityContext | nindent 12 }}
3333
{{- end }}
3434
image: "{{.Values.global.registry}}/{{.Values.global.repository}}/backend-java:{{ .Values.global.tag | default .Chart.AppVersion }}"
35-
imagePullPolicy: {{ default "Always" .Values.backendJava.imagePullPolicy }}
35+
imagePullPolicy: {{ default "Always" (index .Values "backend-java").imagePullPolicy }}
3636
envFrom:
3737
- secretRef:
3838
name: {{.Release.Name}}-java
@@ -43,7 +43,7 @@ spec:
4343
value: info
4444
ports:
4545
- name: http
46-
containerPort: {{ .Values.backendJava.service.targetPort }}
46+
containerPort: {{ (index .Values "backend-java").service.targetPort }}
4747
protocol: TCP
4848
startupProbe:
4949
httpGet:
@@ -79,11 +79,11 @@ spec:
7979
requests:
8080
cpu: 20m
8181
memory: 150Mi
82-
{{- with .Values.backendJava.nodeSelector }}
82+
{{- with (index .Values "backend-java").nodeSelector }}
8383
nodeSelector:
8484
{{- toYaml . | nindent 8 }}
8585
{{- end }}
86-
{{- with .Values.backendJava.tolerations }}
86+
{{- with (index .Values "backend-java").tolerations }}
8787
tolerations:
8888
{{- toYaml . | nindent 8 }}
8989
{{- end }}
@@ -95,7 +95,7 @@ spec:
9595
- key: app.kubernetes.io/name
9696
operator: In
9797
values:
98-
- {{ include "backendJava.fullname" . }}
98+
- {{ include "backend-java.fullname" . }}
9999
- key: app.kubernetes.io/instance
100100
operator: In
101101
values:

charts/app/templates/backendJava/templates/hpa.yaml renamed to charts/app/templates/backend-java/templates/hpa.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{{- if .Values.global.autoscaling }}
2-
{{- if and .Values.backendJava.autoscaling .Values.backendJava.autoscaling.enabled }}
2+
{{- if and (index .Values "backend-java").autoscaling (index .Values "backend-java").autoscaling.enabled }}
33
apiVersion: autoscaling/v2
44
kind: HorizontalPodAutoscaler
55
metadata:
6-
name: {{ include "backendJava.fullname" . }}
6+
name: {{ include "backend-java.fullname" . }}
77
labels:
8-
{{- include "backendJava.labels" . | nindent 4 }}
8+
{{- include "backend-java.labels" . | nindent 4 }}
99
spec:
1010
scaleTargetRef:
1111
apiVersion: apps/v1
1212
kind: Deployment
13-
name: {{ include "backendJava.fullname" . }}
14-
minReplicas: {{ .Values.backendJava.autoscaling.minReplicas }}
15-
maxReplicas: {{ .Values.backendJava.autoscaling.maxReplicas }}
13+
name: {{ include "backend-java.fullname" . }}
14+
minReplicas: {{ (index .Values "backend-java").autoscaling.minReplicas }}
15+
maxReplicas: {{ (index .Values "backend-java").autoscaling.maxReplicas }}
1616
behavior:
1717
scaleDown:
1818
stabilizationWindowSeconds: 300
@@ -35,21 +35,21 @@ spec:
3535
periodSeconds: 30
3636
selectPolicy: Max
3737
metrics:
38-
{{- if .Values.backendJava.autoscaling.targetCPUUtilizationPercentage }}
38+
{{- if (index .Values "backend-java").autoscaling.targetCPUUtilizationPercentage }}
3939
- type: Resource
4040
resource:
4141
name: cpu
4242
target:
4343
type: Utilization
44-
averageUtilization: {{ .Values.backendJava.autoscaling.targetCPUUtilizationPercentage }}
44+
averageUtilization: {{ (index .Values "backend-java").autoscaling.targetCPUUtilizationPercentage }}
4545
{{- end }}
46-
{{- if .Values.backendJava.autoscaling.targetMemoryUtilizationPercentage }}
46+
{{- if (index .Values "backend-java").autoscaling.targetMemoryUtilizationPercentage }}
4747
- type: Resource
4848
resource:
4949
name: memory
5050
target:
5151
type: Utilization
52-
averageUtilization: {{ .Values.backendJava.autoscaling.targetMemoryUtilizationPercentage }}
52+
averageUtilization: {{ (index .Values "backend-java").autoscaling.targetMemoryUtilizationPercentage }}
5353
{{- end }}
5454
{{- end }}
5555
{{- end }}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{{- if and (index .Values "backend-java").pdb (index .Values "backend-java").pdb.enabled }}
2+
---
3+
apiVersion: policy/v1
4+
kind: PodDisruptionBudget
5+
metadata:
6+
name: {{ include "backend-java.fullname" . }}
7+
labels:
8+
{{- include "backend-java.labels" . | nindent 4 }}
9+
spec:
10+
selector:
11+
matchLabels:
12+
app.kubernetes.io/name: {{ include "backend-java.name" . }}
13+
app.kubernetes.io/instance: {{ .Release.Name }}
14+
minAvailable: {{ (index .Values "backend-java").pdb.minAvailable }}
15+
{{- end }}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{{- if (index .Values "backend-java").enabled }}
2+
---
3+
apiVersion: route.openshift.io/v1
4+
kind: Route
5+
metadata:
6+
labels:
7+
{{- include "backend-java.labels" . | nindent 4 }}
8+
name: {{ include "backend-java.fullname" . }}
9+
spec:
10+
host: {{ include "backend-java.fullname" . }}.{{ .Values.global.domain }}
11+
port:
12+
targetPort: http
13+
to:
14+
kind: Service
15+
name: {{ include "backend-java.fullname" . }}
16+
weight: 100
17+
tls:
18+
termination: edge
19+
insecureEdgeTerminationPolicy: Redirect
20+
{{- end }}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{{- if (index .Values "backend-java").enabled }}
2+
---
3+
apiVersion: v1
4+
kind: Service
5+
metadata:
6+
name: {{ include "backend-java.fullname" . }}
7+
labels:
8+
{{- include "backend-java.labels" . | nindent 4 }}
9+
spec:
10+
type: {{ (index .Values "backend-java").service.type }}
11+
ports:
12+
- port: {{ (index .Values "backend-java").service.port }}
13+
targetPort: http
14+
protocol: TCP
15+
name: http
16+
selector:
17+
{{- include "backend-java.selectorLabels" . | nindent 4 }}
18+
{{- end }}

0 commit comments

Comments
 (0)