Skip to content

Commit

Permalink
pkg: reconcile prometheus-adapter ServiceMonitor
Browse files Browse the repository at this point in the history
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
  • Loading branch information
dgrisonnet committed Sep 8, 2020
1 parent 54524d7 commit d7a6d5d
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
13 changes: 13 additions & 0 deletions pkg/manifests/manifests.go
Expand Up @@ -133,6 +133,7 @@ var (
PrometheusAdapterDeployment = "assets/prometheus-adapter/deployment.yaml"
PrometheusAdapterRoleBindingAuthReader = "assets/prometheus-adapter/role-binding-auth-reader.yaml"
PrometheusAdapterService = "assets/prometheus-adapter/service.yaml"
PrometheusAdapterServiceMonitor = "assets/prometheus-adapter/service-monitor.yaml"
PrometheusAdapterServiceAccount = "assets/prometheus-adapter/service-account.yaml"

PrometheusOperatorClusterRoleBinding = "assets/prometheus-operator/cluster-role-binding.yaml"
Expand Down Expand Up @@ -1711,6 +1712,18 @@ func (f *Factory) PrometheusAdapterService() (*v1.Service, error) {
return s, nil
}

func (f *Factory) PrometheusAdapterServiceMonitor() (*monv1.ServiceMonitor, error) {
sm, err := f.NewServiceMonitor(MustAssetReader(PrometheusAdapterServiceMonitor))
if err != nil {
return nil, err
}

sm.Namespace = f.namespace
sm.Spec.Endpoints[0].TLSConfig.ServerName = fmt.Sprintf("prometheus-adapter.%s.svc", f.namespace)

return sm, nil
}

func (f *Factory) PrometheusAdapterSecret(tlsSecret *v1.Secret, apiAuthConfigmap *v1.ConfigMap) (*v1.Secret, error) {
data := make(map[string]string)

Expand Down
11 changes: 11 additions & 0 deletions pkg/tasks/prometheusadapter.go
Expand Up @@ -181,6 +181,17 @@ func (t *PrometheusAdapterTask) Run() error {
return errors.Wrap(err, "reconciling PrometheusAdapter Deployment failed")
}
}
{
sm, err := t.factory.PrometheusAdapterServiceMonitor()
if err != nil {
return errors.Wrap(err, "initializing PrometheusAdapter ServiceMonitor failed")
}

err = t.client.CreateOrUpdateServiceMonitor(sm)
if err != nil {
return errors.Wrap(err, "reconciling PrometheusAdapter ServiceMonitor failed")
}
}
{
api, err := t.factory.PrometheusAdapterAPIService()
if err != nil {
Expand Down

0 comments on commit d7a6d5d

Please sign in to comment.