final tocuhes

Eugeniu90 · Oct 1, 2023 · 9836394 · 9836394
1 parent 6ead43e
commit 9836394
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - main
       - qa
-      - prod
+      - rc
 
 jobs:
   build:
@@ -43,7 +43,7 @@ jobs:
         run: |
           BRANCH_NAME=$(echo ${GITHUB_REF##*/} | tr / -)
           TAG_NAME="0.0.0" # Adding default tag for main as 0.0.0
-
+          echo  "BRANCH_NAME: ${BRANCH_NAME}"
           if [ "$BRANCH_NAME" == "main" ]; then
             LAST_TAG=$(git tag -l "0.*" | sort -V | tail -n 1)
             if [ -z "$LAST_TAG" ]; then
@@ -53,7 +53,7 @@ jobs:
               NEW_PATCH_VERSION=$((PATCH_VERSION + 1))
               TAG_NAME="0.1.$NEW_PATCH_VERSION"
             fi
-          elif [ "$BRANCH_NAME" == "prod" ]; then
+          elif [ "$BRANCH_NAME" == "rc" ]; then
             LAST_TAG=$(git tag -l "1.*" | sort -V | tail -n 1)
             if [ -z "$LAST_TAG" ]; then
               TAG_NAME="1.0.0"
@@ -74,14 +74,14 @@ jobs:
 
       - name: Create Git Tag
         run: |
-          if [ "$BRANCH_NAME" == "main" ] || [ "$BRANCH_NAME" == "prod" ]; then
+          # if [ "$BRANCH_NAME" == "main" ] || [ "$BRANCH_NAME" == "rc" ]; then
             git config user.name "github-actions"
             git config user.email "github-actions@github.com"
             git tag ${{ env.TAG_NAME }}
             git push origin ${{ env.TAG_NAME }}
-          else
-            echo "Main branch detected, skipping tag"
-          fi
+          # else
+          #   echo "Main branch detected, skipping tag"
+          # fi
 
       - name: Install Helm
         run: |

diff --git a/fluxcd/clusters/poc/dev/app/helmrelease.yaml b/fluxcd/clusters/poc/dev/app/helmrelease.yaml
@@ -4,12 +4,14 @@ metadata:
   name: app
 spec:
   interval: 10m
-  releaseName: dummyapp
+  releaseName: app
   chart:
     spec:
       chart: nodejs
       sourceRef:
         kind: HelmRepository
         name: ecr
         namespace: flux-system
-      version: ">=0.1.0"
+      version: ">=0.1.0"
+  values:
+    network: rinkeby
diff --git a/fluxcd/clusters/poc/prod/app/helmrelease.yaml b/fluxcd/clusters/poc/prod/app/helmrelease.yaml
@@ -4,7 +4,7 @@ metadata:
   name: app
 spec:
   interval: 10m
-  releaseName: dummyapp
+  releaseName: app
   chart:
     spec:
       chart: nodejs

diff --git a/helm/nodejs/templates/deployment.yaml b/helm/nodejs/templates/deployment.yaml
@@ -37,14 +37,6 @@ spec:
             - name: http
               containerPort: 3000
               protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

diff --git a/helm/nodejs/templates/service.yaml b/helm/nodejs/templates/service.yaml
@@ -7,9 +7,8 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
+    - protocol: TCP
+      port: 80
+      targetPort: 3000
   selector:
     {{- include "nodejs.selectorLabels" . | nindent 4 }}
diff --git a/helm/nodejs/values.yaml b/helm/nodejs/values.yaml
@@ -38,7 +38,7 @@ securityContext: {}
 
 service:
   type: ClusterIP
-  port: 80
+  port: 3000
 
 ingress:
   enabled: false