realestate-crawler: dockerhub pull-secret + lift image-pin on ui/api
Companion to the GHA migration in immovika/realestate-crawler@c2acbf5. Apps row of /upgrade-state was flagging ⚠ because Keel poll on the four Deployments returned 401 — DockerHub repo viktorbarzin/realestatecrawler is private, the Deployments had no imagePullSecrets, and Keel's poll-secret discovery list came up empty. Pods kept running only because the image landed in containerd cache months ago. Adds: - ExternalSecret `dockerhub-pull-secret` synced from Vault secret/viktor.dockerhub_registry_password. ESO template renders the dockerconfigjson server-side (Sprig b64enc) so the PAT never sits in cleartext in any K8s manifest. - image_pull_secrets { name = "dockerhub-pull-secret" } on all 4 Deployments (ui, api, celery, celery-beat). - Lifts `ignore_changes=[container[0].image]` on ui+api so TF re-asserts :latest. CI no longer patches the image to a numeric tag — Keel now drives rollouts from digest changes on :latest. Live state after apply: all 4 Deployments on :latest with imagePullSecrets=dockerhub-pull-secret; ExternalSecret SecretSynced=True. Once a GHA build pushes a new digest, Keel will roll all four within ~1h. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
parent
0a4ce162f8
commit
4f64f51bba
1 changed files with 55 additions and 3 deletions
|
|
@ -77,6 +77,48 @@ data "kubernetes_secret" "eso_secrets" {
|
||||||
depends_on = [kubernetes_manifest.external_secret]
|
depends_on = [kubernetes_manifest.external_secret]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# DockerHub pull-secret — image is private on DockerHub
|
||||||
|
# (viktorbarzin/realestatecrawler and viktorbarzin/immoweb) and Keel polls
|
||||||
|
# the registry HEAD hourly for digest changes. Without auth, Keel hits 401
|
||||||
|
# and the rollout never fires. Pods themselves were pulling fine only
|
||||||
|
# because the image landed in the node's containerd cache months ago — a
|
||||||
|
# fresh node would also fail. ESO renders the dockerconfigjson server-side
|
||||||
|
# (Sprig `b64enc`) so the PAT never sits in K8s in cleartext.
|
||||||
|
resource "kubernetes_manifest" "dockerhub_pull_secret" {
|
||||||
|
manifest = {
|
||||||
|
apiVersion = "external-secrets.io/v1beta1"
|
||||||
|
kind = "ExternalSecret"
|
||||||
|
metadata = {
|
||||||
|
name = "dockerhub-pull-secret"
|
||||||
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
||||||
|
}
|
||||||
|
spec = {
|
||||||
|
refreshInterval = "1h"
|
||||||
|
secretStoreRef = {
|
||||||
|
name = "vault-kv"
|
||||||
|
kind = "ClusterSecretStore"
|
||||||
|
}
|
||||||
|
target = {
|
||||||
|
name = "dockerhub-pull-secret"
|
||||||
|
template = {
|
||||||
|
type = "kubernetes.io/dockerconfigjson"
|
||||||
|
data = {
|
||||||
|
".dockerconfigjson" = "{\"auths\":{\"https://index.docker.io/v1/\":{\"username\":\"viktorbarzin\",\"password\":\"{{ .pat }}\",\"auth\":\"{{ printf \"viktorbarzin:%s\" .pat | b64enc }}\"}}}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
data = [{
|
||||||
|
secretKey = "pat"
|
||||||
|
remoteRef = {
|
||||||
|
key = "viktor"
|
||||||
|
property = "dockerhub_registry_password"
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
depends_on = [kubernetes_namespace.realestate-crawler]
|
||||||
|
}
|
||||||
|
|
||||||
locals {
|
locals {
|
||||||
notification_settings = jsondecode(data.kubernetes_secret.eso_secrets.data["notification_settings"])
|
notification_settings = jsondecode(data.kubernetes_secret.eso_secrets.data["notification_settings"])
|
||||||
|
|
||||||
|
|
@ -118,7 +160,7 @@ resource "kubernetes_namespace" "realestate-crawler" {
|
||||||
name = "realestate-crawler"
|
name = "realestate-crawler"
|
||||||
labels = {
|
labels = {
|
||||||
"istio-injection" : "disabled"
|
"istio-injection" : "disabled"
|
||||||
tier = local.tiers.aux
|
tier = local.tiers.aux
|
||||||
"keel.sh/enrolled" = "true"
|
"keel.sh/enrolled" = "true"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -172,6 +214,9 @@ resource "kubernetes_deployment" "realestate-crawler-ui" {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
spec {
|
spec {
|
||||||
|
image_pull_secrets {
|
||||||
|
name = "dockerhub-pull-secret"
|
||||||
|
}
|
||||||
container {
|
container {
|
||||||
name = "realestate-crawler-ui"
|
name = "realestate-crawler-ui"
|
||||||
image = "viktorbarzin/immoweb:latest"
|
image = "viktorbarzin/immoweb:latest"
|
||||||
|
|
@ -190,7 +235,6 @@ resource "kubernetes_deployment" "realestate-crawler-ui" {
|
||||||
}
|
}
|
||||||
lifecycle {
|
lifecycle {
|
||||||
ignore_changes = [
|
ignore_changes = [
|
||||||
spec[0].template[0].spec[0].container[0].image,
|
|
||||||
spec[0].template[0].spec[0].dns_config, # KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2
|
spec[0].template[0].spec[0].dns_config, # KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -253,6 +297,9 @@ resource "kubernetes_deployment" "realestate-crawler-api" {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
spec {
|
spec {
|
||||||
|
image_pull_secrets {
|
||||||
|
name = "dockerhub-pull-secret"
|
||||||
|
}
|
||||||
container {
|
container {
|
||||||
name = "realestate-crawler-api"
|
name = "realestate-crawler-api"
|
||||||
image = "viktorbarzin/realestatecrawler:latest"
|
image = "viktorbarzin/realestatecrawler:latest"
|
||||||
|
|
@ -337,7 +384,6 @@ resource "kubernetes_deployment" "realestate-crawler-api" {
|
||||||
}
|
}
|
||||||
lifecycle {
|
lifecycle {
|
||||||
ignore_changes = [
|
ignore_changes = [
|
||||||
spec[0].template[0].spec[0].container[0].image,
|
|
||||||
spec[0].template[0].spec[0].dns_config, # KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2
|
spec[0].template[0].spec[0].dns_config, # KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -450,6 +496,9 @@ resource "kubernetes_deployment" "realestate-crawler-celery" {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
spec {
|
spec {
|
||||||
|
image_pull_secrets {
|
||||||
|
name = "dockerhub-pull-secret"
|
||||||
|
}
|
||||||
container {
|
container {
|
||||||
name = "celery-worker"
|
name = "celery-worker"
|
||||||
image = "viktorbarzin/realestatecrawler:latest"
|
image = "viktorbarzin/realestatecrawler:latest"
|
||||||
|
|
@ -585,6 +634,9 @@ resource "kubernetes_deployment" "realestate-crawler-celery-beat" {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
spec {
|
spec {
|
||||||
|
image_pull_secrets {
|
||||||
|
name = "dockerhub-pull-secret"
|
||||||
|
}
|
||||||
container {
|
container {
|
||||||
name = "celery-beat"
|
name = "celery-beat"
|
||||||
image = "viktorbarzin/realestatecrawler:latest"
|
image = "viktorbarzin/realestatecrawler:latest"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue