Skip to content

Reapply "Merge pull request #14 from abdalrahmanattya/feature/008-rep… #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abdalrahmanattya merged 1 commit into from
Aug 7, 2026
Merged

Reapply "Merge pull request #14 from abdalrahmanattya/feature/008-rep… #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/containerised-service/base/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
app.kubernetes.io/name: containerised-service
containers:
- name: containerised-service
image: ghcr.io/abdalrahmanattya/containerised-service-cicd@sha256:0000000000000000000000000000000000000000000000000000000000000000
image: ghcr.io/abdalrahmanattya/containerised-service-cicd@sha256:6a9075b289a699692f60f6936b84590c8ad487071145a909ae7c3de98025f3b2
imagePullPolicy: IfNotPresent
ports:
- name: http
Expand Down
21 changes: 12 additions & 9 deletions docs/project-journal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ it factual and replace stale status rather than accumulating a transcript.
## Current status

- **Project:** 5 — Kubernetes Deployment and GitOps Workflow
- **State:** Issue 008 Git-revert test prepared to reintroduce the known image
failure; it has not been merged or reconciled yet
- **Branch:** `feature/008-reintroduce-failure-by-revert`
- **State:** Issue 008 rollback test reproduced the known failure; the recovery
revert is prepared for review
- **Branch:** `feature/008-recover-by-reverting-revert`
- **Remote:** `origin` points to the public GitHub Project 5 repository
- **Target:** Docker Desktop local Kubernetes; context `docker-desktop` is
active and its control-plane node is Ready
Expand Down Expand Up @@ -90,9 +90,12 @@ it factual and replace stale status rather than accumulating a transcript.
- Verified `/health`, `/version`, and `/config-summary` returned the expected
healthy, `0.1.3`, and development responses after recovery. The temporary
localhost port-forward was stopped after verification.
- Prepared a Git revert of pull request 14's merge commit. The revert restores
the intentionally invalid digest while retaining later diagnosis and
recovery evidence; a journal conflict was resolved for that purpose.
- Merged the first rollback-test revert through pull request 16 at revision
`bcd224b`. Argo CD reconciled that revision, created a replacement pod, and
reproduced `ErrImagePull` and `ImagePullBackOff` with GHCR `NotFound` for the
all-zero digest. The previous healthy pod remained Ready.
- Prepared a second Git revert that reverses commit `0500536` and restores the
known-good digest. No imperative Kubernetes rollback command was used.

## Decisions

Expand All @@ -106,9 +109,9 @@ it factual and replace stale status rather than accumulating a transcript.

## Resume here

Review and merge the first rollback-test revert, then observe the known image
failure through Argo CD. After that observation, revert this new revert commit
in a second pull request to restore the known-good Git state.
Review and merge the recovery revert. Observe Argo CD reconcile the known-good
digest and verify Application health, Deployment availability, pod readiness,
HPA metrics, and service endpoints. Then document the completed rollback test.

## Open questions

Expand Down
Loading