diff --git a/charts/deno/Chart.yaml b/charts/deno/Chart.yaml index 841705d..e9381ae 100644 --- a/charts/deno/Chart.yaml +++ b/charts/deno/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.0 +version: 0.2.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/deno/templates/NOTES.txt b/charts/deno/templates/NOTES.txt index fb7dc16..8a78dff 100644 --- a/charts/deno/templates/NOTES.txt +++ b/charts/deno/templates/NOTES.txt @@ -1,5 +1,5 @@ 1) Modifier le fichier /etc/hosts: echo "$(minikube ip) deno.minikube" | sudo tee -a /etc/hosts -2) Pour accéder au serveur web aller sur: {{ .Values.server.web.service.host }} +2) Pour accéder au serveur web aller sur: http://{{ .Values.server.web.service.host }} Avec helm: diff --git a/charts/deno/templates/deployment.yaml b/charts/deno/templates/deployment.yaml index 7b83f6e..bf2d739 100644 --- a/charts/deno/templates/deployment.yaml +++ b/charts/deno/templates/deployment.yaml @@ -6,8 +6,8 @@ metadata: kubectl.kubernetes.io/last-applied-configuration: | {"apiVersion":"apps/v1","kind":"Deployment","metadata":{"annotations":{"deployment.kubernetes.io/revision":"1"},"generation":1,"labels":{"app":"deno-webserver"},"name":"deno-webserver","namespace":"default","uid":"04a746c4-41a1-4ad3-9256-caa0176da61b"},"spec":{"progressDeadlineSeconds":600,"replicas":1,"revisionHistoryLimit":10,"selector":{"matchLabels":{"app":"deno-webserver"}},"strategy":{"rollingUpdate":{"maxSurge":"25%","maxUnavailable":"25%"},"type":"RollingUpdate"},"template":{"metadata":{"creationTimestamp":null,"labels":{"app":"deno-webserver"}},"spec":{"containers":[{"image":"codebuds/deno-webserver:latest","imagePullPolicy":"Always","name":"deno-webserver","resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File"}],"dnsPolicy":"ClusterFirst","restartPolicy":"Always","schedulerName":"default-scheduler","securityContext":{},"terminationGracePeriodSeconds":30}}},"status":{"availableReplicas":1,"conditions":[{"lastTransitionTime":"2022-03-13T17:52:08Z","lastUpdateTime":"2022-03-13T17:52:08Z","message":"Deployment has minimum availability.","reason":"MinimumReplicasAvailable","status":"True","type":"Available"},{"lastTransitionTime":"2022-03-13T17:52:00Z","lastUpdateTime":"2022-03-13T17:52:08Z","message":"ReplicaSet \"deno-webserver-7d4999f6cf\" has successfully progressed.","reason":"NewReplicaSetAvailable","status":"True","type":"Progressing"}],"observedGeneration":1,"readyReplicas":1,"replicas":1,"updatedReplicas":1}} labels: - app: {{ .Values.server.web.service.name }} - name: {{ .Values.server.web.service.name }} + app: {{ .Release.Name }}{{ .Values.server.web.service.name }} + name: {{ .Release.Name }}-{{ .Values.server.web.service.name }} namespace: {{ .Values.server.web.service.default }} spec: progressDeadlineSeconds: 600 @@ -35,22 +35,22 @@ spec: terminationMessagePolicy: File volumeMounts: - mountPath: /srv/app/pvc - name: logs + name: {{ .Release.Name }}-logs dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler securityContext: {} terminationGracePeriodSeconds: 30 volumes: - - name: logs + - name: {{ .Release.Name }}-logs persistentVolumeClaim: - claimName: logs + claimName: {{ .Release.Name }}-logs --- apiVersion: v1 kind: PersistentVolume metadata: - name: {{ .Values.deno.pv.name }} + name: {{ .Release.Name }}-{{ .Values.deno.pv.name }} spec: accessModes: - ReadWriteOnce @@ -65,7 +65,7 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: logs + name: {{ .Release.Name }}-logs namespace: default spec: accessModes: @@ -77,7 +77,7 @@ spec: apiVersion: v1 kind: Service metadata: - name: {{ .Values.server.web.service.name }} + name: {{ .Release.Name }}-{{ .Values.server.web.service.name }} spec: type: {{ .Values.server.web.service.type }} ports: diff --git a/charts/deno/templates/ingress.yml b/charts/deno/templates/ingress.yml index 50a0ff8..7a71384 100644 --- a/charts/deno/templates/ingress.yml +++ b/charts/deno/templates/ingress.yml @@ -1,12 +1,12 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: deno-ingress + name: {{ .Release.Name }}-deno-ingress annotations: nginx.ingress.kubernetes.io/rewrite-target: /$1 spec: rules: - - host: {{ .Values.server.web.service.host }} + - host: {{ .Release.Name }}-{{ .Values.server.web.service.host }} http: paths: - path: / diff --git a/charts/deno/templates/mariadb.yml b/charts/deno/templates/mariadb.yml index c346b5a..5c38074 100644 --- a/charts/deno/templates/mariadb.yml +++ b/charts/deno/templates/mariadb.yml @@ -5,7 +5,7 @@ metadata: deployment.kubernetes.io/revision: "3" labels: app: {{ .Values.server.mariadb.service.name }} - name: {{ .Values.server.mariadb.service.name }} + name: {{ .Release.Name }}-{{ .Values.server.mariadb.service.name }} namespace: {{ .Values.server.mariadb.service.namespace }} spec: revisionHistoryLimit: 10 @@ -46,9 +46,9 @@ spec: securityContext: {} terminationGracePeriodSeconds: 30 volumes: - - name: logs + - name: {{ .Release.Name }}-logs persistentVolumeClaim: - claimName: logs + claimName: {{ .Release.Name }}-logs - name: {{ .Values.server.mariadb.service.name }} persistentVolumeClaim: claimName: {{ .Values.server.mariadb.service.name }} @@ -57,7 +57,7 @@ spec: apiVersion: v1 kind: PersistentVolume metadata: - name: {{ .Values.server.mariadb.service.name }} + name: {{ .Release.Name }}-{{ .Values.server.mariadb.service.name }} spec: accessModes: - ReadWriteOnce @@ -72,7 +72,7 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: {{ .Values.server.mariadb.service.name }} + name: {{ .Release.Name }}-{{ .Values.server.mariadb.service.name }} namespace: default spec: accessModes: @@ -85,7 +85,7 @@ spec: apiVersion: v1 kind: Service metadata: - name: {{ .Values.server.mariadb.service.name }} + name: {{ .Release.Name }}-{{ .Values.server.mariadb.service.name }} spec: ports: - port: {{ .Values.server.mariadb.service.port }} diff --git a/charts/deno/templates/secrets.yml b/charts/deno/templates/secrets.yml index 65f1a48..3bbc04d 100644 --- a/charts/deno/templates/secrets.yml +++ b/charts/deno/templates/secrets.yml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: mariadb-secret + name: {{ .Release.Name }}-mariadb-secret type: kubernetes.io/basic-auth stringData: password: {{ .Values.server.mariadb.password }}