Skip to content

internal/plugins/ansible: manager scaffolding updates for --metrics-addr and envvars #3570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joelanford merged 2 commits into from
Jul 27, 2020
Merged

internal/plugins/ansible: manager scaffolding updates for --metrics-addr and envvars #3570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
634d968
internal/plugins/ansible: use default --metrics-addr when auth proxy …
joelanford Jul 27, 2020
2317469
internal/plugins/ansible: add ProjectNameMixin to auth_proxy_patch.go
joelanford Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ var _ file.Template = &AuthProxyPatch{}
// prometheus metrics for manager Pod.
type AuthProxyPatch struct {
file.TemplateMixin
file.ProjectNameMixin
}

// SetTemplateDefaults implements input.Template
Expand Down Expand Up @@ -65,4 +66,9 @@ spec:
ports:
- containerPort: 8443
name: https
- name: manager
args:
- "--metrics-addr=127.0.0.1:8080"
- "--enable-leader-election"
- "--leader-election-id={{ .ProjectName }}"
`
8 changes: 0 additions & 8 deletions internal/plugins/ansible/v1/scaffolds/internal/templates/config/manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
`