Fix deployments until next release (#3142)

This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-09-26 10:15:57 -03:00 committed by GitHub
parent c3ce6b892e
commit f56e839134
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 244 additions and 139 deletions

View file

@ -40,3 +40,6 @@ data:
- source_labels: [__meta_kubernetes_service_name]
regex: prometheus-server
action: drop
---

View file

@ -24,28 +24,27 @@ spec:
app.kubernetes.io/part-of: ingress-nginx
spec:
containers:
- image: grafana/grafana
name: grafana
ports:
- containerPort: 3000
protocol: TCP
resources:
limits:
cpu: 500m
memory: 2500Mi
requests:
cpu: 100m
memory: 100Mi
volumeMounts:
- mountPath: /var/lib/grafana
name: data
- image: grafana/grafana
name: grafana
ports:
- containerPort: 3000
protocol: TCP
resources:
limits:
cpu: 500m
memory: 2500Mi
requests:
cpu: 100m
memory: 100Mi
volumeMounts:
- mountPath: /var/lib/grafana
name: data
restartPolicy: Always
volumes:
- emptyDir: {}
name: data
- emptyDir: {}
name: data
---
apiVersion: v1
kind: Service
metadata:
@ -57,10 +56,13 @@ metadata:
spec:
ports:
- port: 3000
protocol: TCP
targetPort: 3000
- port: 3000
protocol: TCP
targetPort: 3000
selector:
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: ingress-nginx
type: NodePort
---

View file

@ -7,15 +7,14 @@ metadata:
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: ingress-nginx
rules:
- apiGroups: [""]
resources:
- services
- endpoints
- pods
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources:
- services
- endpoints
- pods
verbs: ["get", "list", "watch"]
---
apiVersion: v1
kind: ServiceAccount
metadata:
@ -26,7 +25,6 @@ metadata:
app.kubernetes.io/part-of: ingress-nginx
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
@ -41,12 +39,11 @@ roleRef:
kind: Role
name: prometheus-server
subjects:
- kind: ServiceAccount
name: prometheus-server
namespace: ingress-nginx
- kind: ServiceAccount
name: prometheus-server
namespace: ingress-nginx
---
apiVersion: apps/v1
kind: Deployment
metadata:
@ -90,7 +87,6 @@ spec:
emptyDir: {}
---
apiVersion: v1
kind: Service
metadata:
@ -108,3 +104,6 @@ spec:
ports:
- port: 9090
targetPort: 9090
---