Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-03-03 11:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5574 from fluxcd/fix-manifestgen

Browse Source 
Fix manifest generation for `--storage-adv-addr` and `--events-addr` flags
This commit is contained in:
Stefan Prodan
2025-10-08 10:59:43 +03:00
committed by GitHub
parent f85cbfa9c8 f2ff083b8e
commit d5a2c66746
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/manifestgen/install/manifests.go
View File

@@ -75,7 +75,7 @@ func generate(base string, options Options) error {
// traffic from going through http proxy. Without fully specified // traffic from going through http proxy. Without fully specified
// domain they need to mention `notifications-controller` explicitly in // domain they need to mention `notifications-controller` explicitly in
// `no_proxy` variable after debugging http proxy logs. // `no_proxy` variable after debugging http proxy logs.
options.EventsAddr = fmt.Sprintf("http://%s.%s.svc.%s./", options.NotificationController, options.Namespace, options.ClusterDomain) options.EventsAddr = fmt.Sprintf("http://%s.$(RUNTIME_NAMESPACE).svc.%s./", options.NotificationController, options.ClusterDomain)
} }
if err := execTemplate(options, namespaceTmpl, path.Join(base, "namespace.yaml")); err != nil { if err := execTemplate(options, namespaceTmpl, path.Join(base, "namespace.yaml")); err != nil {

2
pkg/manifestgen/install/templates.go
View File

@@ -83,7 +83,7 @@ patches:
value: --log-level={{$logLevel}} value: --log-level={{$logLevel}}
- op: replace - op: replace
path: /spec/template/spec/containers/0/args/6 path: /spec/template/spec/containers/0/args/6
value: --storage-adv-addr=source-controller.$(RUNTIME_NAMESPACE).svc.{{$clusterDomain}}. value: --storage-adv-addr={{$component}}.$(RUNTIME_NAMESPACE).svc.{{$clusterDomain}}.
{{- else }} {{- else }}
- target: - target:
group: apps group: apps