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

Use absolute domain name for the events address
pull/2550/head
Stefan Prodan 3 years ago committed by GitHub
commit 368f2d3542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,6 +1,6 @@
- op: add
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
path: /spec/template/spec/serviceAccountName
value: helm-controller

@ -1,6 +1,6 @@
- op: add
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
path: /spec/template/spec/serviceAccountName
value: image-automation-controller

@ -1,6 +1,6 @@
- op: add
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
path: /spec/template/spec/serviceAccountName
value: image-reflector-controller

@ -1,6 +1,6 @@
- op: add
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
path: /spec/template/spec/serviceAccountName
value: kustomize-controller

@ -1,6 +1,6 @@
- op: add
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
path: /spec/template/spec/serviceAccountName
value: source-controller

@ -73,7 +73,7 @@ func generate(base string, options Options) error {
// traffic from going through http proxy. Without fully specified
// domain they need to mention `notifications-controller` explicitly in
// `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 {

Loading…
Cancel
Save