actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-23 16:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2564 from fluxcd/dot-domain-nc

Browse source 
Use absolute domain name for the events address
This commit is contained in:
Stefan Prodan 2022-03-23 12:17:35 +02:00 committed by GitHub
commit 368f2d3542
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/bases/helm-controller/patch.yaml
View file

@ -1,6 +1,6 @@
- op: add - op: add
path: /spec/template/spec/containers/0/args/0 path: /spec/template/spec/containers/0/args/0
value: --events-addr=http://notification-controller/ value: --events-addr=http://notification-controller.flux-system.svc.cluster.local./
- op: add - op: add
path: /spec/template/spec/serviceAccountName path: /spec/template/spec/serviceAccountName
value: helm-controller value: helm-controller

2
manifests/bases/image-automation-controller/patch.yaml
View file

@ -1,6 +1,6 @@
- op: add - op: add
path: /spec/template/spec/containers/0/args/0 path: /spec/template/spec/containers/0/args/0
value: --events-addr=http://notification-controller/ value: --events-addr=http://notification-controller.flux-system.svc.cluster.local./
- op: add - op: add
path: /spec/template/spec/serviceAccountName path: /spec/template/spec/serviceAccountName
value: image-automation-controller value: image-automation-controller

2
manifests/bases/image-reflector-controller/patch.yaml
View file

@ -1,6 +1,6 @@
- op: add - op: add
path: /spec/template/spec/containers/0/args/0 path: /spec/template/spec/containers/0/args/0
value: --events-addr=http://notification-controller/ value: --events-addr=http://notification-controller.flux-system.svc.cluster.local./
- op: add - op: add
path: /spec/template/spec/serviceAccountName path: /spec/template/spec/serviceAccountName
value: image-reflector-controller value: image-reflector-controller

2
manifests/bases/kustomize-controller/patch.yaml
View file

@ -1,6 +1,6 @@
- op: add - op: add
path: /spec/template/spec/containers/0/args/0 path: /spec/template/spec/containers/0/args/0
value: --events-addr=http://notification-controller/ value: --events-addr=http://notification-controller.flux-system.svc.cluster.local./
- op: add - op: add
path: /spec/template/spec/serviceAccountName path: /spec/template/spec/serviceAccountName
value: kustomize-controller value: kustomize-controller

2
manifests/bases/source-controller/patch.yaml
View file

@ -1,6 +1,6 @@
- op: add - op: add
path: /spec/template/spec/containers/0/args/0 path: /spec/template/spec/containers/0/args/0
value: --events-addr=http://notification-controller/ value: --events-addr=http://notification-controller.flux-system.svc.cluster.local./
- op: add - op: add
path: /spec/template/spec/serviceAccountName path: /spec/template/spec/serviceAccountName
value: source-controller value: source-controller

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

@ -73,7 +73,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.%s.svc.%s./", options.NotificationController, options.Namespace, 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 {