assets,pkg/manifests: regenerate

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
openshift · Mar 12, 2020 · a06300a · a06300a
1 parent 837ae15
commit a06300a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 45 deletions.
diff --git a/assets/thanos-ruler/kube-rbac-proxy-secret.yaml b/assets/thanos-ruler/kube-rbac-proxy-secret.yaml
diff --git a/assets/thanos-ruler/service-monitor.yaml b/assets/thanos-ruler/service-monitor.yaml
@@ -2,17 +2,18 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    k8s-app: alertmanager
+    k8s-app: thanos
   name: thanos-ruler
   namespace: openshift-user-workload-monitoring
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
     interval: 30s
     port: web
+    scheme: https
     tlsConfig:
       caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
       serverName: server-name-replaced-at-runtime
   selector:
     matchLabels:
-      thanosRuler: user-workload
+      app.kubernetes.io/name: user-workload
diff --git a/assets/thanos-ruler/service.yaml b/assets/thanos-ruler/service.yaml
@@ -5,13 +5,16 @@ metadata:
     service.alpha.openshift.io/serving-cert-secret-name: thanos-ruler-tls
   labels:
     app.kubernetes.io/name: user-workload
-  name: thanos-ruler-user-workload
+  name: thanos-ruler
   namespace: openshift-user-workload-monitoring
 spec:
   ports:
   - name: web
     port: 9091
     targetPort: web
+  - name: grpc
+    port: 10901
+    targetPort: grpc
   selector:
     app: thanos-ruler
     thanos-ruler: user-workload

diff --git a/assets/thanos-ruler/thanos-ruler.yaml b/assets/thanos-ruler/thanos-ruler.yaml
@@ -66,6 +66,3 @@ spec:
   - name: secret-thanos-ruler-oauth-htpasswd
     secret:
       secretName: thanos-ruler-oauth-htpasswd
-  - name: secret-thanos-ruler-kube-rbac-proxy
-    secret:
-      secretName: thanos-ruler-kube-rbac-proxy
diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go