forgejo-gitea-http.cicd.svc.cluster.local (headless svc, port 3000) not forgejo-gitea (doesn't exist). Also wire REGISTRY_BASE env var in deployment.yaml so it can be overridden without code change.
This commit is contained in:
@@ -31,7 +31,7 @@ const (
|
|||||||
argoNamespace = "argocd"
|
argoNamespace = "argocd"
|
||||||
saTokenPath = "/var/run/secrets/kubernetes.io/serviceaccount/token"
|
saTokenPath = "/var/run/secrets/kubernetes.io/serviceaccount/token"
|
||||||
saCACertPath = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
|
saCACertPath = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
|
||||||
defaultRegBase = "http://forgejo-gitea.cicd.svc.cluster.local:3000"
|
defaultRegBase = "http://forgejo-gitea-http.cicd.svc.cluster.local:3000"
|
||||||
defaultRegUser = "rock"
|
defaultRegUser = "rock"
|
||||||
promoterTimeout = 20 * time.Second
|
promoterTimeout = 20 * time.Second
|
||||||
)
|
)
|
||||||
@@ -224,10 +224,15 @@ func (p *ImagePromoter) patchApplication(ctx context.Context, entry promotionEnt
|
|||||||
case "kustomize":
|
case "kustomize":
|
||||||
images := getKustomizeImages(app, entry.SourceIndex)
|
images := getKustomizeImages(app, entry.SourceIndex)
|
||||||
newImages := updateImageEntry(images, image, digest)
|
newImages := updateImageEntry(images, image, digest)
|
||||||
path := fmt.Sprintf("/spec/sources/%d/kustomize/images", entry.SourceIndex)
|
// Patch the full kustomize block (not just /kustomize/images) so the
|
||||||
patch = []map[string]any{
|
// op succeeds even when the kustomize key is absent from the source.
|
||||||
{"op": "add", "path": path, "value": newImages},
|
// These apps only use kustomize overrides for image pinning, so
|
||||||
}
|
// replacing the whole block is safe.
|
||||||
|
patch = []map[string]any{{
|
||||||
|
"op": "add",
|
||||||
|
"path": fmt.Sprintf("/spec/sources/%d/kustomize", entry.SourceIndex),
|
||||||
|
"value": map[string]any{"images": newImages},
|
||||||
|
}}
|
||||||
|
|
||||||
case "helm":
|
case "helm":
|
||||||
// Helm runners use spec.source (singular). Patch helm parameters
|
// Helm runners use spec.source (singular). Patch helm parameters
|
||||||
|
|||||||
@@ -101,6 +101,8 @@ spec:
|
|||||||
name: forgejo-registry-pat
|
name: forgejo-registry-pat
|
||||||
key: pat
|
key: pat
|
||||||
optional: true
|
optional: true
|
||||||
|
- name: REGISTRY_BASE
|
||||||
|
value: "http://forgejo-gitea-http.cicd.svc.cluster.local:3000"
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: config
|
- name: config
|
||||||
mountPath: /etc/gateway
|
mountPath: /etc/gateway
|
||||||
|
|||||||
@@ -158,11 +158,16 @@ spec:
|
|||||||
ports:
|
ports:
|
||||||
- protocol: TCP
|
- protocol: TCP
|
||||||
port: 3000
|
port: 3000
|
||||||
# Allow to kubernetes API server (ArgoCD Application patching via in-cluster SA)
|
# Allow to kubernetes API server (ArgoCD Application patching via in-cluster SA).
|
||||||
|
# kube-apiserver runs on host network (192.168.1.162/166:6443) — must use ipBlock.
|
||||||
|
# ClusterIP 10.96.0.1:443 also routes there, covered by the 10.96.0.0/12 CIDR.
|
||||||
- to:
|
- to:
|
||||||
- namespaceSelector:
|
- ipBlock:
|
||||||
matchLabels:
|
cidr: 10.96.0.0/12
|
||||||
kubernetes.io/metadata.name: default
|
- ipBlock:
|
||||||
|
cidr: 192.168.1.0/24
|
||||||
ports:
|
ports:
|
||||||
- protocol: TCP
|
- protocol: TCP
|
||||||
port: 443
|
port: 443
|
||||||
|
- protocol: TCP
|
||||||
|
port: 6443
|
||||||
|
|||||||
Reference in New Issue
Block a user