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