Skip to content

Commit 4fb3556

Browse files
committed
fix issue-127
1 parent 7a72f0f commit 4fb3556

File tree

6 files changed

+17
-294
lines changed

6 files changed

+17
-294
lines changed

api/v1alpha1/types.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ type MetricsProperties struct {
4747
}
4848

4949
type MetricsServiceMonitorProperties struct {
50-
Enabled bool `json:"enabled,omitempty"`
51-
Interval prometheusv1.Duration `json:"interval,omitempty"`
52-
ScrapeTimeout prometheusv1.Duration `json:"scrapeTimeout,omitempty"`
53-
Relabellings []*prometheusv1.RelabelConfig `json:"relabellings,omitempty"`
54-
MetricRelabellings []*prometheusv1.RelabelConfig `json:"metricRelabelings,omitempty"`
55-
HonorLabels bool `json:"honorLabels,omitempty"`
56-
AdditionalLabels map[string]string `json:"additionalLabels,omitempty"`
57-
PodTargetLabels []string `json:"podTargetLabels,omitempty"`
50+
Enabled bool `json:"enabled,omitempty"`
51+
Interval prometheusv1.Duration `json:"interval,omitempty"`
52+
ScrapeTimeout prometheusv1.Duration `json:"scrapeTimeout,omitempty"`
53+
Relabellings []prometheusv1.RelabelConfig `json:"relabellings,omitempty"`
54+
MetricRelabellings []prometheusv1.RelabelConfig `json:"metricRelabelings,omitempty"`
55+
HonorLabels bool `json:"honorLabels,omitempty"`
56+
AdditionalLabels map[string]string `json:"additionalLabels,omitempty"`
57+
PodTargetLabels []string `json:"podTargetLabels,omitempty"`
5858
}
5959

6060
type MetricsPrometheusRuleProperties struct {

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 4 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crds/cache.cs.sap.com_redis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: redis.cache.cs.sap.com
88
spec:
99
group: cache.cs.sap.com

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ require (
3333
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3434
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
3535
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
36-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
3736
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
3837
github.com/fsnotify/fsnotify v1.7.0 // indirect
3938
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -87,7 +86,6 @@ require (
8786
golang.org/x/time v0.7.0 // indirect
8887
golang.org/x/tools v0.26.0 // indirect
8988
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
90-
google.golang.org/appengine v1.6.8 // indirect
9189
google.golang.org/protobuf v1.35.1 // indirect
9290
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9391
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)