mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 11:48:53 +00:00
Code Activity

Change operator-set labels

Browse source
This commit is contained in:
Fabian Reinartz 2016-11-01 16:50:53 -07:00
parent 296cbd8742
commit 80041b6cc2
3 changed files with 8 additions and 9 deletions

3
example/prometheus-service.yaml
View file

@ -11,5 +11,4 @@ spec:
protocol: TCP
targetPort: web
selector:
prometheus.coreos.com/type: prometheus
prometheus.coreos.com/name: prometheus-main
prometheus: prometheus-main

8
pkg/operator/operator.go
View file

@ -452,7 +452,7 @@ func podRunningAndReady(pod v1.Pod) (bool, error) {
//
// TODO(fabxc): remove this once the PetSet controller learns how to do rolling updates.
func (c *Controller) syncVersion(p *spec.Prometheus) error {
selector, err := labels.Parse("prometheus.coreos.com/type=prometheus,prometheus.coreos.com/name=" + p.Name)
selector, err := labels.Parse("app=prometheus,prometheus=" + p.Name)
if err != nil {
return err
}
@ -514,7 +514,7 @@ func (c *Controller) deletePrometheus(p *spec.Prometheus) error {
}
// XXX: Selecting by ObjectMeta.Name gives an error. So use the label for now.
selector, err := labels.Parse("prometheus.coreos.com/type=prometheus,prometheus.coreos.com/name=" + p.Name)
selector, err := labels.Parse("app=prometheus,prometheus=" + p.Name)
if err != nil {
return err
}
@ -646,7 +646,7 @@ func (c *Controller) createTPRs() error {
// We have to wait for the TPRs to be ready. Otherwise the initial watch may fail.
err := wait.Poll(3*time.Second, 30*time.Second, func() (bool, error) {
resp, err := c.kclient.CoreClient.Client.Get(c.host + "/apis/prometheus.coreos.com/v1alpha1/prometheuses")
resp, err := c.kclient.CoreClient.Client.Get(c.host + "/apis/monitoring.coreos.com/v1alpha1/prometheuses")
if err != nil {
return false, err
}
@ -665,7 +665,7 @@ func (c *Controller) createTPRs() error {
return err
}
return wait.Poll(3*time.Second, 30*time.Second, func() (bool, error) {
resp, err := c.kclient.CoreClient.Client.Get(c.host + "/apis/prometheus.coreos.com/v1alpha1/servicemonitors")
resp, err := c.kclient.CoreClient.Client.Get(c.host + "/apis/monitoring.coreos.com/v1alpha1/servicemonitors")
if err != nil {
return false, err
}

6
pkg/operator/petset.go
View file

@ -113,7 +113,7 @@ func makePetSetService(p *spec.Prometheus) *v1.Service {
},
},
Selector: map[string]string{
"prometheus.coreos.com/type": "prometheus",
"app": "prometheus",
},
},
}
@ -131,8 +131,8 @@ func makePetSetSpec(name, image, version string, replicas int32, alertmanagers [
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{
Labels: map[string]string{
"prometheus.coreos.com/name": name,
"prometheus.coreos.com/type": "prometheus",
"app": "prometheus",
"prometheus": name,
},
Annotations: map[string]string{
"pod.alpha.kubernetes.io/initialized": "true",