From 014a68494d29bd2c49c05a396315bd4731c73379 Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Wed, 3 Dec 2025 15:07:34 +0900 Subject: [PATCH 1/2] CHORE(app): add images to kustomization - Add images configuration for ArgoCD - Enable image updates via GitOps --- deploy/k8s/overlays/dev/kustomization.yaml | 5 +++++ deploy/k8s/overlays/prod/kustomization.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/deploy/k8s/overlays/dev/kustomization.yaml b/deploy/k8s/overlays/dev/kustomization.yaml index 9de6f59..a44a985 100644 --- a/deploy/k8s/overlays/dev/kustomization.yaml +++ b/deploy/k8s/overlays/dev/kustomization.yaml @@ -11,5 +11,10 @@ resources: commonLabels: environment: development +# 이미지 태그 설정 +images: + - name: ghcr.io/mayne0213/jovies + newTag: develop-sha-latest + patchesStrategicMerge: - deployment-patch.yaml diff --git a/deploy/k8s/overlays/prod/kustomization.yaml b/deploy/k8s/overlays/prod/kustomization.yaml index 53dffff..24e406e 100644 --- a/deploy/k8s/overlays/prod/kustomization.yaml +++ b/deploy/k8s/overlays/prod/kustomization.yaml @@ -13,7 +13,7 @@ commonLabels: # 이미지 태그 설정 images: - name: ghcr.io/mayne0213/jovies - newTag: main-sha-95deb4ded78e0ff47d7dada4f265f64e2ab9dc61 + newTag: main-sha-a1729a14cc8e68a86f1e2cea013acd005521f21f patchesStrategicMerge: - deployment-patch.yaml From 7efc5eae6e01d1cee101ebc546b2ff5e57245ed0 Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Wed, 3 Dec 2025 15:11:56 +0900 Subject: [PATCH 2/2] CHORE(ci): add develop branch support for CI/CD - Enable CI/CD for develop branch - Add branch-specific workflows --- .github/workflows/build.yml | 89 +++++++++++++-------- deploy/k8s/overlays/prod/kustomization.yaml | 2 +- 2 files changed, 57 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4734f65..3cc1592 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build Docker Image on: push: - branches: [main] + branches: [main, develop] tags: - 'v*' workflow_dispatch: @@ -75,33 +75,37 @@ jobs: echo "All tags:" echo "$TAGS" echo "---" - + # Get commit SHA (full 40 characters) COMMIT_SHA="${{ github.sha }}" - + + # Get current branch name + BRANCH_NAME="${{ github.ref_name }}" + echo "Branch: $BRANCH_NAME" + # Method 1: Extract the full SHA tag from docker/metadata-action output - # docker/metadata-action creates: main-sha- - SHA_TAG=$(echo "$TAGS" | grep -oE 'main-sha-[a-f0-9]{40}' | head -n 1) - - # Method 2: If not found, try to extract any main-sha- tag (fallback) + # docker/metadata-action creates: -sha- + SHA_TAG=$(echo "$TAGS" | grep -oE "${BRANCH_NAME}-sha-[a-f0-9]{40}" | head -n 1) + + # Method 2: If not found, try to extract any branch-sha- tag (fallback) if [ -z "$SHA_TAG" ]; then - SHA_TAG=$(echo "$TAGS" | grep -oE 'main-sha-[a-f0-9]+' | head -n 1) + SHA_TAG=$(echo "$TAGS" | grep -oE "${BRANCH_NAME}-sha-[a-f0-9]+" | head -n 1) if [ -n "$SHA_TAG" ]; then echo "⚠️ Found SHA tag (may not be full 40 chars): $SHA_TAG" fi fi - + # Method 3: Fallback to commit SHA directly (construct the tag) if [ -z "$SHA_TAG" ]; then - SHA_TAG="main-sha-$COMMIT_SHA" + SHA_TAG="${BRANCH_NAME}-sha-$COMMIT_SHA" echo "⚠️ Could not extract from tags, using commit SHA: $SHA_TAG" fi - + if [ -z "$SHA_TAG" ]; then echo "❌ ERROR: Failed to extract SHA tag" exit 1 fi - + echo "sha-tag=$SHA_TAG" >> $GITHUB_OUTPUT echo "✅ Extracted SHA tag: $SHA_TAG" @@ -118,31 +122,50 @@ jobs: echo "❌ ERROR: SHA_TAG is empty, cannot update kustomization" exit 1 fi - - echo "📝 Updating kustomization.yaml with tag: $SHA_TAG" - - # Update kustomization.yaml with new image tag - # Handle both cases: newTag: (with value) and newTag: (empty) - sed -i.bak "s|newTag:.*|newTag: $SHA_TAG|" deploy/k8s/overlays/prod/kustomization.yaml - - # Verify the update was successful - if grep -q "newTag: $SHA_TAG" deploy/k8s/overlays/prod/kustomization.yaml; then - echo "✅ Successfully updated kustomization.yaml" - rm -f deploy/k8s/overlays/prod/kustomization.yaml.bak + + # Determine overlay based on branch + BRANCH_NAME="${{ github.ref_name }}" + if [ "$BRANCH_NAME" = "main" ]; then + OVERLAY="prod" + elif [ "$BRANCH_NAME" = "develop" ]; then + OVERLAY="dev" else - echo "❌ ERROR: Failed to update kustomization.yaml" - cat deploy/k8s/overlays/prod/kustomization.yaml - exit 1 + echo "⚠️ Unknown branch: $BRANCH_NAME, skipping kustomization update" + exit 0 fi - # Commit and push if there are changes - if git diff --quiet; then - echo "No changes to commit" + KUSTOMIZATION_FILE="deploy/k8s/overlays/$OVERLAY/kustomization.yaml" + + # Check if kustomization file has images section + if grep -q "images:" "$KUSTOMIZATION_FILE"; then + echo "📝 Updating $KUSTOMIZATION_FILE with tag: $SHA_TAG" + + # Update kustomization.yaml with new image tag + # Handle both cases: newTag: (with value) and newTag: (empty) + sed -i.bak "s|newTag:.*|newTag: $SHA_TAG|" "$KUSTOMIZATION_FILE" + + # Verify the update was successful + if grep -q "newTag: $SHA_TAG" "$KUSTOMIZATION_FILE"; then + echo "✅ Successfully updated kustomization.yaml" + rm -f "$KUSTOMIZATION_FILE.bak" + else + echo "❌ ERROR: Failed to update kustomization.yaml" + cat "$KUSTOMIZATION_FILE" + exit 1 + fi + + # Commit and push if there are changes + if git diff --quiet; then + echo "No changes to commit" + else + git add "$KUSTOMIZATION_FILE" + git commit -m "Update $OVERLAY image to $SHA_TAG" + git push + echo "✅ Kustomization updated with new image tag: $SHA_TAG" + fi else - git add deploy/k8s/overlays/prod/kustomization.yaml - git commit -m "Update image to $SHA_TAG" - git push - echo "✅ Kustomization updated with new image tag: $SHA_TAG" + echo "ℹ️ $OVERLAY overlay uses base image (latest tag), skipping kustomization update" + echo " Image built with tag: $SHA_TAG" fi - name: Display image information diff --git a/deploy/k8s/overlays/prod/kustomization.yaml b/deploy/k8s/overlays/prod/kustomization.yaml index 24e406e..c203726 100644 --- a/deploy/k8s/overlays/prod/kustomization.yaml +++ b/deploy/k8s/overlays/prod/kustomization.yaml @@ -13,7 +13,7 @@ commonLabels: # 이미지 태그 설정 images: - name: ghcr.io/mayne0213/jovies - newTag: main-sha-a1729a14cc8e68a86f1e2cea013acd005521f21f + newTag: main-sha-f42d874d8e371e2b136b52dbfa2b5b85ea548ae3 patchesStrategicMerge: - deployment-patch.yaml