tobru/gitops-tbrnt
Archived
1
0
Fork 0
Code Issues Pull requests Releases Activity

upgrade grafana
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Tobias Brunner 2020-06-01 13:02:07 +02:00
parent b63b952b55
commit eeccef8a0b
2 changed files with 38 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
graphs/Makefile
View file

@ -1,10 +1,10 @@
build: build:
helm3 template graphs --namespace=graphs stable/grafana \ helm template graphs --namespace=graphs stable/grafana \
-f grafana-config.yaml \ -f grafana-config.yaml \
> grafana.yaml > grafana.yaml
.PHONY: build .PHONY: build
update: update:
helm3 repo update helm repo update
helm3 search repo grafana helm search repo grafana
.PHONY: update .PHONY: update

72
graphs/grafana.yaml
View file

@ -6,10 +6,10 @@ metadata:
name: graphs-grafana name: graphs-grafana
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
annotations: annotations:
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default'
@ -60,10 +60,10 @@ metadata:
name: graphs-grafana-test name: graphs-grafana-test
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
spec: spec:
allowPrivilegeEscalation: true allowPrivilegeEscalation: true
@ -91,10 +91,10 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: graphs-grafana name: graphs-grafana
namespace: graphs namespace: graphs
@ -104,10 +104,10 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: graphs-grafana-test name: graphs-grafana-test
namespace: graphs namespace: graphs
@ -119,10 +119,10 @@ metadata:
name: graphs-grafana name: graphs-grafana
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
data: data:
grafana.ini: | grafana.ini: |
@ -145,10 +145,10 @@ metadata:
name: graphs-grafana-test name: graphs-grafana-test
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
data: data:
run.sh: |- run.sh: |-
@ -166,10 +166,10 @@ metadata:
name: graphs-grafana name: graphs-grafana
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
finalizers: finalizers:
- kubernetes.io/pvc-protection - kubernetes.io/pvc-protection
@ -188,10 +188,10 @@ metadata:
name: graphs-grafana name: graphs-grafana
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
rules: rules:
- apiGroups: ['extensions'] - apiGroups: ['extensions']
@ -206,10 +206,10 @@ metadata:
name: graphs-grafana-test name: graphs-grafana-test
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
rules: rules:
- apiGroups: ['policy'] - apiGroups: ['policy']
@ -224,10 +224,10 @@ metadata:
name: graphs-grafana name: graphs-grafana
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
@ -237,10 +237,6 @@ subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: graphs-grafana name: graphs-grafana
namespace: graphs namespace: graphs
roleRef:
kind: Role
name: graphs-grafana
apiGroup: rbac.authorization.k8s.io
--- ---
# Source: grafana/templates/tests/test-rolebinding.yaml # Source: grafana/templates/tests/test-rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
@ -249,10 +245,10 @@ metadata:
name: graphs-grafana-test name: graphs-grafana-test
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
@ -270,10 +266,10 @@ metadata:
name: graphs-grafana name: graphs-grafana
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
spec: spec:
type: ClusterIP type: ClusterIP
@ -294,10 +290,10 @@ metadata:
name: graphs-grafana name: graphs-grafana
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
spec: spec:
replicas: 1 replicas: 1
@ -313,7 +309,7 @@ spec:
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
annotations: annotations:
checksum/config: e35abbaccbc63fd695cd91130a66064978d6ad3dad49f17a0bb6451a4c3e4e66 checksum/config: fad7ac56fedd479540a5d586af5ee92402a68943366775b6981882fc09794b2a
checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
spec: spec:
@ -321,6 +317,7 @@ spec:
serviceAccountName: graphs-grafana serviceAccountName: graphs-grafana
securityContext: securityContext:
fsGroup: 472 fsGroup: 472
runAsGroup: 472
runAsUser: 472 runAsUser: 472
initContainers: initContainers:
- name: init-chown-data - name: init-chown-data
@ -336,7 +333,7 @@ spec:
mountPath: "/var/lib/grafana" mountPath: "/var/lib/grafana"
containers: containers:
- name: grafana - name: grafana
image: "grafana/grafana:6.7.3" image: "grafana/grafana:7.0.1"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
volumeMounts: volumeMounts:
- name: config - name: config
@ -396,13 +393,13 @@ metadata:
name: graphs-grafana name: graphs-grafana
namespace: graphs namespace: graphs
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
annotations: annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod cert-manager.io/cluster-issuer: "letsencrypt-prod"
ingress.kubernetes.io/ssl-redirect: "true" ingress.kubernetes.io/ssl-redirect: "true"
spec: spec:
tls: tls:
@ -425,10 +422,10 @@ kind: Pod
metadata: metadata:
name: graphs-grafana-test name: graphs-grafana-test
labels: labels:
helm.sh/chart: grafana-5.0.10 helm.sh/chart: grafana-5.1.0
app.kubernetes.io/name: grafana app.kubernetes.io/name: grafana
app.kubernetes.io/instance: graphs app.kubernetes.io/instance: graphs
app.kubernetes.io/version: "6.7.1" app.kubernetes.io/version: "7.0.1"
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
annotations: annotations:
"helm.sh/hook": test-success "helm.sh/hook": test-success
@ -438,6 +435,7 @@ spec:
containers: containers:
- name: graphs-test - name: graphs-test
image: "bats/bats:v1.1.0" image: "bats/bats:v1.1.0"
imagePullPolicy: "IfNotPresent"
command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"]
volumeMounts: volumeMounts:
- mountPath: /tests - mountPath: /tests