Skip to content

refactor: absorb ZTVP RHBK config into rh-keycloak wrapper#146

Merged
sabre1041 merged 2 commits into
validatedpatterns:mainfrom
minmzzhang:generalize-rhbk-chart
Jun 23, 2026
Merged

refactor: absorb ZTVP RHBK config into rh-keycloak wrapper#146
sabre1041 merged 2 commits into
validatedpatterns:mainfrom
minmzzhang:generalize-rhbk-chart

Conversation

@minmzzhang

@minmzzhang minmzzhang commented Jun 17, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • Move all ZTVP-specific RHBK configuration from the generic rhbk subchart into the rh-keycloak wrapper chart values (realm, placeholders, extra secrets, SPIFFE, vault paths)
  • Rely on the OCI dependency (oci://quay.io/validatedpatterns/rhbk >=0.1.0) for the generalized rhbk subchart
  • Fix pipeline git-clone basic-auth workspace binding (conditional on git.credentials.enabled)

Dependencies

Test plan

  • helm lint and helm template pass on rh-keycloak wrapper
  • ArgoCD deploys all applications synced and healthy (tested with vendored subchart)
  • Keycloak realm import succeeds with data-driven placeholders and extra secrets
  • Pipeline git-clone works without credentials for public repos

@minmzzhang minmzzhang changed the title refactor: absorb ZTVP RHBK config into wrapper + enable supply chain refactor: absorb ZTVP RHBK config into rh-keycloak wrapper Jun 17, 2026
Move all ZTVP-specific configuration from the generic rhbk subchart
into the rh-keycloak wrapper values: full ZTVP realm definition,
realm import placeholders, extra secrets (keycloak-users, ACS OIDC,
RHTPA CLI OIDC), SPIFFE Identity Provider enablement, and vault paths.

Update rh-keycloak Chart.yaml to depend on rhbk >=0.1.0 (generalized).

Also fix pipeline git-clone basic-auth workspace binding to be
conditional on git.credentials.enabled, preventing failures when
cloning public repos without credentials configured.

Signed-off-by: Min Zhang <minzhang@redhat.com>
@minmzzhang minmzzhang force-pushed the generalize-rhbk-chart branch from 0815516 to b7aa8da Compare June 17, 2026 15:41
Kubernetes normalizes Go duration strings (e.g. "1h" -> "1h0m0s") when
storing ExternalSecret CRs, causing ArgoCD to detect a perpetual diff
and mark resources as OutOfSync. Use the fully-qualified "1h0m0s" format
so the desired manifest matches the live state exactly.

Signed-off-by: Min Zhang <minzhang@redhat.com>

@sabre1041 sabre1041 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sabre1041 sabre1041 merged commit 22ee647 into validatedpatterns:main Jun 23, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants