coreos/prometheus-operator
1
0
Fork 0
mirror of https://github.com/coreos/prometheus-operator.git synced 2026-02-05 15:46:31 +01:00
Code Issues Releases Wiki Activity

Merge pull request #7829 from yp969803/issue7790

Browse Source 
Use map list type for status bindings
This commit is contained in:
Y@&h
2025-08-21 19:26:21 +05:30
committed by GitHub
parent 99aa298f20
commit 09797ff419
6 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bundle.yaml generated
View File

@@ -62025,6 +62025,12 @@ spec:
- resource
type: object
type: array
x-kubernetes-list-map-keys:
- group
- resource
- name
- namespace
x-kubernetes-list-type: map
type: object
required:
- spec

6
example/prometheus-operator-crd-full/monitoring.coreos.com_servicemonitors.yaml generated
View File

@@ -1367,6 +1367,12 @@ spec:
- resource
type: object
type: array
x-kubernetes-list-map-keys:
- group
- resource
- name
- namespace
x-kubernetes-list-type: map
type: object
required:
- spec

6
example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml generated
View File

@@ -1368,6 +1368,12 @@ spec:
- resource
type: object
type: array
x-kubernetes-list-map-keys:
- group
- resource
- name
- namespace
x-kubernetes-list-type: map
type: object
required:
- spec

9
jsonnet/prometheus-operator/servicemonitors-crd.json
View File

@@ -1193,7 +1193,14 @@
],
"type": "object"
},
"type": "array"
"type": "array",
"x-kubernetes-list-map-keys": [
"group",
"resource",
"name",
"namespace"
],
"x-kubernetes-list-type": "map"
}
},
"type": "object"

5
pkg/apis/monitoring/v1/types.go
View File

@@ -1028,6 +1028,11 @@ const (
// +k8s:openapi-gen=true
type ConfigResourceStatus struct {
// The list of workload resources (Prometheus or PrometheusAgent) which select the configuration resource.
// +listType=map
// +listMapKey=group
// +listMapKey=resource
// +listMapKey=name
// +listMapKey=namespace
// +optional
Bindings []WorkloadBinding `json:"bindings,omitempty"`
}

6
pkg/prometheus/operator.go
View File

@@ -293,9 +293,7 @@ func UpdateServiceMonitorStatus(
Conditions: conditions,
})
}
_, err := c.mclient.MonitoringV1().ServiceMonitors(smon.Namespace).ApplyStatus(ctx, ApplyConfigurationFromServiceMonitor(smon), metav1.ApplyOptions{FieldManager: operator.PrometheusOperatorFieldManager, Force: true})
if err != nil {
return err
}
return nil
return err
}