diff --git a/ci/blog/README.md b/ci/blog/README.md index d27fea1..15221ee 100644 --- a/ci/blog/README.md +++ b/ci/blog/README.md @@ -48,9 +48,20 @@ hydration 변경 시 필요한 Playwright 검증은 앱 README의 별도 절차 이미지에는 SSR 바이너리·site·라이선스가 들어가며 Node와 dev-ui는 포함하지 않습니다. DB/Entra ID Secret은 quality, Docker build, WASM 번들에서 사용하지 않습니다. -`cdn.yaml`은 공용 버킷 `rabbitmaus`(`ap-southeast-2`)와 `https://cdn.rabbitmaus.com`을 -사용합니다. prod 프로젝트는 `blog`, staging은 `blog-staging`이므로 HTTPS 원본도 서로 다른 -prefix로 선택할 수 있습니다. CI에서 source SHA + LF + PipelineRun UID의 SHA-256 앞 16자를 +CDN 공개 설정은 `pipeline.yaml`의 각 Pipeline 파라미터 기본값으로 관리합니다. ConfigMap을 +생성하거나 참조하지 않으며, 빌드 Task는 전달받은 값을 같은 이름의 환경 변수로 사용합니다. + +| Pipeline 파라미터 | prod 기본값 | staging 기본값 | +| --- | --- | --- | +| `CDN_URL_PREFIX` | `blog` | `blog-staging` | +| `CDN_BASE_URL` | `https://cdn.rabbitmaus.com` | 동일 | +| `CDN_S3_BUCKET_NAME` | `rabbitmaus` | 동일 | +| `AWS_REGION` | `ap-southeast-2` | 동일 | + +`CDN_URL_PREFIX`는 도메인 뒤의 한 경로 구간이며, `CDN_BASE_URL`에는 경로와 끝 `/`를 +붙이지 않습니다. 필요하면 PipelineRun의 같은 이름 파라미터로 기본값을 재정의할 수 있습니다. +GitOps 완료 키 검사에도 전달받은 `CDN_URL_PREFIX`를 사용합니다. +CI에서 source SHA + LF + PipelineRun UID의 SHA-256 앞 16자를 계산하고 같은 CDN 설정을 SSR·WASM에 컴파일합니다. BuildKit은 단일 solve에서 image와 local rootfs를 함께 내보냅니다. `/app/site`를 다시 빌드하지 않고 앱 저장소 `tools/cdn`으로 포장합니다. @@ -130,6 +141,10 @@ kubectl kustomize apps/blog/overlays/staging kubectl kustomize apps/blog/overlays/prod ``` +앱 저장소에서 `node tools/cdn/verify-pipeline.mjs ../service-state ../platform-state`를 실행하면 +Pipeline → Task 파라미터 전달, ConfigMap 제거, Docker·Rust 설정 이름, Argo CD `ci` +프로젝트의 리소스 허용 목록까지 검사합니다. + CRD와 namespace가 준비된 클러스터에서는 별도로 `kubectl apply --dry-run=server -k ci/blog`를 실행합니다. 실제 연결 검증은 서명된 staging push 한 건으로 PipelineRun, Harbor digest, service-state 커밋, Argo CD Sync, `/healthz`와 diff --git a/ci/blog/cdn.yaml b/ci/blog/cdn.yaml deleted file mode 100644 index bfe058a..0000000 --- a/ci/blog/cdn.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# One distribution and bucket; separate project prefixes select the HTTPS origin. -apiVersion: v1 -kind: ConfigMap -metadata: - name: blog-cdn-prod -data: - CDN_PROJECT: blog - CDN_BUCKET: rabbitmaus - AWS_REGION: ap-southeast-2 - CDN_BASE_URL: https://cdn.rabbitmaus.com ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: blog-cdn-staging -data: - CDN_PROJECT: blog-staging - CDN_BUCKET: rabbitmaus - AWS_REGION: ap-southeast-2 - CDN_BASE_URL: https://cdn.rabbitmaus.com diff --git a/ci/blog/kustomization.yaml b/ci/blog/kustomization.yaml index e5e21b6..ff514ca 100644 --- a/ci/blog/kustomization.yaml +++ b/ci/blog/kustomization.yaml @@ -4,7 +4,6 @@ namespace: tekton-ci resources: - foundation.yaml - infisical-secret.yaml - - cdn.yaml - tasks.yaml - pipeline.yaml - trigger.yaml diff --git a/ci/blog/pipeline.yaml b/ci/blog/pipeline.yaml index eec7c70..12920d0 100644 --- a/ci/blog/pipeline.yaml +++ b/ci/blog/pipeline.yaml @@ -7,6 +7,18 @@ spec: params: - name: git-revision type: string + - name: CDN_URL_PREFIX + type: string + default: blog-staging + - name: CDN_BASE_URL + type: string + default: https://cdn.rabbitmaus.com + - name: CDN_S3_BUCKET_NAME + type: string + default: rabbitmaus + - name: AWS_REGION + type: string + default: ap-southeast-2 results: - name: image-digest value: $(tasks.build-arm64.results.image-digest) @@ -59,6 +71,14 @@ spec: value: registry.dahyeon.us/dahyeon/blog:sha-$(params.git-revision)-$(context.pipelineRun.uid) - name: pipeline-run-uid value: $(context.pipelineRun.uid) + - name: CDN_URL_PREFIX + value: $(params.CDN_URL_PREFIX) + - name: CDN_BASE_URL + value: $(params.CDN_BASE_URL) + - name: CDN_S3_BUCKET_NAME + value: $(params.CDN_S3_BUCKET_NAME) + - name: AWS_REGION + value: $(params.AWS_REGION) - name: environment value: staging workspaces: @@ -82,6 +102,8 @@ spec: value: $(tasks.build-arm64.results.cdn-release-id) - name: cdn-manifest-key value: $(tasks.build-arm64.results.cdn-manifest-key) + - name: CDN_URL_PREFIX + value: $(params.CDN_URL_PREFIX) workspaces: - name: source workspace: source @@ -97,6 +119,18 @@ spec: params: - name: git-revision type: string + - name: CDN_URL_PREFIX + type: string + default: blog + - name: CDN_BASE_URL + type: string + default: https://cdn.rabbitmaus.com + - name: CDN_S3_BUCKET_NAME + type: string + default: rabbitmaus + - name: AWS_REGION + type: string + default: ap-southeast-2 results: - name: image-digest value: $(tasks.build-arm64.results.image-digest) @@ -149,6 +183,14 @@ spec: value: registry.dahyeon.us/dahyeon/blog:sha-$(params.git-revision)-$(context.pipelineRun.uid) - name: pipeline-run-uid value: $(context.pipelineRun.uid) + - name: CDN_URL_PREFIX + value: $(params.CDN_URL_PREFIX) + - name: CDN_BASE_URL + value: $(params.CDN_BASE_URL) + - name: CDN_S3_BUCKET_NAME + value: $(params.CDN_S3_BUCKET_NAME) + - name: AWS_REGION + value: $(params.AWS_REGION) - name: environment value: prod workspaces: @@ -172,6 +214,8 @@ spec: value: $(tasks.build-arm64.results.cdn-release-id) - name: cdn-manifest-key value: $(tasks.build-arm64.results.cdn-manifest-key) + - name: CDN_URL_PREFIX + value: $(params.CDN_URL_PREFIX) workspaces: - name: source workspace: source diff --git a/ci/blog/tasks.yaml b/ci/blog/tasks.yaml index 4cde64d..da2411d 100644 --- a/ci/blog/tasks.yaml +++ b/ci/blog/tasks.yaml @@ -159,6 +159,14 @@ spec: type: string - name: pipeline-run-uid type: string + - name: CDN_URL_PREFIX + type: string + - name: CDN_BASE_URL + type: string + - name: CDN_S3_BUCKET_NAME + type: string + - name: AWS_REGION + type: string - name: environment type: string default: staging @@ -189,26 +197,14 @@ spec: value: $(params.pipeline-run-uid) - name: DEPLOY_ENV value: $(params.environment) - - name: CDN_PROJECT - valueFrom: - configMapKeyRef: - name: blog-cdn-$(params.environment) - key: CDN_PROJECT + - name: CDN_URL_PREFIX + value: $(params.CDN_URL_PREFIX) - name: CDN_BASE_URL - valueFrom: - configMapKeyRef: - name: blog-cdn-$(params.environment) - key: CDN_BASE_URL - - name: CDN_BUCKET - valueFrom: - configMapKeyRef: - name: blog-cdn-$(params.environment) - key: CDN_BUCKET + value: $(params.CDN_BASE_URL) + - name: CDN_S3_BUCKET_NAME + value: $(params.CDN_S3_BUCKET_NAME) - name: AWS_REGION - valueFrom: - configMapKeyRef: - name: blog-cdn-$(params.environment) - key: AWS_REGION + value: $(params.AWS_REGION) steps: - name: clone-source image: docker.io/alpine/git:2.49.1@sha256:c0280cf9572316299b08544065d3bf35db65043d5e3963982ec50647d2746e26 @@ -333,8 +329,8 @@ spec: set -eu printf '%s\n' "$IMAGE" | grep -Eq '^registry\.dahyeon\.us/dahyeon/blog:sha-[0-9a-f]{40}-[a-zA-Z0-9-]+$' case "$DEPLOY_ENV" in staging|prod) ;; *) echo 'Invalid deployment environment' >&2; exit 1;; esac - CDN_RELEASE="$(cat /workspace/build/release-id)" - printf '%s\n' "$CDN_RELEASE" | grep -Eq '^[0-9a-f]{16}$' + CDN_RELEASE_ID="$(cat /workspace/build/release-id)" + printf '%s\n' "$CDN_RELEASE_ID" | grep -Eq '^[0-9a-f]{16}$' buildctl-daemonless.sh build \ --frontend dockerfile.v0 \ --local context=/workspace/build/source \ @@ -342,9 +338,9 @@ spec: --opt filename=Dockerfile \ --opt target=runtime \ --opt platform=linux/arm64 \ - --opt "build-arg:BLOG_CDN_BASE=$CDN_BASE_URL" \ - --opt "build-arg:BLOG_CDN_PROJECT=$CDN_PROJECT" \ - --opt "build-arg:BLOG_CDN_RELEASE=$CDN_RELEASE" \ + --opt "build-arg:CDN_BASE_URL=$CDN_BASE_URL" \ + --opt "build-arg:CDN_URL_PREFIX=$CDN_URL_PREFIX" \ + --opt "build-arg:CDN_RELEASE_ID=$CDN_RELEASE_ID" \ --import-cache "type=registry,ref=$CACHE_REPOSITORY:cache-release-arm64-$DEPLOY_ENV" \ --import-cache "type=registry,ref=$CACHE_REPOSITORY:cache-quality-deps-arm64-$DEPLOY_ENV" \ --import-cache "type=registry,ref=$CACHE_REPOSITORY:cache-quality-arm64-$DEPLOY_ENV" \ @@ -446,6 +442,8 @@ spec: type: string - name: cdn-manifest-key type: string + - name: CDN_URL_PREFIX + type: string - name: environment type: string default: staging @@ -521,10 +519,12 @@ spec: value: registry.dahyeon.us/dahyeon/blog - name: IMAGE_DIGEST value: $(params.image-digest) - - name: CDN_RELEASE + - name: CDN_RELEASE_ID value: $(params.cdn-release-id) - name: CDN_MANIFEST_KEY value: $(params.cdn-manifest-key) + - name: CDN_URL_PREFIX + value: $(params.CDN_URL_PREFIX) - name: DEPLOYMENT_NAME value: blog script: | @@ -532,16 +532,16 @@ spec: set -eu case "$DEPLOY_ENV" in staging|prod) ;; *) echo 'Invalid deployment environment' >&2; exit 1;; esac printf '%s\n' "$IMAGE_DIGEST" | grep -Eq '^sha256:[0-9a-f]{64}$' - printf '%s\n' "$CDN_RELEASE" | grep -Eq '^[0-9a-f]{16}$' - case "$DEPLOY_ENV" in prod) CDN_PROJECT=blog ;; staging) CDN_PROJECT=blog-staging ;; esac - test "$CDN_MANIFEST_KEY" = "$CDN_PROJECT/_releases/$CDN_RELEASE/complete.json" + printf '%s\n' "$CDN_RELEASE_ID" | grep -Eq '^[0-9a-f]{16}$' + printf '%s\n' "$CDN_URL_PREFIX" | grep -Eq '^[a-z][a-z0-9-]{0,62}$' + test "$CDN_MANIFEST_KEY" = "$CDN_URL_PREFIX/_releases/$CDN_RELEASE_ID/complete.json" MANIFEST="$STATE_DIR/apps/blog/overlays/$DEPLOY_ENV/kustomization.yaml" test "$(yq '[.images[] | select(.name == strenv(APP_IMAGE))] | length' "$MANIFEST")" = 1 test "$(yq '[.replicas[] | select(.name == strenv(DEPLOYMENT_NAME))] | length' "$MANIFEST")" = 1 yq -i '(.images[] | select(.name == strenv(APP_IMAGE))) |= (del(.newTag) | .digest = strenv(IMAGE_DIGEST))' "$MANIFEST" yq -i '(.replicas[] | select(.name == strenv(DEPLOYMENT_NAME))).count = 1' "$MANIFEST" yq -i '.commonAnnotations."blog.dahyeon.us/source-revision" = strenv(REVISION)' "$MANIFEST" - yq -i '.commonAnnotations."blog.dahyeon.us/cdn-release" = strenv(CDN_RELEASE)' "$MANIFEST" + yq -i '.commonAnnotations."blog.dahyeon.us/cdn-release" = strenv(CDN_RELEASE_ID)' "$MANIFEST" yq -i '.commonAnnotations."blog.dahyeon.us/cdn-manifest" = strenv(CDN_MANIFEST_KEY)' "$MANIFEST" - name: commit-and-push image: docker.io/alpine/git:2.49.1@sha256:c0280cf9572316299b08544065d3bf35db65043d5e3963982ec50647d2746e26