Fix Kaniko registry auth and push target for Harbor builds.

Mount docker config as config.json (Kaniko requirement), push via
harbor-registry internal URL, and wire harbor_registry_user credentials
in Helm/GitOps values.

Co-authored-by: Cursor <cursoragent@cursor.com>

.gitea/workflows/build-deploy.yaml

@@ -159,7 +159,7 @@ jobs:
                         mountPath: /workspace
                 containers:
                   - name: kaniko
-                    image: ${PULL_REGISTRY}/${PROJECT}/kaniko-executor:v1.27.6-debug
+                    image: ${PULL_REGISTRY}/${PROJECT}/kaniko-executor:v1.23.2
                     # Base image (node:24-alpine) is seeded in Harbor abrban/ — avoids
                     # flaky direct pulls from docker.io through the egress proxy.
                     envFrom:
@@ -224,7 +224,7 @@ jobs:
                         mountPath: /workspace
                 containers:
                   - name: kaniko
-                    image: ${PULL_REGISTRY}/${PROJECT}/kaniko-executor:v1.27.6-debug
+                    image: ${PULL_REGISTRY}/${PROJECT}/kaniko-executor:v1.23.2
                     envFrom:
                       - secretRef:
                           name: registry-egress-proxy

backend/helm/cloudhost-platform/templates/backend-deployment.yaml

@@ -125,6 +125,15 @@ spec:
                   name: {{ include "cloudhost-platform.secretName" . }}
                   key: mizbansms-password
             {{- end }}
+            {{- if .Values.registry.credentialsSecret }}
+            - name: REGISTRY_USERNAME
+              value: {{ .Values.registry.username | default "harbor_registry_user" | quote }}
+            - name: REGISTRY_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.registry.credentialsSecret | quote }}
+                  key: {{ .Values.registry.credentialsPasswordKey | default "REGISTRY_CREDENTIAL_PASSWORD" | quote }}
+            {{- end }}
             {{- include "cloudhost-platform.buildEnv" . | nindent 12 }}
             {{- range $key, $val := .Values.backend.env }}
             - name: {{ $key }}

backend/helm/cloudhost-platform/values.yaml

@@ -28,15 +28,22 @@ images:
     tag: "1.0.0"
     pullPolicy: IfNotPresent
 
+# Kaniko push credentials — harbor_registry_user for harbor-registry:5000 (Harbor production).
+registry:
+  credentialsSecret: ""
+  credentialsPasswordKey: REGISTRY_CREDENTIAL_PASSWORD
+  username: harbor_registry_user
+
 # Kaniko job images — defaults pull from Harbor proxy-cache.
 # Override any line for a different registry/tag.
 build:
   images:
-    kaniko: registry.abrban.com/proxy-gcr/kaniko-project/executor:v1.23.2
-    alpine: registry.abrban.com/proxy-dockerhub/library/alpine:3.19
-    alpineGit: registry.abrban.com/proxy-dockerhub/alpine/git:2.43.0
-  # Prefix for Docker Hub images in generated user-app Dockerfiles (node, php, …)
-  baseImageRegistry: registry.abrban.com/proxy-dockerhub/library
+    # Seeded into abrban/ via gitops/jobs/seed-ci-images.yaml — avoid flaky proxy-gcr pulls.
+    kaniko: registry.abrban.com/abrban/kaniko-executor:v1.27.6-debug
+    alpine: registry.abrban.com/abrban/alpine:3.19
+    alpineGit: registry.abrban.com/abrban/alpine-git:2.43.0
+  # Seeded base images (gitops/jobs/seed-ci-images.yaml) — proxy-dockerhub cache can be corrupt on first pull.
+  baseImageRegistry: registry.abrban.com/abrban
   # Secret with HTTP_PROXY/HTTPS_PROXY for Kaniko build jobs (npm, apk, git clone).
   # Set to registry-egress-proxy in production; leave empty when nodes have direct egress.
   egressProxySecret: ""

backend/src/build/build.service.ts

@@ -434,10 +434,10 @@ export class BuildService {
    * Returns { imageUri, buildLog } — the full image URI and the build logs.
    */
   async buildImage(app: Application, deploymentId?: string): Promise<{ imageUri: string; buildLog: string }> {
-    const registryUrl = this.registryService.getRegistryUrl();
+    const registryPushUrl = this.registryService.getRegistryPushUrl();
     const buildNamespace = this.registryService.getBuildNamespace();
     const tag = `${Date.now()}`;
-    const imageUri = this.registryService.buildImageReference(app.userId, app.name, tag);
+    const imageUri = this.registryService.buildPushImageReference(app.userId, app.name, tag);
 
     this.logger.log(`Starting image build for ${app.name} → ${imageUri}`);
 
@@ -530,11 +530,11 @@ export class BuildService {
     // Build the Kaniko Job spec
     // Always use dir context — init containers prepare /workspace/source
     const kanikoArgs = [
-      '--dockerfile=/workspace/Dockerfile',
+      '--dockerfile=Dockerfile',
       '--context=dir:///workspace/source',
       `--destination=${imageUri}`,
       '--cache=true',
-      `--cache-repo=${registryUrl}/${app.userId}/cache`,
+      `--cache-repo=${registryPushUrl}/${app.userId}/cache`,
       '--insecure',
       '--skip-tls-verify',
       '--single-snapshot',
@@ -544,7 +544,10 @@ export class BuildService {
     const volumes: any[] = [
       {
         name: 'docker-config',
-        secret: { secretName: 'registry-credentials' },
+        secret: {
+          secretName: 'registry-credentials',
+          items: [{ key: '.dockerconfigjson', path: 'config.json' }],
+        },
       },
       {
         name: 'dockerfile',
@@ -580,7 +583,6 @@ export class BuildService {
           reject_unsafe_path() {
             case "$1" in ..|../*|*/../*|/*) echo "ERROR: unsafe archive path: $1" && exit 1;; esac
           } &&
-          cp /workspace/Dockerfile /workspace-out/Dockerfile &&
           mkdir -p /tmp/extract &&
           cd /tmp/extract &&
           if tar tzf /source-pvc/source.zip >/dev/null 2>&1; then
@@ -610,6 +612,7 @@ export class BuildService {
             cp -a /tmp/extract/. /workspace-out/source/
           fi &&
           rm -rf /tmp/extract &&
+          cp /dockerfile/Dockerfile /workspace-out/source/Dockerfile &&
           echo "--- Final workspace contents ---" &&
           ls -la /workspace-out/source/
         `,
@@ -618,7 +621,7 @@ export class BuildService {
           { name: 'workspace', mountPath: '/workspace-out' },
           {
             name: 'dockerfile',
-            mountPath: '/workspace/Dockerfile',
+            mountPath: '/dockerfile/Dockerfile',
             subPath: 'Dockerfile',
           },
           { name: 'source-pvc', mountPath: '/source-pvc' },
@@ -677,7 +680,7 @@ export class BuildService {
           fi
           echo ">>> Cloning branch '$GIT_BRANCH' from $GIT_URL"
           git clone --depth 1 --branch "$GIT_BRANCH" "$GIT_URL" /workspace-out/source
-          cp /dockerfile/Dockerfile /workspace-out/Dockerfile
+          cp /dockerfile/Dockerfile /workspace-out/source/Dockerfile
           echo ">>> Workspace contents:"
           ls -la /workspace-out/source/
         `,
@@ -708,7 +711,7 @@ export class BuildService {
           '-c',
           `
           mkdir -p /workspace-out/source &&
-          cp /dockerfile/Dockerfile /workspace-out/Dockerfile &&
+          cp /dockerfile/Dockerfile /workspace-out/source/Dockerfile &&
           echo ">>> Prepared empty workspace for fresh install" &&
           ls -la /workspace-out/
         `,
@@ -1134,25 +1137,27 @@ export class BuildService {
       }
     }
 
-    // 3. Ensure registry-credentials secret (docker config for Kaniko to push)
+    // 3. Ensure registry-credentials secret (docker config for Kaniko push/pull)
     const registrySecretName = 'registry-credentials';
+    const registrySecretBody = {
+      metadata: { name: registrySecretName, namespace },
+      type: 'kubernetes.io/dockerconfigjson',
+      data: {
+        '.dockerconfigjson': Buffer.from(this.registryService.buildDockerConfigJson()).toString('base64'),
+      },
+    };
     try {
-      await coreApi.readNamespacedSecret({
+      await coreApi.replaceNamespacedSecret({
         name: registrySecretName,
         namespace,
+        body: registrySecretBody,
       });
     } catch (err: any) {
       if (err.code === 404 || err.body?.code === 404) {
         this.logger.log(`Secret "${registrySecretName}" not found in "${namespace}" — creating it`);
         await coreApi.createNamespacedSecret({
           namespace,
-          body: {
-            metadata: { name: registrySecretName, namespace },
-            type: 'kubernetes.io/dockerconfigjson',
-            data: {
-              '.dockerconfigjson': Buffer.from(this.registryService.buildDockerConfigJson()).toString('base64'),
-            },
-          },
+          body: registrySecretBody,
         });
       } else {
         throw err;

backend/src/config/configuration.ts

@@ -139,16 +139,16 @@ export default () => ({
      * and managed-service charts (e.g. `node:20-alpine` →
      * `registry.abrban.com/proxy-dockerhub/library/node:20-alpine`).
      */
-    baseImageRegistry: (process.env.BASE_IMAGE_REGISTRY || 'registry.abrban.com/proxy-dockerhub/library')
+    baseImageRegistry: (process.env.BASE_IMAGE_REGISTRY || 'registry.abrban.com/abrban')
       .trim()
       .replace(/\/+$/, ''),
     /** Full image refs for Kaniko jobs — override via Helm values or env. */
     images: {
       kaniko:
         process.env.KANIKO_IMAGE ||
-        'registry.abrban.com/proxy-gcr/kaniko-project/executor:v1.23.2',
-      alpine: (process.env.BUILD_ALPINE_IMAGE || 'registry.abrban.com/proxy-dockerhub/library/alpine:3.19').trim(),
-      alpineGit: (process.env.BUILD_ALPINE_GIT_IMAGE || 'registry.abrban.com/proxy-dockerhub/alpine/git:2.43.0').trim(),
+        'registry.abrban.com/abrban/kaniko-executor:v1.27.6-debug',
+      alpine: (process.env.BUILD_ALPINE_IMAGE || 'registry.abrban.com/abrban/alpine:3.19').trim(),
+      alpineGit: (process.env.BUILD_ALPINE_GIT_IMAGE || 'registry.abrban.com/abrban/alpine-git:2.43.0').trim(),
     },
     /**
      * Secret name with HTTP_PROXY / HTTPS_PROXY / NO_PROXY for build pods

backend/src/kubernetes/registry.service.ts

@@ -28,6 +28,29 @@ export class RegistryService {
     return url.replace(/^https?:\/\//, '');
   }
 
+  /** Docker auth key — hostname[:port] only, no repository path prefix. */
+  getRegistryHost(): string {
+    const url = this.getRegistryUrl();
+    const slash = url.indexOf('/');
+    return slash === -1 ? url : url.slice(0, slash);
+  }
+
+  /** Push target host[:port][/project] — Kaniko destination (may differ from pull URL on Harbor). */
+  getRegistryPushUrl(): string {
+    const buildNs = this.getBuildNamespace();
+    const url =
+      this.configService.get<string>('registry.url') ||
+      `registry.${buildNs}.svc.cluster.local:5000`;
+    return url.replace(/^https?:\/\//, '');
+  }
+
+  /** Push target host:port only, no repository path prefix. */
+  getRegistryPushHost(): string {
+    const url = this.getRegistryPushUrl();
+    const slash = url.indexOf('/');
+    return slash === -1 ? url : url.slice(0, slash);
+  }
+
   getRegistryCredentials(): { username: string; password: string } {
     return {
       username: this.configService.get<string>('registry.username') || 'admin',
@@ -39,6 +62,11 @@ export class RegistryService {
     return `${this.getRegistryUrl()}/${userId}/${appName}:${tag}`;
   }
 
+  /** Kaniko push target — uses registry.url (in-cluster harbor-registry on Harbor setups). */
+  buildPushImageReference(userId: string, appName: string, tag: string): string {
+    return `${this.getRegistryPushUrl()}/${userId}/${appName}:${tag}`;
+  }
+
   parseImageReference(imageRef: string): ParsedImageReference {
     const normalized = imageRef.replace(/^https?:\/\//, '');
     const slashIdx = normalized.indexOf('/');
@@ -56,24 +84,35 @@ export class RegistryService {
     };
   }
 
-  /** Re-point any stored image (e.g. legacy external host) to the in-cluster registry. */
+  /** Re-point any stored image (e.g. push host) to the pull registry URL for kubelet. */
   normalizeImageReference(imageRef: string): string {
     const { repository, tag } = this.parseImageReference(imageRef);
-    return `${this.getRegistryUrl()}/${repository}:${tag}`;
+    const pullBase = this.getRegistryUrl().replace(/\/$/, '');
+    const slash = pullBase.indexOf('/');
+    const pullPath = slash === -1 ? '' : pullBase.slice(slash + 1);
+    let repo = repository;
+    if (pullPath && (repo === pullPath || repo.startsWith(`${pullPath}/`))) {
+      repo = repo === pullPath ? '' : repo.slice(pullPath.length + 1);
+    }
+    if (!repo) {
+      throw new Error(`Invalid image reference after normalization: ${imageRef}`);
+    }
+    return `${pullBase}/${repo}:${tag}`;
   }
 
   buildDockerConfigJson(): string {
     const { username, password } = this.getRegistryCredentials();
     const auth = username && password ? Buffer.from(`${username}:${password}`).toString('base64') : '';
-    const host = this.getRegistryUrl();
-    return JSON.stringify({
-      auths: {
-        [host]: { auth },
-        [`registry.${this.getBuildNamespace()}.svc.cluster.local:5000`]: {
-          auth,
-        },
-      },
-    });
+    const pullHost = this.getRegistryHost();
+    const pushHost = this.getRegistryPushHost();
+    const auths: Record<string, { auth: string }> = {
+      [pullHost]: { auth },
+      [`registry.${this.getBuildNamespace()}.svc.cluster.local:5000`]: { auth },
+    };
+    if (pushHost !== pullHost) {
+      auths[pushHost] = { auth };
+    }
+    return JSON.stringify({ auths });
   }
 
   async ensureRegistryPullSecret(coreApi: k8s.CoreV1Api, namespace: string): Promise<void> {

gitops/harbor/registry-ingress.yaml

@@ -0,0 +1,124 @@
+# registry.abrban.com — Traefik path split
+#
+# Proxy-cache projects (proxy-dockerhub, proxy-gcr, …) MUST hit harbor-core so
+# Harbor can pull upstream on demand. harbor-registry only stores blobs; it does
+# not run proxy-cache logic → 404 for uncached proxy paths.
+#
+# Direct pushes (abrban/, rook/) stay on harbor-registry where Kaniko/skopeo
+# wrote the blobs.
+#
+# Apply: kubectl apply -f gitops/harbor/registry-ingress.yaml
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: registry
+  namespace: cloudhost
+  annotations:
+    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    traefik.ingress.kubernetes.io/router.middlewares: cloudhost-long-timeout@kubernetescrd
+spec:
+  ingressClassName: traefik
+  tls:
+    - hosts:
+        - registry.abrban.com
+      secretName: abrban-wildcard-tls
+  rules:
+    - host: registry.abrban.com
+      http:
+        paths:
+          # ── Proxy-cache (harbor-core serves v2 + on-demand upstream pull) ──
+          - path: /v2/proxy-dockerhub/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          - path: /v2/proxy-gcr/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          - path: /v2/proxy-quay/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          - path: /v2/proxy-k8s/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          - path: /v2/proxy-gitea/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          # ── abrban/rook project images (served by harbor-core; required for k3s mirror pulls) ──
+          - path: /v2/abrban/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          - path: /v2/rook/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          # ── Legacy registry (platform images pre-Harbor) ──
+          - path: /v2/
+            pathType: Prefix
+            backend:
+              service:
+                name: registry
+                port:
+                  number: 5000
+          # ── Harbor UI / API ──
+          - path: /api/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          - path: /service/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          - path: /c/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          - path: /chartrepo/
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-core
+                port:
+                  number: 80
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: harbor-portal
+                port:
+                  number: 80

gitops/jobs/build-platform-kaniko.yaml

@@ -31,7 +31,7 @@ spec:
               mountPath: /workspace
       containers:
         - name: kaniko
-          image: registry.abrban.com/proxy-gcr/kaniko-project/executor:v1.23.2
+          image: registry.abrban.com/abrban/kaniko-executor:v1.23.2
           env:
             - name: IMAGE_TAG
               value: bootstrap

gitops/jobs/seed-ci-images.yaml

@@ -7,7 +7,7 @@
 #   kubectl -n cloudhost wait --for=condition=complete job/seed-ci-images --timeout=15m
 #
 # Images copied (see RUNBOOK-CICD.fa.md):
-#   abrban/act-runner, abrban/alpine-git, abrban/node, abrban/kaniko-executor
+#   abrban/act-runner, abrban/alpine, abrban/alpine-git, abrban/node, abrban/kaniko-executor
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -39,6 +39,9 @@ spec:
               skopeo copy --dest-tls-verify=false --dest-creds="${CREDS}" \
                 docker://docker.io/gitea/act_runner:0.2.11 \
                 "${DEST}/act-runner:0.2.11"
+              skopeo copy --dest-tls-verify=false --dest-creds="${CREDS}" \
+                docker://docker.io/library/alpine:3.19 \
+                "${DEST}/alpine:3.19"
               skopeo copy --dest-tls-verify=false --dest-creds="${CREDS}" \
                 docker://docker.io/alpine/git:2.43.0 \
                 "${DEST}/alpine-git:2.43.0"
@@ -46,6 +49,14 @@ spec:
                 docker://docker.io/library/node:24-alpine \
                 "${DEST}/node:24-alpine"
               skopeo copy --dest-tls-verify=false --dest-creds="${CREDS}" \
-                docker://gcr.io/kaniko-project/executor:v1.27.6-debug \
+                docker://docker.io/library/node:20-alpine \
+                "${DEST}/node:20-alpine"
+              # Tag present in Harbor abrban/ — seed via proxy-gcr (see seed-ci-images.yaml).
+              skopeo copy --dest-tls-verify=false --dest-creds="${CREDS}" \
+                docker://registry.abrban.com/proxy-gcr/kaniko-project/executor:v1.23.2 \
+                "${DEST}/kaniko-executor:v1.23.2"
+              # Alias for CI/configs that reference the debug tag name.
+              skopeo copy --dest-tls-verify=false --dest-creds="${CREDS}" \
+                docker://harbor-registry.cloudhost.svc.cluster.local:5000/abrban/kaniko-executor:v1.23.2 \
                 "${DEST}/kaniko-executor:v1.27.6-debug"
               echo SEED_OK

gitops/platform/values-abrban.example.yaml

@@ -11,6 +11,11 @@
 namespace: cloudhost
 createNamespace: false
 
+registry:
+  credentialsSecret: harbor-core
+  credentialsPasswordKey: REGISTRY_CREDENTIAL_PASSWORD
+  username: harbor_registry_user
+
 global:
   storageClass: local-path
 
@@ -31,10 +36,10 @@ images:
 # Kaniko job images — Harbor proxy-cache (first pull is slow, no manual seed needed).
 build:
   images:
-    kaniko: registry.abrban.com/proxy-gcr/kaniko-project/executor:v1.23.2
-    alpine: registry.abrban.com/proxy-dockerhub/library/alpine:3.19
-    alpineGit: registry.abrban.com/proxy-dockerhub/alpine/git:2.43.0
-  baseImageRegistry: registry.abrban.com/proxy-dockerhub/library
+    kaniko: registry.abrban.com/abrban/kaniko-executor:v1.27.6-debug
+    alpine: registry.abrban.com/abrban/alpine:3.19
+    alpineGit: registry.abrban.com/abrban/alpine-git:2.43.0
+  baseImageRegistry: registry.abrban.com/abrban
   # Kaniko + init containers (npm/apk/composer/pip/git clone) on restricted egress.
   egressProxySecret: registry-egress-proxy
 

scripts/trigger-platform-build.sh

@@ -40,7 +40,7 @@ spec:
               mountPath: /workspace
       containers:
         - name: kaniko
-          image: registry.abrban.com/proxy-gcr/kaniko-project/executor:v1.23.2
+          image: registry.abrban.com/abrban/kaniko-executor:v1.23.2
           command:
             - sh
             - -ec