From 634d96879e1a6279793bd289399f52eeb3e17e47 Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Mon, 27 Jul 2020 14:06:05 -0400 Subject: [PATCH 1/2] internal/plugins/ansible: use default --metrics-addr when auth proxy is not in use --- .../templates/config/kdefault/auth_proxy_patch.go | 5 +++++ .../internal/templates/config/manager/manager.go | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go index 9491a79991..dfa25e7520 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go +++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go @@ -65,4 +65,9 @@ spec: ports: - containerPort: 8443 name: https + - name: manager + args: + - "--metrics-addr=127.0.0.1:8080" + - "--enable-leader-election" + - "--leader-election-id={{ .ProjectName }}" ` diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/manager/manager.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/config/manager/manager.go index 805a5a43f5..e20b37ce6d 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/manager/manager.go +++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/config/manager/manager.go @@ -74,14 +74,6 @@ spec: args: - "--enable-leader-election" - "--leader-election-id={{ .ProjectName }}" - - "--metrics-addr=127.0.0.1:8080" image: {{ .Image }} - env: - - name: WATCH_NAMESPACE - value: "" - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name terminationGracePeriodSeconds: 10 ` From 23174693b072300de3f15014856e409fae71d08c Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Mon, 27 Jul 2020 14:43:53 -0400 Subject: [PATCH 2/2] internal/plugins/ansible: add ProjectNameMixin to auth_proxy_patch.go --- .../internal/templates/config/kdefault/auth_proxy_patch.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go index dfa25e7520..2abb40cc6e 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go +++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go @@ -29,6 +29,7 @@ var _ file.Template = &AuthProxyPatch{} // prometheus metrics for manager Pod. type AuthProxyPatch struct { file.TemplateMixin + file.ProjectNameMixin } // SetTemplateDefaults implements input.Template