Skip to content

Commit

Permalink
Merge pull request #651 from pgier/prometheus-operator-v0.35.1
Browse files Browse the repository at this point in the history
Bug 1801358: update prometheus-operator v0.35.1
  • Loading branch information
openshift-merge-robot committed Feb 12, 2020
2 parents 58179c5 + 3c460dd commit 649d401
Show file tree
Hide file tree
Showing 18 changed files with 48 additions and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-user-workload-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-operator-user-workload/cluster-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-user-workload-operator
rules:
- apiGroups:
Expand Down
8 changes: 4 additions & 4 deletions assets/prometheus-operator-user-workload/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-operator
namespace: openshift-user-workload-monitoring
spec:
Expand All @@ -18,19 +18,19 @@ spec:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
spec:
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --logtostderr=true
- --config-reloader-image=jimmidyson/configmap-reload:v0.3.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.35.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.35.1
- --deny-namespaces=openshift-monitoring
- --prometheus-instance-namespaces=openshift-user-workload-monitoring
- --alertmanager-instance-namespaces=openshift-user-workload-monitoring
- --manage-crds=false
image: quay.io/coreos/prometheus-operator:v0.35.0
image: quay.io/coreos/prometheus-operator:v0.35.1
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-operator
namespace: openshift-user-workload-monitoring
4 changes: 2 additions & 2 deletions assets/prometheus-operator-user-workload/service-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-operator
namespace: openshift-user-workload-monitoring
spec:
Expand All @@ -15,4 +15,4 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
2 changes: 1 addition & 1 deletion assets/prometheus-operator-user-workload/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-operator
namespace: openshift-user-workload-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-operator/cluster-role-binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-operator/cluster-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-operator
rules:
- apiGroups:
Expand Down
8 changes: 4 additions & 4 deletions assets/prometheus-operator/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-operator
namespace: openshift-monitoring
spec:
Expand All @@ -18,18 +18,18 @@ spec:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
spec:
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --logtostderr=true
- --config-reloader-image=jimmidyson/configmap-reload:v0.3.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.35.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.35.1
- --namespaces=openshift-monitoring
- --prometheus-instance-namespaces=openshift-monitoring
- --alertmanager-instance-namespaces=openshift-monitoring
image: quay.io/coreos/prometheus-operator:v0.35.0
image: quay.io/coreos/prometheus-operator:v0.35.1
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-operator/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-operator
namespace: openshift-monitoring
4 changes: 2 additions & 2 deletions assets/prometheus-operator/service-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-operator
namespace: openshift-monitoring
spec:
Expand All @@ -15,4 +15,4 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
2 changes: 1 addition & 1 deletion assets/prometheus-operator/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.0
app.kubernetes.io/version: v0.35.1
name: prometheus-operator
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.13

require (
github.com/Jeffail/gabs v1.1.1
github.com/coreos/prometheus-operator v0.35.0
github.com/coreos/prometheus-operator v0.35.1
github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48
github.com/imdario/mergo v0.3.6 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/coreos/prometheus-operator v0.35.0 h1:kd7mysk8mCdwquBcPLyuRoRFNJCpgezXu8yUvIYE2nc=
github.com/coreos/prometheus-operator v0.35.0/go.mod h1:XHYZUStZWcwd1yk/1DjZv/fywqKIyAJ6pSwvIr+v9BQ=
github.com/coreos/prometheus-operator v0.35.1 h1:Cl/0axMpifGsKTNMwQB5PWciOSkNFa/LOdCVQJ9n/Jc=
github.com/coreos/prometheus-operator v0.35.1/go.mod h1:XHYZUStZWcwd1yk/1DjZv/fywqKIyAJ6pSwvIr+v9BQ=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
4 changes: 2 additions & 2 deletions jsonnet/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "0f733c1491c150c60cc9d6cb4db1018475734270",
"sum": "j4MQ1LYao8D9sqy3n9/TqLiPB+DGNBXijavIl6LVCAQ="
"version": "37a843fb60515ec34220bebb06a8d70d3a10a9fd",
"sum": "yUHQC9cVIWqQkGST1urZq4a3OFZXuW0w8YC5jsb0kjE="
},
{
"name": "promgrafonnet",
Expand Down

0 comments on commit 649d401

Please sign in to comment.