workloads/grafana/grafana-deploy.yml

@@ -44,22 +44,6 @@ spec:
             secretKeyRef:
               name: postgres
               key: POSTGRES_PASSWORD
-        - name: GF_USERS_ALLOW_SIGN_UP
-          value: "false"
-        - name: GF_USERS_AUTO_ASSIGN_ORG
-          value: "true"
-        - name: GF_USERS_AUTO_ASSIGN_ORG_ROLE
-          value: Editor
-        - name: GF_AUTH_PROXY_ENABLED
-          value: "true"
-        - name: GF_AUTH_PROXY_HEADER_NAME
-          value: X-Forwarded-User
-        - name: GF_AUTH_PROXY_HEADER_PROPERTY
-          value: username
-        - name: GF_AUTH_PROXY_AUTO_SIGN_UP
-          value: "true"
-        - name: GF_AUTH_SIGNOUT_REDIRECT_URL
-          value: "https://grafana.shoup.io/oauth2/sign_out"
         resources:
           requests:
             memory: "128Mi"

workloads/grafana/grafana-proxy.yml

@@ -1,71 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: grafana-proxy
-  namespace: grafana
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: grafana-proxy
-  template:
-    metadata:
-      labels:
-        app: grafana-proxy
-    spec:
-      containers:
-      - image: quay.io/oauth2-proxy/oauth2-proxy:v5.1.0
-        args: ["-email-domain=*", "-upstream=http://grafana:3000/"]
-        imagePullPolicy: IfNotPresent
-        name: grafana-proxy
-        env:
-        - name: OAUTH2_PROXY_SKIP_AUTH_REGEX
-          value: "/metrics(.*)"
-        - name: OAUTH2_PROXY_HTTP_ADDRESS
-          value: ":4180"
-        - name: OAUTH2_PROXY_COOKIE_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: grafana-proxy
-              key: cookie_secret
-        - name: OAUTH2_PROXY_PROVIDER
-          value: nextcloud
-        - name: OAUTH2_PROXY_CLIENT_ID
-          valueFrom:
-            secretKeyRef:
-              name: grafana-proxy
-              key: client_id
-        - name: OAUTH2_PROXY_CLIENT_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: grafana-proxy
-              key: client_secret
-        - name: OAUTH2_PROXY_LOGIN_URL
-          value: https://cloud.shoup.io/index.php/apps/oauth2/authorize
-        - name: OAUTH2_PROXY_REDEEM_URL
-          value: https://cloud.shoup.io/index.php/apps/oauth2/api/v1/token
-        - name: OAUTH2_PROXY_VALIDATE_URL
-          value: https://cloud.shoup.io/ocs/v2.php/cloud/user?format=json
-        - name: OAUTH2_PROXY_COOKIE_DOMAIN
-          value: .shoup.io
-        - name: OAUTH2_PROXY_COOKIE_SECURE
-          value: "true"
-        - name: "OAUTH2_PROXY_COOKIE_NAME"
-          value: "_oauth2_proxy_grafana"
-        - name: "OAUTH2_PROXY_PASS_BASIC_AUTH"
-          value: "false"
-        - name: "OAUTH2_PROXY_PASS_USER_HEADERS"
-          value: "true"
-        - name: "OAUTH2_PROXY_SET_XAUTHREQUEST"
-          value: "true"
-        livenessProbe:
-          tcpSocket:
-            port: 4180
-          initialDelaySeconds: 600
-          periodSeconds: 30
-          timeoutSeconds: 5
-          successThreshold: 1
-          failureThreshold: 2
-        ports:
-        - containerPort: 443

workloads/grafana/grafana-service.yml

@@ -11,19 +11,6 @@ spec:
     port: 3000
     targetPort: 3000
 ---
-kind: Service
-apiVersion: v1
-metadata:
-  name: grafana-proxy
-  namespace: grafana
-spec:
-  selector:
-    app: grafana-proxy
-  ports:
-  - protocol: TCP
-    port: 4180
-    targetPort: 4180
----
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
@@ -35,6 +22,6 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: grafana-proxy
-          servicePort: 4180
+          serviceName: grafana
+          servicePort: 3000
         path: /

workloads/grafana/proxy-secret.yml

@@ -1,19 +0,0 @@
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: grafana-proxy
-  namespace: grafana
-spec:
-  encryptedData:
-    client_id: AgBu+8R7fOXp46KQR9bQikbTUOvI3CA0xqPcMVlZnTUurrtoc37VXCD8EMN+RDmm9qrUAKQVYRJ+t1UfoSmcdhZQx9Vg3omtjZWLY9o++/lsiM1lcXh/XzxvR/Z43VaRGz9nrQNYvsw5+L9Z+o/Fn/46wm2GyVcgpJs0qrF9fJ6fpGUWO133txbcCQYYKD/Ro2osNtlFDti4f0k3MXqiOmM4mfwwls99BGu6cx5mGT69p3vVOBL6BTDu8YVBHtPTwQwuGVvnIikGS1RzdwMN8q1ND9Z9ZwxVDItIS3e5d3iTHJzDMP5h7G6fdvMsc5Mvd6vK6S+kdEVeQS0dGacq4ylkST1M+0Rnep6GyAG0KmCis3X4YgSBf8fDNEhDrnh16rY7MwfG/clSsTjwvRe6Xo6V2r/I2rFncRD4x2eUryWJUtSd6Y9NVBTwwr1AwTk0kUm1+VJwQ6eJtJVdysg164et16vy5Z++jXoxpmk5hsqdqF5jVEa9wB5ROLenV6m2vFS1JFvxkfCzJ2oMnu+mlOOFeLhxWqILGo8IIzxVKdALdeRuDqsywZ5qOqouCnklO/ZSRPe6IrNK3ha0l3vWNnhJmls6Q4SSuDvUG0D1DzDOLdeePAYE2ghLWcUrY8zXp8TMzqUUZlAzLt9NJSg/ohdhCnolCPOlTp0sNJyLk9LXDl1SlEsbP/4b3NvlGf+7Q3q7WDFBkcn1P6GwK/utY1G6///NOH4NGPX6w9aVYkRQMFzQNKTpixQ+RGctf454snvxdct+UQeKRO8lkaN27Mr+
-    client_secret: AgCbE4VopDMBV+34Mx6KKonxuRnuUUq4vr7LkyNTYpO+EbWIJaOSBVWNCbtD9h2PmEXxcXNoIjjInzuFTpAytvJlIHx9lOe4CM7ZGkXFbt0+E6taGoQ5Ys1Oq3S5IWBw05LK/2t6JqdHI4ANoncIrB6e3dpRv5bHJDyoVS1ml97K7dTJt/A5WqKsA1E6U6/uXvQyHtqEoD/kMKnoBR15b9AiVCh+9Cjx3R0Uk00zSa2rz4uSQysr6ndXYzqouJxCCwh+0oWzk35I1PCpZKKL3GS/PNoAueJOA4rx0uwQNVZLEGQIv7NXCCQspgeE8ozTcX3GQXp7agQlMKbs0xPYeSdJ6u2gHez4xGiBmtFcHtsaJFwWexzEBi7/wMKe3e6P6yTBir4NG0DM/kxb0q2zk0RcssoZAVzjcPMj5A/qys6tDVqmAimGjOVeZ1wP16LdNBgi+MSP77cGFihWtZ8hxm0IyENsommiVvRGIP+OW0T3VyHg5DxKXWXuLVz4Qk/W0XiqhCnA7YfRIYHywwpG7kYCly8gi1wUnYwgEvK5VgYT9l3T7K+/FO7d8fl6sfCROHYsN/oDXhIIsbIfDzgqXSLuR756hipX1+G3paL+v1zxuTVX8R84qKraf9ZJnPaUQrG2FOQ3tWDbakZnTzaCo1JW6FkdjZpKWgQke6gL/tK4+Id3D2NVQbCTKgrLWDZB+DbHB96Gryc2RdTzCIA8iugQUQLRSh2LbEojbtO96UcXMIZ83tQ/q8rMBq90hlFk+XPI5cl5UAlKmZRjs2R3Y65m
-    cookie_secret: AgCgbYUhOdQBYhyuZ5BiRqD5hiJnEUMTrY+Dlw+ld02YoLBixpBye/2KNfTxn2N92a3AdDUxHa5LRgxtmDMd050zzsi3Da5L7IjKP9Ycyy/XLFqfChWYiIIU0ofYQ050bqlUmevM1dIEqcoSNMfn65rBIEGKwGWvzkEh2pj+x0p7LIXRsq4fqpRCsfjYv8F1uevUVCc8RFdowVtaJxWA+i5b9bpAIg/0I7nKneXzTSP6N14tai3vslUj9Rd/J+d+o/Llsa+NBQQrlibvWaMobwkZGKAh/nIrL0oDe8mIHn0NfD/j3gh9J/xqCp+x4cfAOVDmvFSsTax3G+4Yv6wXEk8Quu/TeKRm62Fn5gFgYNK1mxq148HT87yFQOxWla6ovdK6kGVo0UNSubBE046wfGYRH5YIwyod8ZaohI5f/FlLj4GDD07g4TjlrnAfGTwdyKmIDuEjYLYVqtJq7jT6jd23PSq5Ek0tP1/VwKq8WHgH+wFRQsH7JNo19XqjDBH1y6VkPuxlSyjJv53PQzuWqw6/q1odnvahn8lxpUHNfKC3Jn8rRaNtrzSRHetLU3hKaQv5pB+veJplp9QpbdPJabHaXF1fFEJZprB2vch3NGFIVUzPvuw1tBV4fG2oT4EuaMTKqrNRY/ZiU0YEcomefWL2Q579GrdhFLOd1rUN74tK8+/ZB0rIUa2ivl1hUSfQg0tLR739KriXnfnu6aF6qaYcAR3YU7Sveg9WoN3rJ3Ija0KzfO4toFi049mNgTj2KS3NUM1JAIUN4axbCmlSQRGT
-  template:
-    metadata:
-      creationTimestamp: null
-      name: grafana-proxy
-      namespace: grafana
-    type: Opaque
-status: {}
-