Skip to content

Commit f447dc6

Browse files
authored
Drop sharding-exporter, move metrics to sharder (#638)
* Drop sharding-exporter * Move `sharder` monitoring manifests one level up * Update monitoring docs * Move `metrics` package one level up * Add generic exporter for object state * Add shard state exporter * Add ControllerRing state exporter * Adapt sharding dashboard * Switch webhosting-operator to generic exporter * Drop kube-state-metrics renovate config
1 parent b7ac94f commit f447dc6

31 files changed

Lines changed: 606 additions & 735 deletions

.github/renovate.json5

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -275,12 +275,6 @@
275275
],
276276
changelogUrl: 'https://github.com/kubernetes-sigs/prometheus-adapter',
277277
},
278-
{
279-
matchPackageNames: [
280-
'registry.k8s.io/kube-state-metrics/kube-state-metrics',
281-
],
282-
changelogUrl: 'https://github.com/kubernetes/kube-state-metrics',
283-
},
284278
{
285279
matchPackageNames: [
286280
'quay.io/brancz/kube-rbac-proxy',

cmd/sharder/app/app.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/manager"
3333

3434
"github.com/timebertt/kubernetes-controller-sharding/pkg/controller"
35+
shardingmetrics "github.com/timebertt/kubernetes-controller-sharding/pkg/metrics"
3536
healthzutils "github.com/timebertt/kubernetes-controller-sharding/pkg/utils/healthz"
3637
"github.com/timebertt/kubernetes-controller-sharding/pkg/webhook"
3738
)
@@ -104,6 +105,11 @@ func run(ctx context.Context, log logr.Logger, opts *options) error {
104105
return fmt.Errorf("failed adding webhooks to manager: %w", err)
105106
}
106107

108+
log.Info("Adding metrics to manager")
109+
if err = shardingmetrics.AddToManager(mgr); err != nil {
110+
return fmt.Errorf("failed adding metrics to manager: %w", err)
111+
}
112+
107113
log.Info("Starting manager")
108114
return mgr.Start(ctx)
109115
}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

4+
namespace: sharding-system
5+
46
resources:
5-
- sharder
6-
- sharding-exporter
7+
- servicemonitor.yaml
8+
# provide prometheus running in namespace "monitoring" with the permissions required for service discovery in namespace
9+
# "sharding-system"
10+
- prometheus_rbac.yaml
File renamed without changes.
File renamed without changes.

config/monitoring/sharder/kustomization.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

config/monitoring/sharding-exporter/clusterrole.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

config/monitoring/sharding-exporter/clusterrolebinding.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

config/monitoring/sharding-exporter/config.yaml

Lines changed: 0 additions & 66 deletions
This file was deleted.

config/monitoring/sharding-exporter/deployment.yaml

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)