diff --git a/sre/charts/backend/templates/NOTES.txt b/sre/charts/backend/templates/NOTES.txt index d2fb4ebe4..5f26d0c72 100644 --- a/sre/charts/backend/templates/NOTES.txt +++ b/sre/charts/backend/templates/NOTES.txt @@ -3,7 +3,12 @@ The backend service has been deployed. To check the service: kubectl get pods -l app.kubernetes.io/instance={{ .Release.Name }} -To access locally: +To access locally with port forwarding: kubectl port-forward svc/{{ include "backend.fullname" . }} 8080:{{ .Values.service.port }} curl http://localhost:8080/api/welcome curl http://localhost:8080/actuator/health + +To access through nginx Ingress object and service + (Requires host file be updated) + curl http://interview-backend.local/api/welcome + curl http://interview-backend.local/actuator/health diff --git a/sre/charts/backend/templates/configmap.yaml b/sre/charts/backend/templates/configmap.yaml new file mode 100644 index 000000000..b43b61601 --- /dev/null +++ b/sre/charts/backend/templates/configmap.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "backend.fullname" . }} + labels: + {{- include "backend.labels" . | nindent 4 }} +data: + {{- range $key, $val := .Values.config }} + {{ $key }}: {{ $val | quote }} + {{- end }} diff --git a/sre/charts/backend/templates/deployment.yaml b/sre/charts/backend/templates/deployment.yaml index 227332d2e..baac14261 100644 --- a/sre/charts/backend/templates/deployment.yaml +++ b/sre/charts/backend/templates/deployment.yaml @@ -34,8 +34,9 @@ spec: volumeMounts: - name: tmp mountPath: /tmp - env: - {{- toYaml .Values.env | nindent 12 }} + envFrom: + - configMapRef: + name: {{ include "backend.fullname" . }} livenessProbe: httpGet: path: {{ .Values.livenessProbe.path }} diff --git a/sre/charts/backend/templates/pdb.yaml b/sre/charts/backend/templates/pdb.yaml new file mode 100644 index 000000000..d60dea468 --- /dev/null +++ b/sre/charts/backend/templates/pdb.yaml @@ -0,0 +1,13 @@ +{{- if .Values.pdb.enabled -}} +apiVersion: policy/v1 +kind: PodDisruptionBudget +metadata: + name: {{ include "backend.fullname" . }} + labels: + {{- include "backend.labels" . | nindent 4 }} +spec: + minAvailable: {{ .Values.pdb.minAvailable }} + selector: + matchLabels: + {{- include "backend.selectorLabels" . | nindent 6 }} +{{- end }} diff --git a/sre/charts/backend/values.yaml b/sre/charts/backend/values.yaml index 2d0f2db19..eb142aabf 100644 --- a/sre/charts/backend/values.yaml +++ b/sre/charts/backend/values.yaml @@ -31,9 +31,8 @@ service: port: 80 containerPort: 8080 -env: - - name: H2_CONSOLE_ENABLED - value: "false" +config: + H2_CONSOLE_ENABLED: "false" resources: requests: @@ -75,3 +74,7 @@ autoscaling: minReplicas: 1 maxReplicas: 3 targetCPUUtilizationPercentage: 80 + +pdb: + enabled: true + minAvailable: 1