From 449f89c6a7fb0f44230834b7431b3ccee21a583c Mon Sep 17 00:00:00 2001 From: Mohammad Abusaa Date: Sat, 1 Oct 2022 12:53:52 +0300 Subject: [PATCH 01/14] Update service.yaml --- helm/webapp/templates/service.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/helm/webapp/templates/service.yaml b/helm/webapp/templates/service.yaml index 744c4ed0..40eb81c5 100644 --- a/helm/webapp/templates/service.yaml +++ b/helm/webapp/templates/service.yaml @@ -9,7 +9,10 @@ spec: ports: - port: {{ .Values.service.port }} targetPort: http + {{- if .Values.service.nodeport }} + nodePort: {{ .Values.service.port }} + {{- end }} protocol: TCP name: http selector: - {{- include "demo.selectorLabels" . | nindent 4 }} \ No newline at end of file + {{- include "demo.selectorLabels" . | nindent 4 }} From baf40954f220698f482065a4e4594e2f3a7d1e2f Mon Sep 17 00:00:00 2001 From: Mohammad Abusaa Date: Sat, 1 Oct 2022 12:54:26 +0300 Subject: [PATCH 02/14] Update values.yaml --- helm/webapp/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helm/webapp/values.yaml b/helm/webapp/values.yaml index 1dfbe766..bb480773 100644 --- a/helm/webapp/values.yaml +++ b/helm/webapp/values.yaml @@ -37,8 +37,9 @@ securityContext: {} # runAsUser: 1000 service: - type: ClusterIP + type: NodePort port: 80 + nodeport: 32080 ingress: enabled: false From 0749f902c21ddbea8352c4aa5505b19b0cd86688 Mon Sep 17 00:00:00 2001 From: Mohammad Abusaa Date: Sat, 1 Oct 2022 16:19:46 +0300 Subject: [PATCH 03/14] Update service.yaml --- helm/webapp/templates/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/webapp/templates/service.yaml b/helm/webapp/templates/service.yaml index 40eb81c5..8d40e713 100644 --- a/helm/webapp/templates/service.yaml +++ b/helm/webapp/templates/service.yaml @@ -10,7 +10,7 @@ spec: - port: {{ .Values.service.port }} targetPort: http {{- if .Values.service.nodeport }} - nodePort: {{ .Values.service.port }} + nodePort: {{ .Values.service.nodeport }} {{- end }} protocol: TCP name: http From 819978055dd104a826ddb53cc250f6492066c7ad Mon Sep 17 00:00:00 2001 From: Rathore Date: Thu, 9 Jan 2025 20:21:25 +0530 Subject: [PATCH 04/14] updated ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b66dbba..4c71f5b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: build-test: runs-on: ubuntu-latest steps: - - run: echo "building and testing the app ..." + - run: echo "building and testing the app there..." docker-build-push: runs-on: ubuntu-latest needs: build-test From 29bd1331f9be358a1730bc7ca17060232cf01b98 Mon Sep 17 00:00:00 2001 From: Rathore Date: Thu, 9 Jan 2025 20:27:07 +0530 Subject: [PATCH 05/14] updated ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c71f5b5..3bb7f47d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: build-test: runs-on: ubuntu-latest steps: - - run: echo "building and testing the app there..." + - run: echo "building and testing the app of there..." docker-build-push: runs-on: ubuntu-latest needs: build-test From bb33b1092c01c8527cbd471a402930c7b3d44458 Mon Sep 17 00:00:00 2001 From: Rathore Date: Thu, 9 Jan 2025 20:34:15 +0530 Subject: [PATCH 06/14] updated ci.yml --- .github/workflows/ci.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bb7f47d..530be26e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,34 +12,31 @@ jobs: build-test: runs-on: ubuntu-latest steps: - - run: echo "building and testing the app of there..." + - run: echo "building and testing the app ..." + docker-build-push: runs-on: ubuntu-latest needs: build-test steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v2 - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push + - name: Build and push uses: docker/build-push-action@v2 with: context: . file: WebApplication1/Dockerfile push: true - tags: mabusaa/argocd-course-webapp:${{ github.sha }} + tags: sakshirathoree/argocd-course-webapp:${{ github.sha }} + promote-to-dev-environment: runs-on: ubuntu-latest needs: docker-build-push @@ -56,4 +53,3 @@ jobs: sed -i "s,tag:.*,tag:\ ${{ github.sha }}," helm/webapp/values.yaml git add . && git commit -m "update image tag" git push - From 09c943126d4f25dca101a61b199d72dc490afb10 Mon Sep 17 00:00:00 2001 From: Rathore Date: Thu, 9 Jan 2025 20:40:03 +0530 Subject: [PATCH 07/14] updated ci.yml and pr.yml --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6c69b960..3057d36a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -36,7 +36,7 @@ jobs: context: . file: WebApplication1/Dockerfile push: true - tags: mabusaa/argocd-course-webapp:${{ github.event.pull_request.head.sha }} + tags: sakshirathoree/argocd-course-webapp:${{ github.event.pull_request.head.sha }} update-image-tag-in-helm: runs-on: ubuntu-latest needs: docker-build-push From 04402f5127ac0eb0398455568c47c83d3bb91fb3 Mon Sep 17 00:00:00 2001 From: Rathore Date: Thu, 9 Jan 2025 20:45:42 +0530 Subject: [PATCH 08/14] updated ci.yml and pr.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 530be26e..33894ee5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: build-test: runs-on: ubuntu-latest steps: - - run: echo "building and testing the app ..." + - run: echo "building and testing the app here..." docker-build-push: runs-on: ubuntu-latest From ca7fcb36120568cef39c38fcd6cb709e67cf18a1 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Thu, 9 Jan 2025 15:16:52 +0000 Subject: [PATCH 09/14] update image tag [skip ci] --- helm/webapp/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/webapp/values.yaml b/helm/webapp/values.yaml index bb480773..3a13820e 100644 --- a/helm/webapp/values.yaml +++ b/helm/webapp/values.yaml @@ -8,7 +8,7 @@ image: repository: mabusaa/argocd-course-webapp pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "9dbc07045cd3502b9863803b21356cd5ec2a93eb" + tag: 04402f5127ac0eb0398455568c47c83d3bb91fb3 imagePullSecrets: [] nameOverride: "" From 0bf21864f1db1e9eb4186527bd71f06bb15b8948 Mon Sep 17 00:00:00 2001 From: Rathore Date: Fri, 10 Jan 2025 16:41:16 +0530 Subject: [PATCH 10/14] updated img name in values.yaml --- helm/webapp/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/webapp/values.yaml b/helm/webapp/values.yaml index bb480773..2f813e9a 100644 --- a/helm/webapp/values.yaml +++ b/helm/webapp/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 image: - repository: mabusaa/argocd-course-webapp + repository: sakshirathoree/argocd-course-webapp pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "9dbc07045cd3502b9863803b21356cd5ec2a93eb" From c36028b7142d4ebceb3c792e92e0dd22a3e3dc42 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Fri, 10 Jan 2025 11:30:51 +0000 Subject: [PATCH 11/14] update image tag [skip ci] --- helm/webapp/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/webapp/values.yaml b/helm/webapp/values.yaml index e0cc678e..6b3a7482 100644 --- a/helm/webapp/values.yaml +++ b/helm/webapp/values.yaml @@ -8,7 +8,7 @@ image: repository: sakshirathoree/argocd-course-webapp pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: 04402f5127ac0eb0398455568c47c83d3bb91fb3 + tag: 0926c78ff88693d87a505ce7f771e4eee2a3c166 imagePullSecrets: [] nameOverride: "" From 1d9216605c591bd2100dce48d80d7c441dde1f21 Mon Sep 17 00:00:00 2001 From: Rathore Date: Fri, 10 Jan 2025 19:59:25 +0530 Subject: [PATCH 12/14] updated pr.yml --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3057d36a..142e093a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -9,7 +9,7 @@ jobs: build-test: runs-on: ubuntu-latest steps: - - run: echo "building and testing the app ..." + - run: echo "building and testing the app again ..." docker-build-push: runs-on: ubuntu-latest needs: build-test From 4510b415d92e7ddb9271d2f2266010326fceb501 Mon Sep 17 00:00:00 2001 From: Rathore Date: Fri, 10 Jan 2025 20:03:29 +0530 Subject: [PATCH 13/14] updated pr.yml --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 142e093a..27cfad33 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -9,7 +9,7 @@ jobs: build-test: runs-on: ubuntu-latest steps: - - run: echo "building and testing the app again ..." + - run: echo "building and testing the app here again ..." docker-build-push: runs-on: ubuntu-latest needs: build-test From 215763ad64d93065ec1acad0620fff154cb21099 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Fri, 10 Jan 2025 14:34:49 +0000 Subject: [PATCH 14/14] update image tag [skip ci] --- helm/webapp/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/webapp/values.yaml b/helm/webapp/values.yaml index 6b3a7482..3f2c0791 100644 --- a/helm/webapp/values.yaml +++ b/helm/webapp/values.yaml @@ -8,7 +8,7 @@ image: repository: sakshirathoree/argocd-course-webapp pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: 0926c78ff88693d87a505ce7f771e4eee2a3c166 + tag: 4510b415d92e7ddb9271d2f2266010326fceb501 imagePullSecrets: [] nameOverride: ""