jsonnet: regenerate

openshift · Nov 1, 2018 · cf822cb · cf822cb
1 parent 59d73d2
commit cf822cb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
                     "subdir": "jsonnet/telemeter/client"
                 }
             },
-            "version": "e0de8764eb42445e524fd1dd012ecaa7f8e9047d"
+            "version": "59d73d2f943348159cce89ac3e95880d5337f9c0"
         },
         {
             "name": "ksonnet",
@@ -28,7 +28,7 @@
                     "subdir": "jsonnet/telemeter/server"
                 }
             },
-            "version": "e0de8764eb42445e524fd1dd012ecaa7f8e9047d"
+            "version": "59d73d2f943348159cce89ac3e95880d5337f9c0"
         },
         {
             "name": "prometheus-telemeter",
@@ -38,7 +38,7 @@
                     "subdir": "jsonnet/telemeter/prometheus"
                 }
             },
-            "version": "e0de8764eb42445e524fd1dd012ecaa7f8e9047d"
+            "version": "59d73d2f943348159cce89ac3e95880d5337f9c0"
         }
     ]
 }
diff --git a/manifests/prometheus/list.yaml b/manifests/prometheus/list.yaml
@@ -70,8 +70,8 @@ objects:
       - -upstream=http://localhost:9090
       - -htpasswd-file=/etc/proxy/htpasswd/auth
       - -openshift-service-account=prometheus-telemeter
-      - '-openshift-sar={"resource": "namespaces", "verb": "get"}'
-      - '-openshift-delegate-urls={"/": {"resource": "namespaces", "verb": "get"}}'
+      - -openshift-sar=${OPENSHIFT_SAR}
+      - -openshift-delegate-urls=${OPENSHIFT_DELEGATE_URLS}
       - -tls-cert=/etc/tls/private/tls.crt
       - -tls-key=/etc/tls/private/tls.key
       - -client-secret-file=/var/run/secrets/kubernetes.io/serviceaccount/token
@@ -259,3 +259,9 @@ parameters:
   value: v1.1.0
 - name: NAMESPACE
   value: telemeter
+- name: OPENSHIFT_SAR
+  value: '{"resource": "namespaces", "verb": "get", "resourceName": "telemeter-production",
+    "namespace": "telemeter-production"}'
+- name: OPENSHIFT_DELEGATE_URLS
+  value: '{"/": {"resource": "namespaces", "verb": "get", "resourceName": "telemeter-production",
+    "namespace": "telemeter-production"}}'