From dbbbfa87bf96a0a31a83a1865227bf10d3f26e7b Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Wed, 15 Nov 2023 22:58:09 -0300 Subject: [PATCH] Add deployment and fix lots of bugs --- helm/exam/templates/NOTES.txt | 22 ----- helm/exam/templates/deployment.yaml | 95 ++++++++++--------- helm/exam/templates/secrets.yaml | 2 +- .../exam/templates/tests/test-connection.yaml | 2 +- helm/exam/values.yaml | 73 +++++++++----- 5 files changed, 101 insertions(+), 93 deletions(-) delete mode 100644 helm/exam/templates/NOTES.txt diff --git a/helm/exam/templates/NOTES.txt b/helm/exam/templates/NOTES.txt deleted file mode 100644 index 0dda8a0..0000000 --- a/helm/exam/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "exam.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "exam.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "exam.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "exam.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/helm/exam/templates/deployment.yaml b/helm/exam/templates/deployment.yaml index 4ec1bd3..cdb5385 100644 --- a/helm/exam/templates/deployment.yaml +++ b/helm/exam/templates/deployment.yaml @@ -1,59 +1,64 @@ +{{- range $deploy := .Values.deployments }} +--- apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "exam.fullname" . }} + name: {{ include "exam.fullname" $ }}-{{ $deploy.name }} labels: - {{- include "exam.labels" . | nindent 4 }} + app: {{ $deploy.name }} + {{- include "exam.labels" $ | nindent 4 }} spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .replicas }} selector: matchLabels: - {{- include "exam.selectorLabels" . | nindent 6 }} + app: {{ $deploy.name }} + tier: {{ $deploy.tier }} + {{- include "exam.selectorLabels" $ | nindent 6 }} template: metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} labels: - {{- include "exam.selectorLabels" . | nindent 8 }} + app: {{ $deploy.name }} + tier: {{ $deploy.tier }} + {{- include "exam.selectorLabels" $ | nindent 8 }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "exam.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + - name: {{ $deploy.name }} + {{- with $deploy.image }} + image: {{ .repository }}:{{ .tag | default $.Chart.AppVersion }} + {{- end }} ports: - - name: http - containerPort: {{ .Values.service.port }} - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} + - name: {{ $deploy.name }} + containerPort: {{ $deploy.port }} + {{- if $deploy.env }} + env: + {{- with $deploy.env }} + {{- range $key, $val := .nonsecrets }} + {{- $envKey := $key | upper | replace "-" "_" }} + - name: {{ $envKey }} + value: {{ quote $val }} + {{- end }} + {{- range $key, $val := .secrets }} + {{- $envKey := $key | upper | replace "-" "_" }} + - name: {{ $envKey }} + valueFrom: + secretKeyRef: + # TODO + name: {{ include "exam.fullname" $ }}-secrets + key: {{ $val }} + {{- end }} + {{- end }} + {{- end }} + resources: {} + {{- if $deploy.mountPath }} + volumeMounts: + - mountPath: {{ .mountPath }} + name: {{ .storage }} + {{- end }} + {{- if $deploy.mountPath }} + volumes: + - name: {{ .storage }} + persistentVolumeClaim: + # TODO + claimName: {{ include "exam.fullname" $ }}-postgres-pv-claim {{- end }} +{{- end }} \ No newline at end of file diff --git a/helm/exam/templates/secrets.yaml b/helm/exam/templates/secrets.yaml index dbf49c8..bc4cf6e 100644 --- a/helm/exam/templates/secrets.yaml +++ b/helm/exam/templates/secrets.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: {{ include "exam.fullname" . }}-postgres-secrets + name: {{ include "exam.fullname" . }}-secrets labels: {{- include "exam.labels" . | nindent 4 }} data: diff --git a/helm/exam/templates/tests/test-connection.yaml b/helm/exam/templates/tests/test-connection.yaml index 7764580..c7af556 100644 --- a/helm/exam/templates/tests/test-connection.yaml +++ b/helm/exam/templates/tests/test-connection.yaml @@ -11,5 +11,5 @@ spec: - name: wget image: busybox command: ['wget'] - args: ['{{ include "exam.fullname" . }}:{{ .Values.service.port }}'] + args: ['{{ include "exam.fullname" . }}:5000'] restartPolicy: Never diff --git a/helm/exam/values.yaml b/helm/exam/values.yaml index 18749a2..133cf24 100644 --- a/helm/exam/values.yaml +++ b/helm/exam/values.yaml @@ -1,31 +1,10 @@ replicaCount: 1 -image: - repository: nginx - pullPolicy: IfNotPresent - tag: "" - -imagePullSecrets: [] - serviceAccount: - # Specifies whether a service account should be created create: false - # Annotations to add to the service account annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template name: "" -podAnnotations: {} - -podSecurityContext: {} - -securityContext: {} - -service: - type: ClusterIP - port: 80 - ingress: ssl: false className: "" @@ -57,26 +36,72 @@ tolerations: [] affinity: {} +# TODO: merge with deployments services: - api: name: "api" tier: "backend" port: 5000 target: 0 + type: ClusterIP - postgres: - name: "postgres" + name: "db" tier: "backend" port: 5432 target: 0 + type: ClusterIP - client: name: "client" tier: "frontend" port: 8080 target: 80 + type: ClusterIP secrets: password: "username" username: "password1234" + pvc: - storageClass: manual - storageRequest: 1Gi \ No newline at end of file + class: manual + request: 1Gi + +deployments: + - api: + name: "api" + tier: "backend" + env: + nonsecrets: + app-settings: src.config.ProductionConfig + database-url: postgresql://$(POSTGRES_USER):$(POSTGRES_PASS)@api-db/$(POSTGRES_DB) + port: "5000" + postgres-db: api-db + secrets: + postgres-password: password + postgres-user: username + image: + repository: api + tag: prod + port: 5000 + replicas: 3 + - client: + tier: "frontend" + name: "client" + image: + repository: client + tag: prod + port: 8080 + replicas: 1 + - db: + tier: "backend" + name: "db" + env: + nonsecrets: + pgdata: /var/lib/postgresql/data/pgdata + postgresDb: db + image: + repository: db + tag: 13.3 + port: 5432 + replicas: 1 + mountPath: /var/lib/postgresql/data + storage: postgres-pv-storage