diff --git a/README.md b/README.md index a1e32e0..a8932b3 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ Then: 4. Manually promote that Freight to `staging`. 5. Check the STAGING site. 6. Manually promote the same Freight to `prod`. -7. Kargo copies that selected revision into the `prod` branch and pushes it. +7. Kargo force-updates the `prod` branch to that exact selected revision. 8. Argo CD syncs the PROD site from `prod`. The three Kubernetes namespaces are: diff --git a/bootstrap/02-kargo-pipeline.yaml b/bootstrap/02-kargo-pipeline.yaml index 8b75037..215eb07 100644 --- a/bootstrap/02-kargo-pipeline.yaml +++ b/bootstrap/02-kargo-pipeline.yaml @@ -33,6 +33,7 @@ spec: - values-staging.yaml - values-prod.yaml - templates + - website --- apiVersion: kargo.akuity.io/v1alpha1 @@ -113,67 +114,16 @@ spec: - uses: git-clone config: repoURL: ${{ vars.repoURL }} - author: - name: Kargo - email: kargo@max.test.scrumdapp.open-ict.hu checkout: - commit: ${{ commitFrom(vars.repoURL).ID }} - path: ./src - - branch: prod - create: true path: ./out - - uses: git-clear - config: - path: ./out - - - uses: copy - config: - inPath: ./src/Chart.yaml - outPath: ./out/Chart.yaml - - uses: copy - config: - inPath: ./src/values.yaml - outPath: ./out/values.yaml - - uses: copy - config: - inPath: ./src/values-dev.yaml - outPath: ./out/values-dev.yaml - - uses: copy - config: - inPath: ./src/values-staging.yaml - outPath: ./out/values-staging.yaml - - uses: copy - config: - inPath: ./src/values-prod.yaml - outPath: ./out/values-prod.yaml - - uses: copy - config: - inPath: ./src/templates - outPath: ./out/templates - - uses: copy - config: - inPath: ./src/bootstrap - outPath: ./out/bootstrap - - uses: copy - config: - inPath: ./src/README.md - outPath: ./out/README.md - - uses: copy - config: - inPath: ./src/.gitignore - outPath: ./out/.gitignore - - - uses: git-commit - as: commit - config: - path: ./out - message: Promote ${{ commitFrom(vars.repoURL).ID }} to prod - - uses: git-push + as: push config: path: ./out targetBranch: prod + force: true - uses: argocd-update config: @@ -181,4 +131,4 @@ spec: - name: web-prod sources: - repoURL: ${{ vars.repoURL }} - desiredRevision: ${{ outputs.commit.commit }} + desiredRevision: ${{ outputs.push.commit }} diff --git a/values-dev.yaml b/values-dev.yaml index 2d66161..f2b4b55 100644 --- a/values-dev.yaml +++ b/values-dev.yaml @@ -1,5 +1,4 @@ environment: DEV -gitCommit: 7cae72a ingress: host: web-dev.max.test.scrumdapp.open-ict.hu diff --git a/values.yaml b/values.yaml index a41d7dc..5c0580c 100644 --- a/values.yaml +++ b/values.yaml @@ -12,4 +12,3 @@ ingress: path: / environment: LOCAL -gitCommit: unknown diff --git a/website/index.html b/website/index.html index 13f4289..75f677d 100644 --- a/website/index.html +++ b/website/index.html @@ -85,16 +85,6 @@ font-weight: 900; } - .revision { - margin: 0.75rem 0 0; - color: #bfdbfe; - font-size: 0.9rem; - } - - code { - color: #f8fafc; - font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace; - } @@ -112,7 +102,6 @@
  • PROD release
    • Current environment: {{ .Values.environment }}
    -

    Git commit: {{ .Values.gitCommit }}