From 89a69afbdf8aceb623eb0f7d0bf032659e3b8691 Mon Sep 17 00:00:00 2001 From: mklee Date: Thu, 18 Dec 2025 02:57:35 +0000 Subject: [PATCH] version update logic change --- .github/workflows/ci-petclinic-eks.yaml | 152 +++--------------- .github/workflows/ci-petclinic-eks.yaml.bak | 5 +- .github/workflows/ci-petclinic-gke.yaml | 151 ++++------------- .github/workflows/ci-petclinic-gke.yaml.bak | 5 +- k8s/aws/20-petclinic-Deployments-postgre.yaml | 4 +- k8s/gcp/20-petclinic-Deployments-postgre.yaml | 4 +- 6 files changed, 63 insertions(+), 258 deletions(-) diff --git a/.github/workflows/ci-petclinic-eks.yaml b/.github/workflows/ci-petclinic-eks.yaml index 233be3f8e..43211844a 100644 --- a/.github/workflows/ci-petclinic-eks.yaml +++ b/.github/workflows/ci-petclinic-eks.yaml @@ -1,71 +1,27 @@ name: CI - Petclinic EKS -permissions: - contents: read - on: push: branches: ["main"] pull_request: branches: ["main"] -concurrency: - group: ci-${{ github.ref }} - cancel-in-progress: false - env: AWS_REGION: ${{ vars.AWS_REGION || 'ap-northeast-2' }} ECR_REPOSITORY: ${{ vars.ECR_REPOSITORY || 'eks/petclinic' }} jobs: - # 1) Maven 빌드 + 테스트 (PR 포함) - build-test: + build-and-push-eks: + runs-on: ubuntu-latest if: github.actor != 'github-actions[bot]' - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: "25" - cache: maven - - - name: Maven build & test - run: | - if [ -x "./mvnw" ]; then - ./mvnw -B clean test package - else - mvn -B clean test package - fi - - - name: Archive built JAR - uses: actions/upload-artifact@v4 - with: - name: petclinic-jar - path: target/*.jar - - # 2) Docker 이미지 빌드 + ECR Push + k8s manifest 이미지 태그/앱 버전 업데이트 (main push만) - build-and-push-image: - needs: build-test - runs-on: ubuntu-latest - - # PR에서는 push/commit 금지 + github-actions bot 커밋으로 재트리거 방지 - if: github.event_name != 'pull_request' && github.actor != 'github-actions[bot]' permissions: id-token: write - contents: write + contents: read steps: - name: Checkout uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Set up JDK uses: actions/setup-java@v4 @@ -74,7 +30,15 @@ jobs: java-version: "25" cache: maven - - name: Configure AWS credentials (OIDC / Assume Role) + - name: Maven build + run: | + if [ -x "./mvnw" ]; then + ./mvnw -B clean package + else + mvn -B clean package + fi + + - name: Configure AWS credentials (OIDC) uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: ${{ secrets.AWS_ROLE_ARN }} @@ -84,99 +48,27 @@ jobs: id: ecr-login uses: aws-actions/amazon-ecr-login@v2 - - name: Set image tag + - name: Build APP_VERSION (AWS) run: | SHORT_SHA=${GITHUB_SHA::7} - echo "IMAGE_TAG=${SHORT_SHA}" >> "$GITHUB_ENV" - echo "IMAGE_TAG=${SHORT_SHA}" - - - name: Read base version from pom.xml - run: | - if [ -x "./mvnw" ]; then - POM_VERSION=$(./mvnw -q -Dexpression=project.version -DforceStdout help:evaluate) - else - POM_VERSION=$(mvn -q -Dexpression=project.version -DforceStdout help:evaluate) - fi - echo "POM_VERSION=${POM_VERSION}" - BASE_VERSION=${POM_VERSION%-SNAPSHOT} - echo "BASE_VERSION=${BASE_VERSION}" >> "$GITHUB_ENV" - - - name: Build APP_VERSION (base + image tag) - run: | - APP_VERSION="A-${BASE_VERSION}-${IMAGE_TAG}" + BASE_VERSION=$(mvn -q -Dexpression=project.version -DforceStdout help:evaluate | sed 's/-SNAPSHOT//') + APP_VERSION="A-${BASE_VERSION}-${SHORT_SHA}" echo "APP_VERSION=${APP_VERSION}" >> "$GITHUB_ENV" - echo "APP_VERSION=${APP_VERSION}" - - - name: Update application version property - run: | - sed -i "s/^app.version=.*/app.version=${APP_VERSION}/" src/main/resources/application.properties - name: Build image URI run: | ECR_REGISTRY="${{ steps.ecr-login.outputs.registry }}" - IMAGE_URI="${ECR_REGISTRY}/${{ env.ECR_REPOSITORY }}:${IMAGE_TAG}" - IMAGE_BASE="${ECR_REGISTRY}/${{ env.ECR_REPOSITORY }}" + IMAGE_URI="${ECR_REGISTRY}/${{ env.ECR_REPOSITORY }}:${GITHUB_SHA::7}" echo "IMAGE_URI=${IMAGE_URI}" >> "$GITHUB_ENV" - echo "IMAGE_BASE=${IMAGE_BASE}" >> "$GITHUB_ENV" - echo "IMAGE_URI=${IMAGE_URI}" - - name: Build Docker image - env: - DOCKER_BUILDKIT: 1 + - name: Build & Push Docker image (ECR) run: | docker build -t "$IMAGE_URI" . - - - name: Push Docker image - run: | docker push "$IMAGE_URI" - - name: Tag image as latest (only on main) - if: github.ref == 'refs/heads/main' + - name: Inject APP_VERSION into EKS Deployment run: | - docker tag "${IMAGE_BASE}:${IMAGE_TAG}" "${IMAGE_BASE}:latest" - docker push "${IMAGE_BASE}:latest" - - - name: Update Kubernetes manifest image tag (only on main) - if: github.ref == 'refs/heads/main' - env: - YAML_PATH: k8s/aws/20-petclinic-Deployments-postgre.yaml - run: | - test -f "$YAML_PATH" || (echo "Missing manifest: $YAML_PATH" && exit 1) - echo "Updating $YAML_PATH -> ${IMAGE_URI}" - grep -n "image:" "$YAML_PATH" || (echo "No image field found in $YAML_PATH" && exit 1) - sed -i "s#^\(\s*image:\s*\).*#\1${IMAGE_URI}#" "$YAML_PATH" - - - name: Commit and push changes (only on main) - if: github.ref == 'refs/heads/main' - run: | - git config user.name "github-actions" - git config user.email "github-actions@github.com" - git add src/main/resources/application.properties k8s/aws/20-petclinic-Deployments-postgre.yaml - - if git diff --cached --quiet; then - echo "No changes to commit" - exit 0 - fi - - git commit -m "chore: update petclinic image to ${APP_VERSION} [skip ci]" - - # --- Sync with remote main then push (avoid non-fast-forward) --- - for i in 1 2 3; do - echo "Push attempt ${i}..." - git fetch origin main - - # Rebase our commit on top of latest main - git rebase origin/main || { git rebase --abort; exit 1; } - - # Push - if git push origin HEAD:main; then - echo "Push succeeded." - exit 0 - fi - - echo "Push failed; retrying after short delay..." - sleep 2 - done - - echo "Push failed after retries." - exit 1 + yq -i ' + (.spec.template.spec.containers[].env[] + | select(.name == "APP_VERSION").value) = "'"${APP_VERSION}"'" + ' k8s/aws/20-petclinic-Deployments-postgre.yaml diff --git a/.github/workflows/ci-petclinic-eks.yaml.bak b/.github/workflows/ci-petclinic-eks.yaml.bak index 5e0f54a8c..233be3f8e 100644 --- a/.github/workflows/ci-petclinic-eks.yaml.bak +++ b/.github/workflows/ci-petclinic-eks.yaml.bak @@ -11,7 +11,7 @@ on: concurrency: group: ci-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: false env: AWS_REGION: ${{ vars.AWS_REGION || 'ap-northeast-2' }} @@ -20,6 +20,7 @@ env: jobs: # 1) Maven 빌드 + 테스트 (PR 포함) build-test: + if: github.actor != 'github-actions[bot]' runs-on: ubuntu-latest steps: - name: Checkout @@ -63,6 +64,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up JDK uses: actions/setup-java@v4 diff --git a/.github/workflows/ci-petclinic-gke.yaml b/.github/workflows/ci-petclinic-gke.yaml index f3ca00206..78bae58a9 100644 --- a/.github/workflows/ci-petclinic-gke.yaml +++ b/.github/workflows/ci-petclinic-gke.yaml @@ -1,70 +1,29 @@ name: CI - Petclinic GKE -permissions: - contents: read - on: push: branches: ["main"] pull_request: branches: ["main"] -concurrency: - group: ci-${{ github.ref }} - cancel-in-progress: false - env: GCP_PROJECT_ID: ${{ vars.GCP_PROJECT_ID }} GAR_LOCATION: ${{ vars.GAR_LOCATION || 'asia-northeast3' }} GAR_REPOSITORY: ${{ vars.GAR_REPOSITORY || 'petclinic' }} - IMAGE_NAME: ${{ vars.IMAGE_NAME || 'petclinic' }} + IMAGE_NAME: petclinic jobs: - build-test: + build-and-push-gke: + runs-on: ubuntu-latest if: github.actor != 'github-actions[bot]' - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: "25" - cache: maven - - - name: Maven build & test - run: | - if [ -x "./mvnw" ]; then - ./mvnw -B clean test package - else - mvn -B clean test package - fi - - - name: Archive built JAR - uses: actions/upload-artifact@v4 - with: - name: petclinic-jar - path: target/*.jar - - build-and-push-image: - needs: build-test - runs-on: ubuntu-latest - - if: github.event_name != 'pull_request' && github.actor != 'github-actions[bot]' permissions: - contents: write id-token: write + contents: read steps: - name: Checkout uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Set up JDK uses: actions/setup-java@v4 @@ -73,100 +32,44 @@ jobs: java-version: "25" cache: maven - - name: Auth to Google Cloud (WIF) + - name: Maven build + run: | + if [ -x "./mvnw" ]; then + ./mvnw -B clean package + else + mvn -B clean package + fi + + - name: Authenticate to Google Cloud uses: google-github-actions/auth@v2 with: workload_identity_provider: ${{ secrets.GCP_WIF_PROVIDER }} - service_account: ${{ secrets.GCP_SA_EMAIL }} + service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }} - - name: Set up gcloud - uses: google-github-actions/setup-gcloud@v2 - - - name: Configure docker for Artifact Registry + - name: Configure Docker for GAR run: | gcloud auth configure-docker ${GAR_LOCATION}-docker.pkg.dev --quiet - - name: Set image tag + - name: Build APP_VERSION (GCP) run: | SHORT_SHA=${GITHUB_SHA::7} - echo "IMAGE_TAG=${SHORT_SHA}" >> "$GITHUB_ENV" - - - name: Read base version from pom.xml - run: | - if [ -x "./mvnw" ]; then - POM_VERSION=$(./mvnw -q -Dexpression=project.version -DforceStdout help:evaluate) - else - POM_VERSION=$(mvn -q -Dexpression=project.version -DforceStdout help:evaluate) - fi - BASE_VERSION=${POM_VERSION%-SNAPSHOT} - echo "BASE_VERSION=${BASE_VERSION}" >> "$GITHUB_ENV" - - - name: Build APP_VERSION - run: | - APP_VERSION="G-${BASE_VERSION}-${IMAGE_TAG}" + BASE_VERSION=$(mvn -q -Dexpression=project.version -DforceStdout help:evaluate | sed 's/-SNAPSHOT//') + APP_VERSION="G-${BASE_VERSION}-${SHORT_SHA}" echo "APP_VERSION=${APP_VERSION}" >> "$GITHUB_ENV" - - name: Update application version property + - name: Build image URI run: | - sed -i "s/^app.version=.*/app.version=${APP_VERSION}/" src/main/resources/application.properties - - - name: Build Docker image - env: - DOCKER_BUILDKIT: 1 - run: | - IMAGE_URI="${GAR_LOCATION}-docker.pkg.dev/${GCP_PROJECT_ID}/${GAR_REPOSITORY}/${IMAGE_NAME}:${IMAGE_TAG}" + IMAGE_URI="${GAR_LOCATION}-docker.pkg.dev/${GCP_PROJECT_ID}/${GAR_REPOSITORY}/${IMAGE_NAME}:${GITHUB_SHA::7}" echo "IMAGE_URI=${IMAGE_URI}" >> "$GITHUB_ENV" - docker build -t "$IMAGE_URI" . - - name: Push Docker image + - name: Build & Push Docker image (GAR) run: | + docker build -t "$IMAGE_URI" . docker push "$IMAGE_URI" - - name: Tag image as latest - if: github.ref == 'refs/heads/main' + - name: Inject APP_VERSION into GKE Deployment run: | - IMAGE_BASE="${GAR_LOCATION}-docker.pkg.dev/${GCP_PROJECT_ID}/${GAR_REPOSITORY}/${IMAGE_NAME}" - docker tag "${IMAGE_BASE}:${IMAGE_TAG}" "${IMAGE_BASE}:latest" - docker push "${IMAGE_BASE}:latest" - - - name: Update Kubernetes manifest image tag - if: github.ref == 'refs/heads/main' - env: - YAML_PATH: k8s/gcp/20-petclinic-Deployments-postgre.yaml - run: | - NEW_IMAGE="${GAR_LOCATION}-docker.pkg.dev/${GCP_PROJECT_ID}/${GAR_REPOSITORY}/${IMAGE_NAME}:${IMAGE_TAG}" - grep -n "image:" "$YAML_PATH" - sed -i "s#^\(\s*image:\s*\).*#\1${NEW_IMAGE}#" "$YAML_PATH" - - - name: Commit and push changes - if: github.ref == 'refs/heads/main' - run: | - git config user.name "github-actions" - git config user.email "github-actions@github.com" - git add src/main/resources/application.properties k8s/gcp/20-petclinic-Deployments-postgre.yaml - if git diff --cached --quiet; then - echo "No changes to commit" - exit 0 - fi - git commit -m "chore: update petclinic image to ${IMAGE_TAG} [skip ci]" - - # --- Sync with remote main then push (avoid non-fast-forward) --- - for i in 1 2 3; do - echo "Push attempt ${i}..." - git fetch origin main - - # Rebase our commit on top of latest main - git rebase origin/main || { git rebase --abort; exit 1; } - - # Push - if git push origin HEAD:main; then - echo "Push succeeded." - exit 0 - fi - - echo "Push failed; retrying after short delay..." - sleep 2 - done - - echo "Push failed after retries." - exit 1 + yq -i ' + (.spec.template.spec.containers[].env[] + | select(.name == "APP_VERSION").value) = "'"${APP_VERSION}"'" + ' k8s/gcp/20-petclinic-Deployments-postgre.yaml diff --git a/.github/workflows/ci-petclinic-gke.yaml.bak b/.github/workflows/ci-petclinic-gke.yaml.bak index 0618e4354..f3ca00206 100644 --- a/.github/workflows/ci-petclinic-gke.yaml.bak +++ b/.github/workflows/ci-petclinic-gke.yaml.bak @@ -11,7 +11,7 @@ on: concurrency: group: ci-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: false env: GCP_PROJECT_ID: ${{ vars.GCP_PROJECT_ID }} @@ -21,6 +21,7 @@ env: jobs: build-test: + if: github.actor != 'github-actions[bot]' runs-on: ubuntu-latest steps: - name: Checkout @@ -62,6 +63,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up JDK uses: actions/setup-java@v4 diff --git a/k8s/aws/20-petclinic-Deployments-postgre.yaml b/k8s/aws/20-petclinic-Deployments-postgre.yaml index 73fad4159..a76df97a6 100644 --- a/k8s/aws/20-petclinic-Deployments-postgre.yaml +++ b/k8s/aws/20-petclinic-Deployments-postgre.yaml @@ -43,7 +43,9 @@ spec: value: "postgres" - name: SPRING_DATASOURCE_DRIVER_CLASS_NAME value: "org.postgresql.Driver" - + - name: APP_VERSION + value: "local" + ports: - name: http containerPort: 8080 diff --git a/k8s/gcp/20-petclinic-Deployments-postgre.yaml b/k8s/gcp/20-petclinic-Deployments-postgre.yaml index f20f59a54..25219c1c0 100644 --- a/k8s/gcp/20-petclinic-Deployments-postgre.yaml +++ b/k8s/gcp/20-petclinic-Deployments-postgre.yaml @@ -47,7 +47,9 @@ spec: value: "never" - name: SPRING_JPA_HIBERNATE_DDL_AUTO value: "none" - + - name: APP_VERSION + value: "local" + ports: - name: http containerPort: 8080