Fix: ArgoCD 정상화 ..1

Sean-creative · Sean-creative · commit 555afa5652d1 · 2024-05-07T13:30:13.000+09:00
GKE 새로 만들고, 재설정 Related to: #15
diff --git a/.github/workflows/gkeNotUseArgoCD.yaml b/.github/workflows/gkeNotUseArgoCD.yaml
@@ -1,13 +1,3 @@
-# This workflow will build a docker container, publish it to Google Container Registry, and deploy it to GKE when there is a push to the "main" branch.
-#
-# To configure this workflow:
-#
-# 1. Ensure that your repository contains the necessary configuration for your Google Kubernetes Engine cluster, including deployment.yml, kustomization.yml, service.yml, etc.
-# 2. Create and configure a Workload Identity Provider for GitHub (https://github.com/google-github-actions/auth#setting-up-workload-identity-federation)
-#
-# 3. Change the values for the GAR_LOCATION, GKE_ZONE, GKE_CLUSTER, IMAGE, REPOSITORY and DEPLOYMENT_NAME environment variables (below).
-#
-# For more support on how to run the workflow, please visit https://github.com/google-github-actions/setup-gcloud/tree/master/example-workflows/gke-kustomize
 
 #GKE를 통해 완전 배포까지 (Argo CD는 사용 안하고)
 name: Build and Deploy to GKE
@@ -20,11 +10,11 @@ env:
   GKE_PROJECT: ${{ secrets.GKE_PROJECT }}
   GKE_EMAIL: ${{ secrets.GKE_EMAIL }}
   GITHUB_SHA: ${{ github.sha }}
-  GKE_ZONE: asia-east1-a
-  GKE_CLUSTER: jsvill-cluster-1
-  IMAGE: demo
+  GKE_ZONE: ${{ secrets.GKE_ZONE }}
+  GKE_CLUSTER: ${{ secrets.GKE_CLUSTER }}
   REGISTRY_HOSTNAME: gcr.io
-  DEPLOYMENT_NAME: demo
+  IMAGE: jsvill-fullstack
+  DEPLOYMENT_NAME: jsvill-fullstack
 
 jobs:
   #job을 여러개로 나누면, job마다 checkout을 중복으로 해줘야함해서 하나로함
diff --git a/.github/workflows/union.yaml b/.github/workflows/union.yaml
@@ -1,5 +1,5 @@
 
-#차트 배포까지 하는중
+#두개를 하나로 합쳐서 빌드 후 차트 배포까지 하는중
 name: Build and Deploy to GKE For Argo CD
 on:
   push:
@@ -12,12 +12,12 @@ env:
   GKE_PROJECT: ${{ secrets.GKE_PROJECT }}
   GKE_EMAIL: ${{ secrets.GKE_EMAIL }}
 #  GITHUB_SHA: ${{ github.sha }}
-  GKE_ZONE: asia-east1-a
-  GKE_CLUSTER: jsvill-cluster-1
+  GKE_ZONE: ${{ secrets.GKE_ZONE }}
+  GKE_CLUSTER: ${{ secrets.GKE_CLUSTER }}
   REGISTRY_HOSTNAME: gcr.io
-  IMAGE: jsvill
+  IMAGE: jsvill-fullstack
   IMAGE_TAG: latest
-  DEPLOYMENT_NAME: jsvill
+  DEPLOYMENT_NAME: jsvill-fullstack
 
 jobs:
   #job을 여러개로 나누면, job마다 checkout을 중복으로 해줘야함해서 하나로함
diff --git a/charts/jsvill-chart/values.yaml b/charts/jsvill-chart/values.yaml
@@ -1 +1 @@
-image: gcr.io/lucid-sonar-418815/jsvill:latest
+image: gcr.io/single-quanta-422507-f2/jsvill-fullstack:latest
diff --git a/src/main/java/com/sjs/jsvill/config/RedisConfig.java b/src/main/java/com/sjs/jsvill/config/RedisConfig.java
@@ -1,9 +1,11 @@
 package com.sjs.jsvill.config;
 
+import com.sjs.jsvill.entity.Member;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 
 @Configuration
 @EnableRedisHttpSession
-public class RedisConfig {
+        public class RedisConfig {
 }
diff --git a/src/main/java/com/sjs/jsvill/controller/group/GroupController.java b/src/main/java/com/sjs/jsvill/controller/group/GroupController.java
@@ -41,7 +41,6 @@ public String register(GroupDTO groupDTO, @AuthenticationPrincipal MemberDTO mem
     }
     @GetMapping("/list")
     public String list(@AuthenticationPrincipal MemberDTO memberDTO, Model model) {
-        Json.stringToJson(memberDTO, "group-list");
         model.addAttribute("result", groupService.getList(memberDTO.getMemberRowid()));
         return "group/list";
     }
diff --git a/src/main/java/com/sjs/jsvill/controller/kafka/ReminderApiController.java b/src/main/java/com/sjs/jsvill/controller/kafka/ReminderApiController.java
@@ -27,7 +27,6 @@ public class ReminderApiController {
 
     @GetMapping(value = "/api/sse-connection", produces = "text/event-stream")
     public SseEmitter stream(@AuthenticationPrincipal MemberDTO memberDTO, @RequestHeader(value = "Last-Event-ID", required = false, defaultValue = "") String lastEventId) throws IOException {
-        log.info("stream-1");
         return consReminderService.addEmitter(String.valueOf(memberDTO.getPhoneNumber()), lastEventId);
     }
 
diff --git a/src/main/java/com/sjs/jsvill/service/calendar/CalendarServiceImpl.java b/src/main/java/com/sjs/jsvill/service/calendar/CalendarServiceImpl.java
@@ -48,7 +48,6 @@ public List<CalendarDTO> findEventsWithinNextWeek() {
     public void register(CalendarDTO calendarDTO) {
         log.info("calendarDTO-register: " + calendarDTO);
         List<Calendar> calendarList = Calendar.dtoToEntities(calendarDTO, true);
-        Json.stringToJson(calendarList, "service-register");
         //loopDays 루프로 등록
         calendarRepository.saveAll(calendarList);
     }
diff --git a/src/main/java/com/sjs/jsvill/service/kafka/ConsReminderService.java b/src/main/java/com/sjs/jsvill/service/kafka/ConsReminderService.java
@@ -24,30 +24,44 @@
 public class ConsReminderService {
     private final ReminderService reminderService;
     private final EmitterRepository emitterRepository;
-    @KafkaListener(topics = "calendar-reminder-schedule", groupId = "group_1")
-    public void listenForSchedule(ReminderMessage reminderMessage) {
-        try {
-            log.info("인위적으로 폴링 간격을 늘림 -- 2초 지연");
-            Thread.sleep(2000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
 
-        //스케줄로 메세지를 컨슘하려면 -> 리마인더에 넣어야함
-        Reminder reminder = Reminder.builder()
-                .member(Member.builder().memberRowid(reminderMessage.getMemberRowid()).build())
-                .contents(reminderMessage.getContents())
-                .daysAgo(reminderMessage.getDaysAgo())
-                .build();
-        reminderService.createReminder(reminder);
+    //브라우저에 연결
+    public SseEmitter addEmitter(String userPhone, String lastEventId) {
+        log.info("addEmitter-1 userPhone : {}, lastEventId : {}", userPhone, lastEventId);
+        String emitterId = userPhone + "_" + System.currentTimeMillis();
+        SseEmitter emitter = emitterRepository.save(emitterId, new SseEmitter(DEFAULT_TIMEOUT));
+        log.info("emitterId : {} 사용자 emitter 연결 ", emitterId);
+
+        emitter.onCompletion(() -> {
+            log.info("onCompletion callback");
+            emitterRepository.deleteById(emitterId);
+        });
+        emitter.onTimeout(() -> {
+            log.info("onTimeout callback");
+            emitterRepository.deleteById(emitterId);
+        });
+
+        sendToClient(emitter, emitterId, "connected!"); // 503 에러방지 더미 데이터
+
+        log.info("!lastEventId.isEmpty() : {}",!lastEventId.isEmpty());
+        if (!lastEventId.isEmpty()) {
+            //서버-클라이언트 간에 연결이 끊겼을 때, 클라이언트가 마지막으로 수신한 이벤트 ID를 서버에 알려주어 서버가 해당 지점부터 이벤트를 다시 전송할 수 있도록
+            Map<String, Object> events = emitterRepository.findAllEventCacheStartWithById(userPhone);
+            events.entrySet().stream()
+                    .filter(entry -> lastEventId.compareTo(entry.getKey()) < 0)
+                    .forEach(entry -> {
+                        sendToClient(emitter, entry.getKey(), entry.getValue());
+                    });
+        }
+        return emitter;
     }
 
     //Emitter는 데이터 스트림을 클라이언트로 보내는 역할을 하는 객체이다.
     //SSE 연결된 클라이언트에게 실시간으로 알림을 전달한다.
     @KafkaListener(topics = "calendar-reminder-emitter", groupId = "group_1")
     public void listenForEmitter(ReminderMessage reminderMessage) {
         try {
-            log.info("인위적으로 폴링 간격을 늘림 -- 2초 지연");
+            log.info("calendar-reminder-emitter, 인위적으로 폴링 간격을 늘림 -- 2초 지연");
             Thread.sleep(2000);
         } catch (InterruptedException e) {
             e.printStackTrace();
@@ -88,37 +102,26 @@ private void sendToClient(SseEmitter emitter, String emitterId, Object data) {
         }
     }
 
-    //브라우저에 대한 연결
-    public SseEmitter addEmitter(String userPhone, String lastEventId) {
-        log.info("addEmitter-1 userPhone : {}, lastEventId : {}", userPhone, lastEventId);
-        String emitterId = userPhone + "_" + System.currentTimeMillis();
-        SseEmitter emitter = emitterRepository.save(emitterId, new SseEmitter(DEFAULT_TIMEOUT));
-        log.info("emitterId : {} 사용자 emitter 연결 ", emitterId);
 
-        emitter.onCompletion(() -> {
-            log.info("onCompletion callback");
-            emitterRepository.deleteById(emitterId);
-        });
-        emitter.onTimeout(() -> {
-            log.info("onTimeout callback");
-            emitterRepository.deleteById(emitterId);
-        });
-
-        sendToClient(emitter, emitterId, "connected!"); // 503 에러방지 더미 데이터
-
-        log.info("!lastEventId.isEmpty() : {}",!lastEventId.isEmpty());
-        if (!lastEventId.isEmpty()) {
-            //서버-클라이언트 간에 연결이 끊겼을 때, 클라이언트가 마지막으로 수신한 이벤트 ID를 서버에 알려주어 서버가 해당 지점부터 이벤트를 다시 전송할 수 있도록
-            Map<String, Object> events = emitterRepository.findAllEventCacheStartWithById(userPhone);
-            events.entrySet().stream()
-                    .filter(entry -> lastEventId.compareTo(entry.getKey()) < 0)
-                    .forEach(entry -> {
-                        sendToClient(emitter, entry.getKey(), entry.getValue());
-                    });
+    @KafkaListener(topics = "calendar-reminder-schedule", groupId = "group_1")
+    public void listenForSchedule(ReminderMessage reminderMessage) {
+        try {
+            log.info("calendar-reminder-schedule, 인위적으로 폴링 간격을 늘림 -- 2초 지연");
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
         }
-        return emitter;
+
+        //스케줄로 메세지를 컨슘하려면 -> 리마인더에 넣어야함
+        Reminder reminder = Reminder.builder()
+                .member(Member.builder().memberRowid(reminderMessage.getMemberRowid()).build())
+                .contents(reminderMessage.getContents())
+                .daysAgo(reminderMessage.getDaysAgo())
+                .build();
+        reminderService.createReminder(reminder);
     }
 
+
     @Scheduled(fixedRate = 180000) // 3분마다 heartbeat 메세지 전달.
     public void sendHeartbeat() {
         Map<String, SseEmitter> sseEmitters = emitterRepository.findAllEmitters();
diff --git a/src/main/java/com/sjs/jsvill/service/kafka/ProdReminderService.java b/src/main/java/com/sjs/jsvill/service/kafka/ProdReminderService.java
@@ -17,8 +17,6 @@ public ProdReminderService(KafkaTemplate<String, ReminderMessage> kafkaTemplate)
     }
 
     public void sendToProducer(ReminderMessage reminderMessage, boolean isSchedule) {
-        log.info("sendToProducer-1");
-
         if(isSchedule) kafkaTemplate.send("calendar-reminder-schedule", reminderMessage);
         else kafkaTemplate.send("calendar-reminder-emitter", reminderMessage);
     }
diff --git a/src/main/resources/templates/member/login.html b/src/main/resources/templates/member/login.html
@@ -11,7 +11,7 @@
 </head>
 <body>
     <h1>
-        🔑🔑🔑 로그인 🔑🔑🔑
+        🔑 로그인 🔑
     </h1>
     <p class="loginGuide">
         최초 로그인 시에는 휴대폰번호 인증이 필요합니다.
diff --git a/test.yml b/test.yml

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-image: gcr.io/lucid-sonar-418815/jsvill:latest`
	`1`	`+image: gcr.io/single-quanta-422507-f2/jsvill-fullstack:latest`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public String register(GroupDTO groupDTO, @AuthenticationPrincipal MemberDTO mem`
`41`	`41`	`}`
`42`	`42`	`@GetMapping("/list")`
`43`	`43`	`public String list(@AuthenticationPrincipal MemberDTO memberDTO, Model model) {`
`44`		`- Json.stringToJson(memberDTO, "group-list");`
`45`	`44`	`model.addAttribute("result", groupService.getList(memberDTO.getMemberRowid()));`
`46`	`45`	`return "group/list";`
`47`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ public class ReminderApiController {`
`27`	`27`
`28`	`28`	`@GetMapping(value = "/api/sse-connection", produces = "text/event-stream")`
`29`	`29`	`public SseEmitter stream(@AuthenticationPrincipal MemberDTO memberDTO, @RequestHeader(value = "Last-Event-ID", required = false, defaultValue = "") String lastEventId) throws IOException {`
`30`		`- log.info("stream-1");`
`31`	`30`	`return consReminderService.addEmitter(String.valueOf(memberDTO.getPhoneNumber()), lastEventId);`
`32`	`31`	`}`
`33`	`32`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ public List<CalendarDTO> findEventsWithinNextWeek() {`
`48`	`48`	`public void register(CalendarDTO calendarDTO) {`
`49`	`49`	`log.info("calendarDTO-register: " + calendarDTO);`
`50`	`50`	`List<Calendar> calendarList = Calendar.dtoToEntities(calendarDTO, true);`
`51`		`- Json.stringToJson(calendarList, "service-register");`
`52`	`51`	`//loopDays 루프로 등록`
`53`	`52`	`calendarRepository.saveAll(calendarList);`
`54`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ public ProdReminderService(KafkaTemplate<String, ReminderMessage> kafkaTemplate)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public void sendToProducer(ReminderMessage reminderMessage, boolean isSchedule) {`
`20`		`- log.info("sendToProducer-1");`
`21`		`-`
`22`	`20`	`if(isSchedule) kafkaTemplate.send("calendar-reminder-schedule", reminderMessage);`
`23`	`21`	`else kafkaTemplate.send("calendar-reminder-emitter", reminderMessage);`
`24`	`22`	`}`