Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
4970d44
feat: AGV 도착 정보 수집 / 공정 Ready 변환 로직 수정
chani2104 Jul 4, 2026
da18ac1
feat: AGV 도착 정보 수집 / 공정 Ready 변환 로직 수정
chani2104 Jul 4, 2026
81e4641
Merge branch 'dev' of https://github.com/SK-Rookies-AIMS/assembly-ser…
chani2104 Jul 4, 2026
c1f624e
fix: newTag image update, secret update
sknm1106 Jul 4, 2026
1be77b2
fix: event json 테이블에 병목&불량 전이 검사 여부 컬럼 추가
mmije0ng Jul 4, 2026
2fcef73
Merge pull request #33 from SK-Rookies-AIMS/infra/363/docker
mmije0ng Jul 4, 2026
70e2d2e
Merge pull request #32 from SK-Rookies-AIMS/feat/378/press-body-status
hyein0514 Jul 7, 2026
1b56bde
refactor: 대시보드 시간 출력 변경
hyein0514 Jul 7, 2026
533ca40
Merge branch 'dev' of https://github.com/SK-Rookies-AIMS/assembly-ser…
hyein0514 Jul 7, 2026
064f23b
Merge pull request #34 from SK-Rookies-AIMS/feat/paint
mmije0ng Jul 7, 2026
580bcc1
Merge branch 'dev' of https://github.com/SK-Rookies-AIMS/assembly-ser…
chani2104 Jul 7, 2026
69ab899
fix: 제조 이벤트 데이터 Abnormal 전환 로직 수정
chani2104 Jul 7, 2026
03cbb39
refactor:대시보드 조회 Api 변경
hyein0514 Jul 7, 2026
4ce1c2b
Merge branch 'dev' of https://github.com/SK-Rookies-AIMS/assembly-ser…
hyein0514 Jul 7, 2026
7e1458b
Merge pull request #35 from SK-Rookies-AIMS/feat/373/agv-arrival-api
hyein0514 Jul 7, 2026
f7f8748
Merge pull request #36 from SK-Rookies-AIMS/feat/paint
mmije0ng Jul 7, 2026
1a0bd62
fix: 차체 이상 탐지 차트 반환값 수정
mmije0ng Jul 7, 2026
23fba8d
Merge pull request #37 from SK-Rookies-AIMS/feat/378/press-body-status
hyein0514 Jul 7, 2026
b1d46c9
feat(body): 차체 이상 탐지 차트 및 기준선 응답 추가
mmije0ng Jul 9, 2026
8b8e880
feat(body,press): 이상 탐지 캐시 및 응답 구조 정리
mmije0ng Jul 9, 2026
7193f12
fix: 프레스 이상 탐지 조회 위험도 추이 차트 추가
mmije0ng Jul 9, 2026
f7d8c89
fix: 프레스 사이클&timestamp gap 수정
mmije0ng Jul 9, 2026
793bcd4
fix: 프레스 이상탐지 timestamp 지연 삭제
mmije0ng Jul 9, 2026
9f3d401
fix: 프레스 이상탐지 원인 한글로 반환
mmije0ng Jul 9, 2026
94be31c
Merge pull request #38 from SK-Rookies-AIMS/fix/378/press-body-chart
hyein0514 Jul 9, 2026
dcab8ed
fix: 차체 이상탐지 문구 변경
mmije0ng Jul 10, 2026
bbd63b4
Merge pull request #39 from SK-Rookies-AIMS/fix/378/press-body-chart
hyein0514 Jul 10, 2026
7a676d3
chore: redis TTL 기본값 변경
mmije0ng Jul 10, 2026
8ff2d19
refactor:설비 가동률 & 의장 Api 수정
hyein0514 Jul 10, 2026
c074284
Merge branch 'dev' of https://github.com/SK-Rookies-AIMS/assembly-ser…
hyein0514 Jul 10, 2026
45797ae
Merge pull request #41 from SK-Rookies-AIMS/feat/paint
mmije0ng Jul 10, 2026
acaa5b2
Merge pull request #40 from SK-Rookies-AIMS/fix/378/press-body-chart
hyein0514 Jul 10, 2026
d7bb6e4
feat : inspection master table update
kimgeon0802 Jul 10, 2026
c33ce27
Merge pull request #42 from SK-Rookies-AIMS/feat/384/Inspection_maste…
hyein0514 Jul 10, 2026
1851ac6
refactor: 의장 저장로직 변경
hyein0514 Jul 10, 2026
00df110
Merge pull request #43 from SK-Rookies-AIMS/feat/paint
kimgeon0802 Jul 10, 2026
0f2f245
fix: 프레스·차체 이상 기준값 반영 및 조회 응답 개선
mmije0ng Jul 13, 2026
6c632ef
remove: 불필요한 문서 삭제
mmije0ng Jul 13, 2026
f641b88
refactor:알람 토픽 발행 시 이미지 포함
hyein0514 Jul 13, 2026
603feb3
Merge branch 'dev' of https://github.com/SK-Rookies-AIMS/assembly-ser…
hyein0514 Jul 13, 2026
297fc13
Merge pull request #44 from SK-Rookies-AIMS/fix/manufacturing-reference
hyein0514 Jul 13, 2026
4b2f511
fix:필요없는 파일 삭제
hyein0514 Jul 13, 2026
e2811b9
Merge branch 'dev' of https://github.com/SK-Rookies-AIMS/assembly-ser…
hyein0514 Jul 13, 2026
295ea64
Merge pull request #46 from SK-Rookies-AIMS/feat/paint
mmije0ng Jul 13, 2026
cf98939
fix: 프레스&차체 이상탐지 reasons 반환 수정
mmije0ng Jul 14, 2026
0ea90b3
fix: 프레스&차체 이상 탐지에 logNO 반환
mmije0ng Jul 14, 2026
e3a963b
Merge pull request #47 from SK-Rookies-AIMS/fix/manufacturing-reference
hyein0514 Jul 14, 2026
02bb6f4
refactor: 이미지 url 매핑 삭제
hyein0514 Jul 15, 2026
e66b220
Merge branch 'dev' of https://github.com/SK-Rookies-AIMS/assembly-ser…
hyein0514 Jul 15, 2026
38657c4
Merge pull request #48 from SK-Rookies-AIMS/feat/paint
kimgeon0802 Jul 15, 2026
fcb06b2
docs: README 문서 정리
mmije0ng Jul 15, 2026
f2196cb
remove: 필요 없는 테스트 파일 삭제
mmije0ng Jul 15, 2026
494091e
Merge remote-tracking branch 'origin/dev' into fix/manufacturing-refe…
mmije0ng Jul 15, 2026
5353f77
docs: README 프로젝트명 추가
mmije0ng Jul 15, 2026
fcb158e
docs: README 기술 스택 수정
mmije0ng Jul 15, 2026
8da331c
docs: README 기술 스택 정리
mmije0ng Jul 15, 2026
8d6543b
docs: README 제조 kafka 정리
mmije0ng Jul 15, 2026
84fbfd5
docs: README 정리
mmije0ng Jul 15, 2026
4404e6f
Merge pull request #49 from SK-Rookies-AIMS/fix/manufacturing-reference
hyein0514 Jul 15, 2026
e100e39
test: null 값 방지
mmije0ng Jul 15, 2026
e1271b4
test: 차체 이상 탐지 테스트 코드 매핑 인자 오류 수정
mmije0ng Jul 16, 2026
a656828
Merge pull request #50 from SK-Rookies-AIMS/fix/manufacturing-reference
qwer9679 Jul 16, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 146 additions & 5 deletions .github/workflows/deploy-assembly-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@ concurrency:

env:
AWS_REGION: ap-northeast-2
EKS_CLUSTER_NAME: aims-dev-eks
ECR_REPOSITORY: aims/assembly-service
NAMESPACE: aims-project

INFRA_REPOSITORY: SK-Rookies-AIMS/infra
INFRA_BRANCH: dev
INFRA_MANIFEST_PATH: k8s/assembly-service/deployment.yaml

# 기존 deployment.yaml에서 kustomization.yaml로 변경
INFRA_MANIFEST_PATH: k8s/assembly-service/kustomization.yaml

jobs:
build-and-update-gitops:
Expand Down Expand Up @@ -65,6 +69,8 @@ jobs:
id: build-image
shell: bash
run: |
set -euo pipefail

COMMIT_TAG="dev-${GITHUB_SHA::12}"

IMAGE_URI="${{ steps.login-ecr.outputs.registry }}/${ECR_REPOSITORY}:${COMMIT_TAG}"
Expand All @@ -89,27 +95,162 @@ jobs:
path: infra
fetch-depth: 0

- name: Update assembly-service image
# 추가: EKS 접속 설정
- name: Update kubeconfig and ensure namespace
shell: bash
run: |
set -euo pipefail

aws eks update-kubeconfig \
--region "$AWS_REGION" \
--name "$EKS_CLUSTER_NAME"

kubectl create namespace "$NAMESPACE" \
--dry-run=client \
-o yaml | kubectl apply -f -

# 추가: SSM Parameter Store 값 조회
- name: Load assembly-service parameters from SSM
shell: bash
run: |
set -euo pipefail

RDS_SECRET_ARN=$(aws ssm get-parameter \
--name "/aims/dev/rds/secret-arn" \
--region "$AWS_REGION" \
--query "Parameter.Value" \
--output text)

RDS_HOST=$(aws ssm get-parameter \
--name "/aims/dev/backend/rds-host" \
--region "$AWS_REGION" \
--query "Parameter.Value" \
--output text)

RDS_PORT=$(aws ssm get-parameter \
--name "/aims/dev/backend/rds-port" \
--region "$AWS_REGION" \
--query "Parameter.Value" \
--output text)

MAIN_DB_NAME=$(aws ssm get-parameter \
--name "/aims/dev/backend/main-db-name" \
--region "$AWS_REGION" \
--query "Parameter.Value" \
--output text)

SAMPLE_DB_NAME=$(aws ssm get-parameter \
--name "/aims/dev/backend/sample-db-name" \
--region "$AWS_REGION" \
--query "Parameter.Value" \
--output text)

JWT_SECRET_KEY=$(aws ssm get-parameter \
--name "/aims/dev/backend/jwt-secret-key" \
--region "$AWS_REGION" \
--with-decryption \
--query "Parameter.Value" \
--output text)

for VALUE in \
"$RDS_SECRET_ARN" \
"$RDS_HOST" \
"$RDS_PORT" \
"$MAIN_DB_NAME" \
"$SAMPLE_DB_NAME" \
"$JWT_SECRET_KEY"
do
if [ -z "$VALUE" ] || [ "$VALUE" = "None" ]; then
echo "Required assembly-service parameter is empty"
exit 1
fi
done

echo "::add-mask::$RDS_SECRET_ARN"
echo "::add-mask::$JWT_SECRET_KEY"

{
echo "RDS_SECRET_ARN=$RDS_SECRET_ARN"
echo "RDS_HOST=$RDS_HOST"
echo "RDS_PORT=$RDS_PORT"
echo "MAIN_DB_NAME=$MAIN_DB_NAME"
echo "SAMPLE_DB_NAME=$SAMPLE_DB_NAME"
echo "JWT_SECRET_KEY=$JWT_SECRET_KEY"
} >> "$GITHUB_ENV"

# 추가: RDS Secrets Manager에서 계정 조회 후 런타임 Secret 생성
- name: Create or update assembly-service Secret
shell: bash
run: |
set -euo pipefail

SECRET_JSON=$(aws secretsmanager get-secret-value \
--secret-id "$RDS_SECRET_ARN" \
--region "$AWS_REGION" \
--query "SecretString" \
--output text)

DB_USER=$(echo "$SECRET_JSON" | jq -r '.username')
DB_PASSWORD=$(echo "$SECRET_JSON" | jq -r '.password')

if [ -z "$DB_USER" ] || [ "$DB_USER" = "null" ]; then
echo "DB username is missing"
exit 1
fi

if [ -z "$DB_PASSWORD" ] || [ "$DB_PASSWORD" = "null" ]; then
echo "DB password is missing"
exit 1
fi

echo "::add-mask::$DB_USER"
echo "::add-mask::$DB_PASSWORD"

JDBC_OPTIONS="serverTimezone=Asia/Seoul&useUnicode=true&characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true"

MAIN_DB_JDBC_URL="jdbc:mysql://${RDS_HOST}:${RDS_PORT}/${MAIN_DB_NAME}?${JDBC_OPTIONS}"
SAMPLE_DB_JDBC_URL="jdbc:mysql://${RDS_HOST}:${RDS_PORT}/${SAMPLE_DB_NAME}?${JDBC_OPTIONS}"

kubectl create secret generic assembly-service-secret \
--namespace "$NAMESPACE" \
--from-literal=MAIN_DB_JDBC_URL="$MAIN_DB_JDBC_URL" \
--from-literal=MAIN_DB_USERNAME="$DB_USER" \
--from-literal=MAIN_DB_PASSWORD="$DB_PASSWORD" \
--from-literal=SAMPLE_DB_JDBC_URL="$SAMPLE_DB_JDBC_URL" \
--from-literal=SAMPLE_DB_USERNAME="$DB_USER" \
--from-literal=SAMPLE_DB_PASSWORD="$DB_PASSWORD" \
--from-literal=JWT_SECRET_KEY="$JWT_SECRET_KEY" \
--dry-run=client \
-o yaml | kubectl apply -f -

# 변경: image: 전체 URI가 아니라 newTag:만 변경
- name: Update assembly-service image tag
env:
IMAGE_URI: ${{ steps.build-image.outputs.image_uri }}
shell: bash
run: |
set -euo pipefail

MANIFEST="infra/${INFRA_MANIFEST_PATH}"

if [ ! -f "$MANIFEST" ]; then
echo "Manifest not found: $MANIFEST"
exit 1
fi

IMAGE_TAG="${IMAGE_URI##*:}"

sed -i -E \
"s|^([[:space:]]*)image:.*aims/assembly-service.*$|\1image: ${IMAGE_URI}|" \
"s|^([[:space:]]*)newTag:.*$|\1newTag: ${IMAGE_TAG}|" \
"$MANIFEST"

grep -n "image:" "$MANIFEST"
grep -n "newTag:" "$MANIFEST"

- name: Commit and push GitOps change
shell: bash
run: |
set -euo pipefail

cd infra

git config user.name "github-actions[bot]"
Expand All @@ -136,4 +277,4 @@ jobs:
done

echo "Failed to push infra repository"
exit 1
exit 1
Loading
Loading