Update StatisticsRepository.java

Kubernetes v1.28 기준으로 수정

.github/ISSUE_TEMPLATE/amendment_request.yml

@@ -1,35 +0,0 @@
-name: 개발가이드 수정 요청 Requesting changes to the development guide
-description: 개발가이드 수정 요청하는 템플릿입니다. Template for requesting changes to the dev guide.
-title: "[Guide]: "
-labels: ["guide"]
-assignees:
-  - overpassion
-body:
-  - type: markdown
-    attributes:
-      value: |
-        시간을 내어 개발가이드 수정 요청을 작성해 주셔서 감사합니다. Thank you for taking the time to fill out a DevGuide correction request. (공유하고 싶은 기술문서나 노하우는 github wiki에 남겨 주세요. If you have any documentation or know-how you'd like to share, please leave it on our github wiki.)
-  - type: input
-    id: url
-    attributes:
-      label: 개발가이드 URL Dev Guide URL
-      description: 수정해야할 개발가이드 URL을 적어 주세요. Please write down the dev guide URL that needs to be modified.
-      placeholder: Example) https://www.egovframe.go.kr/wiki/doku.php?id=egovframework:rte4.1:fdl:aop:aspectj
-    validations:
-      required: true
-  - type: textarea
-    id: where-to-amend
-    attributes:
-      label: 수정 대상 내용 What to fix
-      description: 수정해야할 대상 내용을 기입해 주세요. Fill in what you need to fix.
-      placeholder: 수정해야할 대상은 다음과 같습니다. Here's what you'll need to modify
-    validations:
-      required: true
-  - type: textarea
-    id: amendment
-    attributes:
-      label: 수정 문구 Corrective Wording
-      description: 어떻게 수정되어야 하는지 적어주세요. Please write down how it should be fixed.
-      placeholder: 다음과 같이 수정되어야 합니다. It should be modified as follows
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -3,7 +3,7 @@ description: 오류 내용을 이슈로 등록하는 템플릿입니다. Templat
 title: "[Bug]: "
 labels: ["bug", "triage"]
 assignees:
-  - overpassion
+  - rukegithub
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,9 +1,9 @@
-name: 기능 요구 및 의견 Feature Request
+name: 기능 요구 Feature Request
-description: 기능 요구나 기타 의견을 이슈로 등록하는 템플릿입니다. Suggest an idea for improving eGovFrame.
+description: 기능 요구를 이슈로 등록하는 템플릿입니다. Suggest a new feature for improving eGovFrame.
 title: "[기능요구(Feature)]: "
 labels: ["feature"]
 assignees:
-  - overpassion
+  - rukegithub
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/improvement_plan.yml

@@ -0,0 +1,55 @@
+name: 발전 방안 제안 Improvement Plan
+description: 발전 방안을 이슈로 등록하는 템플릿입니다. Suggest a new plan for improving eGovFrame.
+title: "[발전 방안 제안(Improvement Plan)]: "
+labels: ["Improvement"]
+assignees:
+  - yongfire38
+body:
+  - type: markdown
+    attributes:
+      value: |
+        시간을 내어 의견을 작성해 주셔서 감사합니다. Thank you for taking the time to fill out a request.
+  - type: input
+    id: idea-name
+    attributes:
+      label: 아이디어명 Idea Name
+    validations:
+      required: true
+  - type: textarea
+    id: idea-summary
+    attributes:
+      label: 아이디어 요약 Idea Summary
+      description: 과제 내용을 300자 이내로 간결하게 요약 및 정의해 주세요 Please summarize and define your content in 300 characters or less
+      placeholder: 예) 게시판 첨부기능 추가 Example) Adding a bulletin board attachment
+    validations:
+      required: true
+  - type: textarea
+    id: suggestion-background
+    attributes:
+      label: 제안배경 Suggestion Background
+      description: 아이디어를 제안하게 된 배경 및 필요성을 기술해 주세요. Please describe the background and need for the idea.
+      placeholder: 아이디어를 제안하게 된 배경은 다음과 같습니다. The background to suggesting the idea is as follows.
+    validations:
+      required: true
+  - type: textarea
+    id: expectations
+    attributes:
+      label: 기대효과 Expectations
+      description: 아이디어의 실현 가능성과 예상되는 기대효과를 제시하여 주세요. Please describe the expected impact and outcome of the idea.
+      placeholder: 해당 아이디어의 기대효과는 다음과 같습니다. Here are the expected effects of this idea.
+    validations:
+      required: false
+  - type: textarea
+    id: free-writing
+    attributes:
+      label: 자유기술 Free Writing
+      description: 추가 기재하고 싶은 항목 및 내용을 자유롭게 기재하여 주세요. Please feel free to add anything else you'd like to include.
+    validations:
+      required: false
+  - type: textarea
+    id: reference
+    attributes:
+      label: 참고문헌 Reference
+      description: 참고문헌이 있는 경우 작성하여 주세요. If you have references, please include them.
+    validations:
+      required: false

README-en.md

@@ -96,25 +96,25 @@ This is the training source code for the Microservices Architecture (MSA) templa
     │      │  └─ingress
     │      └─portal
     │          └─ingress
-    ├─environments
+    └─environments
-    │  ├─configmaps
+        ├─configmaps
-    │  ├─databases
+        ├─databases
-    │  │  └─mysql
+        │  └─mysql
-    │  │      └─init
+        │      └─init
-    │  ├─jenkins
+        ├─jenkins
-    │  ├─logging
+        ├─logging
-    │  │  └─elk
+        │  └─elk
-    │  │      ├─elasticsearch
+        │      ├─elasticsearch
-    │  │      ├─kibana
+        │      ├─kibana
-    │  │      │  └─ingress
-    │  │      └─logstash
-    │  ├─nfs
-    │  ├─rabbitmq
         │      │  └─ingress
-    │  ├─vagrant
+        │      └─logstash
-    │  └─zipkin
+        ├─nfs
+        ├─rabbitmq
         │  └─ingress
-    └─storage
+        ├─storage
+        ├─vagrant
+        └─zipkin
+            └─ingress
 ```
 
 ### Contents

README.md

@@ -96,25 +96,25 @@
     │      │  └─ingress
     │      └─portal
     │          └─ingress
-    ├─environments
+    └─environments
-    │  ├─configmaps
+        ├─configmaps
-    │  ├─databases
+        ├─databases
-    │  │  └─mysql
+        │  └─mysql
-    │  │      └─init
+        │      └─init
-    │  ├─jenkins
+        ├─jenkins
-    │  ├─logging
+        ├─logging
-    │  │  └─elk
+        │  └─elk
-    │  │      ├─elasticsearch
+        │      ├─elasticsearch
-    │  │      ├─kibana
+        │      ├─kibana
-    │  │      │  └─ingress
-    │  │      └─logstash
-    │  ├─nfs
-    │  ├─rabbitmq
         │      │  └─ingress
-    │  ├─vagrant
+        │      └─logstash
-    │  └─zipkin
+        ├─nfs
+        ├─rabbitmq
         │  └─ingress
-    └─storage
+        ├─storage
+        ├─vagrant
+        └─zipkin
+            └─ingress
 ```
 
 ### 디렉토리 설명

backend/apigateway/src/main/java/org/egovframe/cloud/apigateway/api/MessageSourceApiController.java

@@ -3,7 +3,6 @@ package org.egovframe.cloud.apigateway.api;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.MessageSource;
-import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,6 +24,7 @@ import java.util.Locale;
  *     수정일        수정자           수정내용
  *  ----------    --------    ---------------------------
  *  2021/08/10    jaeyeolkim  최초 생성
+ *  2024/09/24    이백행        컨트리뷰션 이클립스 문제(Problems) 해결
  * </pre>
  */
 @Slf4j

backend/apigateway/src/main/java/org/egovframe/cloud/apigateway/exception/ReactiveExceptionHandlerConfig.java

@@ -6,8 +6,6 @@ import org.springframework.boot.web.error.ErrorAttributeOptions;
 import org.springframework.boot.web.reactive.error.DefaultErrorAttributes;
 import org.springframework.boot.web.reactive.error.ErrorAttributes;
 import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.reactive.function.server.ServerRequest;
 
@@ -31,6 +29,7 @@ import java.util.Map;
  *     수정일        수정자           수정내용
  *  ----------    --------    ---------------------------
  *  2021/07/16    jaeyeolkim  최초 생성
+ *  2024/09/24    이백행        컨트리뷰션 이클립스 문제(Problems) 해결
  * </pre>
  */
 @Slf4j

backend/discovery/src/main/java/org/egovframe/cloud/discovery/SecurityConfig.java

@@ -1,8 +1,9 @@
 package org.egovframe.cloud.discovery;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
 
 /**
  * org.egovframe.cloud.discovery.SecurityConfig
@@ -20,10 +21,11 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
  *     수정일        수정자           수정내용
  *  ----------    --------    ---------------------------
  *  2021/06/30    jaeyeolkim  최초 생성
+ *  2024/09/23    이백행        컨트리뷰션 이클립스 문제(Problems) 해결
  * </pre>
  */
 @EnableWebSecurity // Spring Security 설정들을 활성화시켜 준다
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
+public class SecurityConfig  {
 
     /**
      * 스프링 시큐리티 설정
@@ -31,8 +33,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
      * @param http
      * @throws Exception
      */
-    @Override
+    @Bean
-    protected void configure(HttpSecurity http) throws Exception {
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         http
                 .csrf().disable()
                 .headers().frameOptions().disable()
@@ -42,6 +44,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .anyRequest().authenticated()
             .and()
                 .httpBasic();
+        return http.build();
     }
 
 }

backend/user-service/src/main/java/org/egovframe/cloud/userservice/config/CustomOAuth2UserService.java

@@ -30,6 +30,7 @@ import java.util.Collections;
  *     수정일        수정자           수정내용
  *  ----------    --------    ---------------------------
  *  2021/06/30    jaeyeolkim  최초 생성
+ *  2024/09/25    이백행        컨트리뷰션 이클립스 문제(Problems) 해결
  * </pre>
  */
 @RequiredArgsConstructor
@@ -47,7 +48,8 @@ public class CustomOAuth2UserService implements OAuth2UserService<OAuth2UserRequ
      */
     @Override
     public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
-        OAuth2UserService delegate = new DefaultOAuth2UserService();
+//        OAuth2UserService delegate = new DefaultOAuth2UserService();
+        OAuth2UserService<OAuth2UserRequest, OAuth2User> delegate = new DefaultOAuth2UserService();
         OAuth2User oAuth2User = delegate.loadUser(userRequest);
 
         // 현재 로그인 진행 중인 서비스를 구분하는 코드(구글 or 네이버..)

backend/user-service/src/main/java/org/egovframe/cloud/userservice/config/dto/SessionUser.java

@@ -26,6 +26,10 @@ import java.io.Serializable;
  */
 @Getter
 public class SessionUser implements Serializable {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -6319235143325686744L;
     private String userName;
     private String email;
 

backend/user-service/src/main/java/org/egovframe/cloud/userservice/service/role/AuthorizationService.java

@@ -70,6 +70,9 @@ public class AuthorizationService extends AbstractService {
      * @return Page<AuthorizationListResponseDto> 페이지 인가 목록 응답 DTO
      */
     public Page<AuthorizationListResponseDto> findPage(RequestDto requestDto, Pageable pageable) {
+        if (log.isDebugEnabled()) {
+            log.debug("requestDto={}", requestDto);
+        }
         return authorizationRepository.findPage(requestDto, pageable);
     }
 

backend/user-service/src/main/java/org/egovframe/cloud/userservice/service/user/UserService.java

@@ -807,51 +807,51 @@ public class UserService extends AbstractService implements UserDetailsService {
         return user.orElse(null);
     }
 
-    /**
+//    /**
-     * 소셜 사용자 엔티티 조회
+//     * 소셜 사용자 엔티티 조회
-     * 등록되어 있지 않은 경우 사용자 등록
+//     * 등록되어 있지 않은 경우 사용자 등록
-     *
+//     *
-     * @param providerCode 공급자 코드
+//     * @param providerCode 공급자 코드
-     * @param providerId   공급자 id
+//     * @param providerId   공급자 id
-     * @param email        이메일
+//     * @param email        이메일
-     * @param userName     사용자 명
+//     * @param userName     사용자 명
-     * @return UserLoginRequestDto 사용자 로그인 요청 DTO
+//     * @return UserLoginRequestDto 사용자 로그인 요청 DTO
-     */
+//     */
-    private UserResponseDto getAndSaveSocialUser(String providerCode, String providerId, String email, String userName) {
+//    private UserResponseDto getAndSaveSocialUser(String providerCode, String providerId, String email, String userName) {
-        User user = findSocialUser(providerCode, providerId);
+//        User user = findSocialUser(providerCode, providerId);
-
+//
-        // 이메일로 조회
+//        // 이메일로 조회
-        // 공급자에서 동일한 이메일을 사용할 수 있고
+//        // 공급자에서 동일한 이메일을 사용할 수 있고
-        // 현재 시스템 구조 상 이메일을 사용자 식별키로 사용하고 있어서 이메일로 사용자를 한번 더 검색한다.
+//        // 현재 시스템 구조 상 이메일을 사용자 식별키로 사용하고 있어서 이메일로 사용자를 한번 더 검색한다.
-        if (user == null) {
+//        if (user == null) {
-            user = userRepository.findByEmail(email).orElse(null);
+//            user = userRepository.findByEmail(email).orElse(null);
-
+//
-            // 공급자 id로 조회되지 않지만 이메일로 조회되는 경우 공급자 id 등록
+//            // 공급자 id로 조회되지 않지만 이메일로 조회되는 경우 공급자 id 등록
-            if (user != null) {
+//            if (user != null) {
-                user.setSocial(providerCode, providerId);
+//                user.setSocial(providerCode, providerId);
-            }
+//            }
-        }
+//        }
-
+//
-        if (user == null) {
+//        if (user == null) {
-            // 사용자 등록
+//            // 사용자 등록
-            final String userId = UUID.randomUUID().toString();
+//            final String userId = UUID.randomUUID().toString();
-            //final String password = makeRandomPassword(); // 임의 비밀번호 생성 시 복호화 불가능
+//            //final String password = makeRandomPassword(); // 임의 비밀번호 생성 시 복호화 불가능
-
+//
-            user = User.builder()
+//            user = User.builder()
-                    .email(email) // 100byte
+//                    .email(email) // 100byte
-                    //.encryptedPassword(passwordEncoder.encode(password)) // 100 byte
+//                    //.encryptedPassword(passwordEncoder.encode(password)) // 100 byte
-                    .userName(userName)
+//                    .userName(userName)
-                    .userId(userId)
+//                    .userId(userId)
-                    .role(Role.USER)
+//                    .role(Role.USER)
-                    .userStateCode(UserStateCode.NORMAL.getKey())
+//                    .userStateCode(UserStateCode.NORMAL.getKey())
-                    .build();
+//                    .build();
-            user.setSocial(providerCode, providerId);
+//            user.setSocial(providerCode, providerId);
-
+//
-            user = userRepository.save(user);
+//            user = userRepository.save(user);
-
+//
-        }
+//        }
-
+//
-        return new UserResponseDto(user);
+//        return new UserResponseDto(user);
-    }
+//    }
 
 }

backend/user-service/src/test/java/org/egovframe/cloud/userservice/api/role/AuthorizationApiControllerTest.java

@@ -1,6 +1,5 @@
 package org.egovframe.cloud.userservice.api.role;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.egovframe.cloud.userservice.api.role.dto.AuthorizationUpdateRequestDto;
 import org.egovframe.cloud.userservice.domain.role.Authorization;

backend/user-service/src/test/java/org/egovframe/cloud/userservice/config/MessageSourceConfigTest.java

@@ -5,14 +5,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.context.MessageSource;
 
-import java.util.Locale;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @EnableConfigurationProperties

backend/user-service/src/test/java/org/egovframe/cloud/userservice/util/RestResponsePage.java

@@ -30,6 +30,11 @@ import java.util.List;
 public class RestResponsePage<T> extends PageImpl<T> {
 
     /**
+     * 
+     */
+    private static final long serialVersionUID = -5737360124251098346L;
+
+	/**
      * Rest 응답 페이지 생성자
      *
      * @param content          목록

k8s/README-en.md

@@ -0,0 +1,77 @@
+# Deploy services on Kubernetes
+
+In Kubernetes, the service consists of two components,
+
+1. Environments
+2. Applications
+
+And you can choose the storage in the application either NFS or Cinder provided by Openstack(used by [Pasta](http://paas-ta.kr))
+
+# Prerequisites
+
+## Install kustomize
+
+If you are using kubectl 1.14 or later, it embeded kustomize. So please ignore this section.
+I recommend that you install the latest version of [kubectl](https://kubectl.docs.kubernetes.io/installation/kubectl/) for your cluster instead of installing kustomize.
+Even so, if you want to use kustomize, refer to [official kustomize doc](https://kustomize.io/). 
+
+# Deploy service
+
+You must follow deployment order.
+
+## Deploy environments
+
+```sh
+$ kustomize build k8s/environments | kubectl apply -f -
+```
+or if you are using the kubectl only,
+
+```sh
+$ kubectl apply -k k8s/environments
+```
+
+## Deploy applications
+
+If you want to use NFS as a main storage,
+
+```sh
+$ kustomize build k8s/stoage/nfs | kubectl apply -f -
+```
+
+or
+
+```sh
+$ kubectl apply -k k8s/stoage/nfs
+```
+
+In case of using Openstack storage(CINDER) as a main storage,
+
+```sh
+$ kustomize build k8s/stoage/openstack | kubectl apply -f -
+```
+
+or
+
+```sh
+$ kubectl apply -k k8s/stoage/openstack
+```
+
+# Shutdown service
+
+Simply apply deployment in reverse order.
+
+If you are using nfs, 
+
+```sh
+$ kustomize build k8s/environments | kubectl delete -f -
+$ kustomize build k8s/stoage/nfs | kubectl delete -f -  --wait
+```
+
+or
+
+```sh
+$ kubectl delete -k k8s/environments
+$ kubectl delete -k k8s/stoage/nfs --wait
+```
+
+The case of openstack is similar, so it is omitted.

k8s/README.md

@@ -1,77 +1,77 @@
-# Deploy services on Kubernetes
+# Kubernetes에서 서비스 배포
 
-In Kubernetes, the service consists of two components,
+Kubernetes에서 서비스는 두 가지 구성 요소로 이루어져 있습니다.
 
-1. Environments
+1. 환경 (Environments)
-2. Applications
+2. 애플리케이션 (Applications)
 
-And you can choose the storage in the application either NFS or Cinder provided by Openstack(used by [Pasta](http://paas-ta.kr))
+그리고 애플리케이션에서 사용할 스토리지를 선택할 수 있으며, NFS 또는 Openstack이 제공하는 Cinder를 사용할 수 있습니다(이 경우 [PaaS-TA](http://paas-ta.kr)를 사용).
 
-# Prerequisites
+# 사전 준비 {#prerequisites}
 
-## Install kustomize
+## kustomize 설치 {#install-kustomize}
 
-If you are using kubectl 1.14 or later, it embeded kustomize. So please ignore this section.
+kubectl 1.14 이상을 사용하고 있다면, kustomize가 내장되어 있으므로 이 섹션을 무시해도 됩니다.
-I recommend that you install the latest version of [kubectl](https://kubectl.docs.kubernetes.io/installation/kubectl/) for your cluster instead of installing kustomize.
+대신 클러스터에서 최신 버전의 [kubectl](https://kubectl.docs.kubernetes.io/installation/kubectl/)을 설치하는 것을 권장합니다.
-Even so, if you want to use kustomize, refer to [official kustomize doc](https://kustomize.io/). 
+그럼에도 불구하고 kustomize를 사용하고 싶다면, [공식 kustomize 문서](https://kustomize.io/)를 참고하세요.
 
-# Deploy service
+# 서비스 배포 {#deploy-service}
 
-You must follow deployment order.
+배포 순서를 따라야 합니다.
 
-## Deployenvironments
+## 환경 배포 {#deploy-environments}
 
 ```sh
 $ kustomize build k8s/environments | kubectl apply -f -
 ```
-or if you are using the kubectl only,
+혹은 kubectl만 사용하는 경우,
 
 ```sh
 $ kubectl apply -k k8s/environments
 ```
 
-## Deploy applications
+## 애플리케이션 배포 {#deploy-applications}
 
-If you want to use NFS as a main storage,
+NFS를 메인 스토리지로 사용하려면,
 
 ```sh
 $ kustomize build k8s/stoage/nfs | kubectl apply -f -
 ```
 
-or
+혹은
 
 ```sh
 $ kubectl apply -k k8s/stoage/nfs
 ```
 
-In case of using Openstack storage(CINDER) as a main storage,
+Openstack의 스토리지(CINDER)를 메인 스토리지로 사용하는 경우,
 
 ```sh
 $ kustomize build k8s/stoage/openstack | kubectl apply -f -
 ```
 
-or
+혹은
 
 ```sh
 $ kubectl apply -k k8s/stoage/openstack
 ```
 
-# Shutdown service
+## 서비스 종료 {#shutdown-service}
 
-Simply apply deployment in reverse order.
+단순히 배포 순서를 반대로 적용하면 됩니다.
 
-If you are using nfs, 
+NFS를 사용하는 경우,
 
 ```sh
 $ kustomize build k8s/environments | kubectl delete -f -
 $ kustomize build k8s/stoage/nfs | kubectl delete -f -  --wait
 ```
 
-or
+혹은
 
 ```sh
 $ kubectl delete -k k8s/environments
 $ kubectl delete -k k8s/stoage/nfs --wait
 ```
 
-The case of openstack is similar, so it is omitted.
+Openstack의 경우도 비슷하므로 생략합니다.

k8s/environments/databases/mysql/pv.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: mysql-pv
+  labels:
+    env: production
+    tier: database
+    app: mysql
+    name: mysql-pv
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteMany
+  storageClassName: nfs
+  persistentVolumeReclaimPolicy: Retain
+  nfs:
+    path: /srv/nfs
+    server: 192.168.56.21

k8s/environments/databases/mysql/statefulset.yaml

@@ -32,7 +32,7 @@ spec:
             - "-c"
             - |
               set -ex
-              [[ `hostname` =~ -([0-9]+)$ ]] || exit 1
+              [[ $HOSTNAME =~ -([0-9]+)$ ]] || exit 1
               ordinal=${BASH_REMATCH[1]}
               echo [mysqld] > /mnt/conf.d/server-id.cnf
               echo server-id=$((100 + $ordinal)) >> /mnt/conf.d/server-id.cnf

k8s/environments/jenkins/ingress.yaml

@@ -1,18 +0,0 @@
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: jenkins-ingress
-  labels:
-    env: production
-    tier: cicd
-    app: jenkins
-    name: jenkins-ingress
-spec:
-  rules:
-    - host: <젠킨스 도메인> # TODO
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: jenkins
-              servicePort: 8080

k8s/environments/jenkins/ingress/ingress.yaml

@@ -0,0 +1,20 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: jenkins-ingress
+  labels:
+    env: production
+    tier: cicd
+    app: jenkins
+spec:
+  rules:
+    - host: <Jenkins 도메인> # TODO
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: jenkins
+                port:
+                  number: 8080

k8s/environments/jenkins/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: jenkins

k8s/environments/jenkins/pv.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: jenkins-pv
+  labels:
+    env: production
+    tier: cicd
+    app: jenkins
+    name: jenkins-pv
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteMany
+  storageClassName: nfs
+  persistentVolumeReclaimPolicy: Retain
+  nfs:
+    path: /srv/nfs
+    server: 192.168.56.21

k8s/environments/jenkins/role.yaml

@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  namespace: jenkins
+  name: jenkins-role
+rules:
+- apiGroups: ["networking.k8s.io"]
+  resources: ["ingresses"]
+  verbs: ["get", "create", "update", "delete"]
+- apiGroups: [""]
+  resources: ["services"]
+  verbs: ["get", "create", "update", "delete"]
+- apiGroups: ["apps"]
+  resources: ["deployments"]
+  verbs: ["get", "create", "update", "delete", "patch"]

k8s/environments/jenkins/rolebinding.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  namespace: jenkins
+  name: jenkins-rolebinding
+subjects:
+- kind: ServiceAccount
+  name: jenkins
+  namespace: default
+roleRef:
+  kind: Role
+  name: jenkins-role
+  apiGroup: rbac.authorization.k8s.io

k8s/environments/logging/elk/kibana/ingress/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: kibana-ingress
@@ -6,13 +6,15 @@ metadata:
     env: production
     tier: logging
     app: kibana
-    name: kibana-ingress
 spec:
   rules:
     - host: <ELK Kibana 도메인> # TODO
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: kibana
+              service:
-              servicePort: 5601
+                name: kibana
+                port:
+                  number: 5601

k8s/environments/rabbitmq/ingress/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: rabbitmq-ingress
@@ -6,13 +6,15 @@ metadata:
     env: production
     tier: backend
     app: rabbitmq
-    name: rabbitmq-ingress
 spec:
   rules:
     - host: <RabbitMQ 도메인> # TODO
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: rabbitmq
+              service:
-              servicePort: 15672
+                name: rabbitmq
+                port:
+                  number: 15672

k8s/environments/zipkin/ingress/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: zipkin-ingress
@@ -6,13 +6,16 @@ metadata:
     env: production
     tier: backend
     app: zipkin
-    name: zipkin-ingress
 spec:
   rules:
   - host: <Zipkin 도메인> # TODO
     http:
       paths:
       - path: /
+        pathType: Prefix
         backend:
-          serviceName: zipkin
+          service:
-          servicePort: 9411
+            name: zipkin
+            port:
+              number: 9411
+