Move to official Grafana container image on docker.io

[learn-metrics.git] / learn-metrics.yaml

diff --git a/learn-metrics.yaml b/learn-metrics.yaml
index 7c1c7ea563403d001bfec83d51e3b165bb50c801..df18ac1c57e5108fb6265e4c45273a1a8b14b526 100644 (file)
--- a/learn-metrics.yaml
+++ b/learn-metrics.yaml
@@ -6,7 +6,7 @@ metadata:
   name: learn-metrics
 spec:
   containers:
-  - image: quay.io/bitnami/grafana:latest
+  - image: docker.io/grafana/grafana
     name: grafana
     env:
     - name: GF_SECURITY_ADMIN_PASSWORD
@@ -21,8 +21,8 @@ spec:
     - name: grafana-config
       mountPath: /grafana-config
       readOnly: true
-    - name: grafana-datasource
-      mountPath: /etc/grafana/provisioning/datasources/datasource.yaml
+    - name: grafana-provisioning
+      mountPath: /etc/grafana/provisioning
       readOnly: true
 
   - image: quay.io/prometheus/prometheus:latest
@@ -36,23 +36,26 @@ spec:
         mountPath: /etc/prometheus
         readOnly: true
 
-  - image: quay.io/bitnami/nginx
+  - image: quay.io/jitesoft/nginx
     name: httpd
+    ports:
+    - containerPort: 80
+      hostPort: 3002
+      protocol: TCP
     volumeMounts:
     - name: http
-      mountPath: /app
+      mountPath: /usr/local/nginx/html
       readOnly: true
 
   volumes:
   - hostPath:
-      path: ./conf-grafana/datasource.yaml
-      type: File
-    name: grafana-datasource
+      path: ./grafana-provisioning
+    name: grafana-provisioning
   - hostPath:
-      path: ./conf-grafana
+      path: ./grafana-config
     name: grafana-config
   - hostPath:
-      path: ./conf-prometheus
+      path: ./prometheus-config
     name: prometheus-config
   - hostPath:
       path: ./http