CI/CD

.github/workflows/main.yml

@@ -69,8 +69,8 @@ jobs:
 
       - name: Tag and push Docker image to Amazon ECR
         run: |
-          docker tag nodejs:latest ${{ secrets.ECR_REGISTRY }}:${{ env.TAG_NAME }}
-          docker push ${{ secrets.ECR_REGISTRY }}:${{ env.TAG_NAME }}
+          docker tag nodejs:latest ${{ secrets.ECR_REGISTRY }}/nodejs:${{ env.TAG_NAME }}
+          docker push ${{ secrets.ECR_REGISTRY }}/nodejs:${{ env.TAG_NAME }}
 
       - name: Create Git Tag
         run: |
@@ -87,7 +87,7 @@ jobs:
 
       - name: Login to ECR (for Helm)
         run: |
-          aws ecr get-login-password --region eu-west-1 | helm registry login --username AWS --password-stdin ${{ secrets.ECR_REGISTRY }}
+          aws ecr get-login-password --region eu-west-1 | helm registry login --username AWS --password-stdin ${{ secrets.ECR_REGISTRY }}/nodejs
 
       - name: Update Helm Chart Version and start package process
         run: |
@@ -99,5 +99,6 @@ jobs:
           sed -i "s/version: .*/version: ${{ env.TAG_NAME }}/" Chart.yaml
 
           echo "Updated chart version to ${{ env.TAG_NAME }}."
-          helm package .
+          cd ../.. && helm package nodejs
           helm push nodejs-${{ env.TAG_NAME }}.tgz oci://${{ secrets.ECR_REGISTRY }}
+        

helm/nodejs/templates/NOTES.txt

@@ -6,16 +6,16 @@
   {{- 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 "poc.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "nodejs.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 "poc.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "poc.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "nodejs.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "nodejs.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 "poc.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "nodejs.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

helm/nodejs/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "poc.name" -}}
+{{- define "nodejs.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ 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 "poc.fullname" -}}
+{{- define "nodejs.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "poc.chart" -}}
+{{- define "nodejs.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "poc.labels" -}}
-helm.sh/chart: {{ include "poc.chart" . }}
-{{ include "poc.selectorLabels" . }}
+{{- define "nodejs.labels" -}}
+helm.sh/chart: {{ include "nodejs.chart" . }}
+{{ include "nodejs.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "poc.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "poc.name" . }}
+{{- define "nodejs.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "nodejs.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "poc.serviceAccountName" -}}
+{{- define "nodejs.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "poc.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "nodejs.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

helm/nodejs/templates/deployment.yaml

@@ -1,30 +1,30 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "poc.fullname" . }}
+  name: {{ include "nodejs.fullname" . }}
   labels:
-    {{- include "poc.labels" . | nindent 4 }}
+    {{- include "nodejs.labels" . | nindent 4 }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
   selector:
     matchLabels:
-      {{- include "poc.selectorLabels" . | nindent 6 }}
+      {{- include "nodejs.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "poc.selectorLabels" . | nindent 8 }}
+        {{- include "nodejs.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "poc.serviceAccountName" . }}
+      serviceAccountName: {{ include "nodejs.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:

helm/nodejs/templates/hpa.yaml

@@ -2,14 +2,14 @@
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "poc.fullname" . }}
+  name: {{ include "nodejs.fullname" . }}
   labels:
-    {{- include "poc.labels" . | nindent 4 }}
+    {{- include "nodejs.labels" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ include "poc.fullname" . }}
+    name: {{ include "nodejs.fullname" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:

helm/nodejs/templates/ingress.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "poc.fullname" . -}}
+{{- $fullName := include "nodejs.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
@@ -17,7 +17,7 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    {{- include "poc.labels" . | nindent 4 }}
+    {{- include "nodejs.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

helm/nodejs/templates/service.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "poc.fullname" . }}
+  name: {{ include "nodejs.fullname" . }}
   labels:
-    {{- include "poc.labels" . | nindent 4 }}
+    {{- include "nodejs.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -12,4 +12,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "poc.selectorLabels" . | nindent 4 }}
+    {{- include "nodejs.selectorLabels" . | nindent 4 }}

helm/nodejs/templates/serviceaccount.yaml

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "poc.serviceAccountName" . }}
+  name: {{ include "nodejs.serviceAccountName" . }}
   labels:
-    {{- include "poc.labels" . | nindent 4 }}
+    {{- include "nodejs.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

helm/nodejs/templates/sm-secret.yaml

@@ -1,17 +1,17 @@
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: {{ include "poc.fullname" . }}-secret
+  name: {{ include "nodejs.fullname" . }}-secret
   labels:
-    {{ include "poc.fullname" . }}-secret
+    {{ include "nodejs.fullname" . }}-secret
 spec:
   refreshInterval: 1m
   secretStoreRef:
     name: global-secret-store
     kind: ClusterSecretStore
   target:
-    name: {{ include "poc.fullname" . }}-secret
+    name: {{ include "nodejs.fullname" . }}-secret
     creationPolicy: Owner
   dataFrom:
   - extract:
-      key:  {{ include "poc.fullname" . }}-secret
+      key:  {{ include "nodejs.fullname" . }}-secret

helm/nodejs/templates/tests/test-connection.yaml

@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "poc.fullname" . }}-test-connection"
+  name: "{{ include "nodejs.fullname" . }}-test-connection"
   labels:
-    {{- include "poc.labels" . | nindent 4 }}
+    {{- include "nodejs.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
 spec:
   containers:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "poc.fullname" . }}:{{ .Values.service.port }}']
+      args: ['{{ include "nodejs.fullname" . }}:{{ .Values.service.port }}']
   restartPolicy: Never