From 5d278fcd3eb4b8f795dd302b332b09e4fd78767e Mon Sep 17 00:00:00 2001 From: YasinduDD Date: Wed, 14 Aug 2024 18:34:36 +0530 Subject: [PATCH 01/14] change dine --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8c3ce44c03..574365042e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +CHANGE MADE + # Example Voting App A simple distributed application running across multiple Docker containers. From 4a4c3f3dcd39245c66ff4a71f737b641571c8bbd Mon Sep 17 00:00:00 2001 From: YasinduDD Date: Tue, 20 Aug 2024 12:51:24 +0530 Subject: [PATCH 02/14] sync added --- k8s-specifications/result-deployment.yaml | 2 ++ k8s-specifications/result-service.yaml | 2 ++ k8s-specifications/vote-deployment.yaml | 2 ++ k8s-specifications/vote-service.yaml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/k8s-specifications/result-deployment.yaml b/k8s-specifications/result-deployment.yaml index b85488a667..9b11ca983f 100644 --- a/k8s-specifications/result-deployment.yaml +++ b/k8s-specifications/result-deployment.yaml @@ -1,6 +1,8 @@ apiVersion: apps/v1 kind: Deployment metadata: + annotations: + argocd.argoproj.io/sync-wave: "1" labels: app: result name: result diff --git a/k8s-specifications/result-service.yaml b/k8s-specifications/result-service.yaml index f20e3b1fc6..4fc8d7a87c 100644 --- a/k8s-specifications/result-service.yaml +++ b/k8s-specifications/result-service.yaml @@ -1,6 +1,8 @@ apiVersion: v1 kind: Service metadata: + annotations: + argocd.argoproj.io/sync-wave: "1" labels: app: result name: result diff --git a/k8s-specifications/vote-deployment.yaml b/k8s-specifications/vote-deployment.yaml index 165a9478f8..ab9afc378c 100644 --- a/k8s-specifications/vote-deployment.yaml +++ b/k8s-specifications/vote-deployment.yaml @@ -1,6 +1,8 @@ apiVersion: apps/v1 kind: Deployment metadata: + annotations: + argocd.argoproj.io/sync-wave: "1" labels: app: vote name: vote diff --git a/k8s-specifications/vote-service.yaml b/k8s-specifications/vote-service.yaml index eae29ffcc3..5c95b3729f 100644 --- a/k8s-specifications/vote-service.yaml +++ b/k8s-specifications/vote-service.yaml @@ -1,6 +1,8 @@ apiVersion: v1 kind: Service metadata: + annotations: + argocd.argoproj.io/sync-wave: "1" labels: app: vote name: vote From d0b0f2e62580096c095f7f6a4e7bca00bcace0f2 Mon Sep 17 00:00:00 2001 From: YasinduDD Date: Tue, 20 Aug 2024 13:16:00 +0530 Subject: [PATCH 03/14] 2nd upload --- k8s-specifications/db-deployment.yaml | 3 +++ k8s-specifications/db-service.yaml | 3 +++ k8s-specifications/redis-deployment.yaml | 3 +++ k8s-specifications/redis-service.yaml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/k8s-specifications/db-deployment.yaml b/k8s-specifications/db-deployment.yaml index bc94ca7368..279c52c27a 100644 --- a/k8s-specifications/db-deployment.yaml +++ b/k8s-specifications/db-deployment.yaml @@ -1,6 +1,9 @@ apiVersion: apps/v1 kind: Deployment metadata: + annotations: + argocd.argoproj.io/sync-wave: "2" + argocd.argoproj.io/sync-options: "Sync-Wait" labels: app: db name: db diff --git a/k8s-specifications/db-service.yaml b/k8s-specifications/db-service.yaml index 104f1e8268..06fd526053 100644 --- a/k8s-specifications/db-service.yaml +++ b/k8s-specifications/db-service.yaml @@ -1,6 +1,9 @@ apiVersion: v1 kind: Service metadata: + annotations: + argocd.argoproj.io/sync-wave: "2" + argocd.argoproj.io/sync-options: "Sync-Wait" labels: app: db name: db diff --git a/k8s-specifications/redis-deployment.yaml b/k8s-specifications/redis-deployment.yaml index 24aa52135f..ca67c7ded0 100644 --- a/k8s-specifications/redis-deployment.yaml +++ b/k8s-specifications/redis-deployment.yaml @@ -1,6 +1,9 @@ apiVersion: apps/v1 kind: Deployment metadata: + annotations: + argocd.argoproj.io/sync-wave: "2" + argocd.argoproj.io/sync-options: "Sync-Wait" labels: app: redis name: redis diff --git a/k8s-specifications/redis-service.yaml b/k8s-specifications/redis-service.yaml index 809d31d875..ddce482336 100644 --- a/k8s-specifications/redis-service.yaml +++ b/k8s-specifications/redis-service.yaml @@ -1,6 +1,9 @@ apiVersion: v1 kind: Service metadata: + annotations: + argocd.argoproj.io/sync-wave: "2" + argocd.argoproj.io/sync-options: "Sync-Wait" labels: app: redis name: redis From ead5bc3f356459ba61d02bc542bf3e3a3b44ae5c Mon Sep 17 00:00:00 2001 From: YasinduDD Date: Tue, 20 Aug 2024 14:22:44 +0530 Subject: [PATCH 04/14] push 3 --- k8s-specifications/worker-deployment.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/k8s-specifications/worker-deployment.yaml b/k8s-specifications/worker-deployment.yaml index 9e35450aec..24ef070c9f 100644 --- a/k8s-specifications/worker-deployment.yaml +++ b/k8s-specifications/worker-deployment.yaml @@ -4,6 +4,9 @@ metadata: labels: app: worker name: worker + annotations: + argocd.argoproj.io/sync-wave: "3" + argocd.argoproj.io/sync-options: "Sync-Wait" spec: replicas: 1 selector: From 71ba1659d336582444a7cd02e120f706ff90103f Mon Sep 17 00:00:00 2001 From: YasinduDD Date: Tue, 20 Aug 2024 14:42:29 +0530 Subject: [PATCH 05/14] change svc name --- k8s-specifications/db-service.yaml | 2 +- k8s-specifications/redis-service.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s-specifications/db-service.yaml b/k8s-specifications/db-service.yaml index 06fd526053..7d3f699b76 100644 --- a/k8s-specifications/db-service.yaml +++ b/k8s-specifications/db-service.yaml @@ -6,7 +6,7 @@ metadata: argocd.argoproj.io/sync-options: "Sync-Wait" labels: app: db - name: db + name: db-svc spec: type: ClusterIP ports: diff --git a/k8s-specifications/redis-service.yaml b/k8s-specifications/redis-service.yaml index ddce482336..b3b6b7d7e1 100644 --- a/k8s-specifications/redis-service.yaml +++ b/k8s-specifications/redis-service.yaml @@ -6,7 +6,7 @@ metadata: argocd.argoproj.io/sync-options: "Sync-Wait" labels: app: redis - name: redis + name: redis-svc spec: type: ClusterIP ports: From adeeca5856b9edfdac5475641425f83ce9e87688 Mon Sep 17 00:00:00 2001 From: YasinduDD Date: Tue, 20 Aug 2024 14:49:15 +0530 Subject: [PATCH 06/14] svc names changed back --- k8s-specifications/db-service.yaml | 2 +- k8s-specifications/redis-service.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s-specifications/db-service.yaml b/k8s-specifications/db-service.yaml index 7d3f699b76..06fd526053 100644 --- a/k8s-specifications/db-service.yaml +++ b/k8s-specifications/db-service.yaml @@ -6,7 +6,7 @@ metadata: argocd.argoproj.io/sync-options: "Sync-Wait" labels: app: db - name: db-svc + name: db spec: type: ClusterIP ports: diff --git a/k8s-specifications/redis-service.yaml b/k8s-specifications/redis-service.yaml index b3b6b7d7e1..ddce482336 100644 --- a/k8s-specifications/redis-service.yaml +++ b/k8s-specifications/redis-service.yaml @@ -6,7 +6,7 @@ metadata: argocd.argoproj.io/sync-options: "Sync-Wait" labels: app: redis - name: redis-svc + name: redis spec: type: ClusterIP ports: From 0bf563f9d4498053f720a86b5b4d6e6cf1d9c408 Mon Sep 17 00:00:00 2001 From: Yasindu Dissanayake Date: Tue, 20 Aug 2024 16:01:33 +0530 Subject: [PATCH 07/14] Update worker-deployment.yaml --- k8s-specifications/worker-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-specifications/worker-deployment.yaml b/k8s-specifications/worker-deployment.yaml index 24ef070c9f..8d1484718c 100644 --- a/k8s-specifications/worker-deployment.yaml +++ b/k8s-specifications/worker-deployment.yaml @@ -8,7 +8,7 @@ metadata: argocd.argoproj.io/sync-wave: "3" argocd.argoproj.io/sync-options: "Sync-Wait" spec: - replicas: 1 + replicas: 2 selector: matchLabels: app: worker From d1a09d32a2cbe045a02a2ac7084234a5047c8ba3 Mon Sep 17 00:00:00 2001 From: Yasindu Dissanayake Date: Tue, 20 Aug 2024 16:03:06 +0530 Subject: [PATCH 08/14] Update vote-deployment.yaml --- k8s-specifications/vote-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-specifications/vote-deployment.yaml b/k8s-specifications/vote-deployment.yaml index ab9afc378c..8265e275e5 100644 --- a/k8s-specifications/vote-deployment.yaml +++ b/k8s-specifications/vote-deployment.yaml @@ -7,7 +7,7 @@ metadata: app: vote name: vote spec: - replicas: 1 + replicas: 2 selector: matchLabels: app: vote From e014d36d73513f9cab286e446284edf26cf05dd0 Mon Sep 17 00:00:00 2001 From: YasinduDD Date: Tue, 20 Aug 2024 16:20:11 +0530 Subject: [PATCH 09/14] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 574365042e..71e9ceea18 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -CHANGE MADE +CHANGE MADE in test branch test # Example Voting App From f000afcc24376413e1751224137c51e8de92268d Mon Sep 17 00:00:00 2001 From: YasinduDD Date: Tue, 20 Aug 2024 16:28:07 +0530 Subject: [PATCH 10/14] change --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71e9ceea18..e4e090b39f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -CHANGE MADE in test branch test +CHANGE MADE in test branch test changed again # Example Voting App From 5afabea0ecfc652cd115e6dba68c52a70d611c9f Mon Sep 17 00:00:00 2001 From: Yasindu Dissanayake Date: Tue, 20 Aug 2024 16:42:02 +0530 Subject: [PATCH 11/14] Update worker-deployment.yaml --- k8s-specifications/worker-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-specifications/worker-deployment.yaml b/k8s-specifications/worker-deployment.yaml index 8d1484718c..43c5697229 100644 --- a/k8s-specifications/worker-deployment.yaml +++ b/k8s-specifications/worker-deployment.yaml @@ -8,7 +8,7 @@ metadata: argocd.argoproj.io/sync-wave: "3" argocd.argoproj.io/sync-options: "Sync-Wait" spec: - replicas: 2 + replicas: 3 selector: matchLabels: app: worker From d084a23c55e42e6c86057f860567e6158acfdbc2 Mon Sep 17 00:00:00 2001 From: YasinduDD Date: Tue, 10 Sep 2024 16:12:01 +0530 Subject: [PATCH 12/14] worker replica is 1 --- k8s-specifications/worker-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-specifications/worker-deployment.yaml b/k8s-specifications/worker-deployment.yaml index 8d1484718c..24ef070c9f 100644 --- a/k8s-specifications/worker-deployment.yaml +++ b/k8s-specifications/worker-deployment.yaml @@ -8,7 +8,7 @@ metadata: argocd.argoproj.io/sync-wave: "3" argocd.argoproj.io/sync-options: "Sync-Wait" spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: worker From 231150f8c96cfc7b5569c354e4ddacf86d8c6d17 Mon Sep 17 00:00:00 2001 From: YasinduDD Date: Tue, 10 Sep 2024 16:15:38 +0530 Subject: [PATCH 13/14] ,, --- k8s-specifications/worker-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-specifications/worker-deployment.yaml b/k8s-specifications/worker-deployment.yaml index 43c5697229..24ef070c9f 100644 --- a/k8s-specifications/worker-deployment.yaml +++ b/k8s-specifications/worker-deployment.yaml @@ -8,7 +8,7 @@ metadata: argocd.argoproj.io/sync-wave: "3" argocd.argoproj.io/sync-options: "Sync-Wait" spec: - replicas: 3 + replicas: 1 selector: matchLabels: app: worker From 3b69127cac752f007a56c47d6ac293a5c06939e9 Mon Sep 17 00:00:00 2001 From: Yasindu Dissanayake Date: Fri, 13 Sep 2024 12:23:27 +0530 Subject: [PATCH 14/14] Update worker-deployment.yaml --- k8s-specifications/worker-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-specifications/worker-deployment.yaml b/k8s-specifications/worker-deployment.yaml index 24ef070c9f..8d1484718c 100644 --- a/k8s-specifications/worker-deployment.yaml +++ b/k8s-specifications/worker-deployment.yaml @@ -8,7 +8,7 @@ metadata: argocd.argoproj.io/sync-wave: "3" argocd.argoproj.io/sync-options: "Sync-Wait" spec: - replicas: 1 + replicas: 2 selector: matchLabels: app: worker