From 051e64ba1476b13f469da44f21f953ac9179be93 Mon Sep 17 00:00:00 2001
From: Matthias Loibl <mail@matthiasloibl.com>
Date: Tue, 12 May 2020 18:44:45 +0200
Subject: [PATCH] Update operator/jsonnet/vendor/ after updating dependencies

---
 .../jsonnet/lib/observatorium-api.libsonnet   | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/operator/jsonnet/vendor/github.com/observatorium/observatorium/jsonnet/lib/observatorium-api.libsonnet b/operator/jsonnet/vendor/github.com/observatorium/observatorium/jsonnet/lib/observatorium-api.libsonnet
index 0967a5aa3..0a78c1923 100644
--- a/operator/jsonnet/vendor/github.com/observatorium/observatorium/jsonnet/lib/observatorium-api.libsonnet
+++ b/operator/jsonnet/vendor/github.com/observatorium/observatorium/jsonnet/lib/observatorium-api.libsonnet
@@ -13,6 +13,11 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
     readEnpoint: error 'must provide readEnpoint',
     writeEndpoint: error 'must provide writeEndpoint',
 
+    ports: {
+      public: 8080,
+      internal: 8081,
+    },
+
     commonLabels:: {
       'app.kubernetes.io/name': 'observatorium-api',
       'app.kubernetes.io/instance': api.config.name,
@@ -35,7 +40,12 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
       api.config.name,
       api.config.podLabelSelector,
       [
-        ports.newNamed('http', 8080, 8080),
+        {
+          name: name,
+          port: api.config.ports[name],
+          targetPort: api.config.ports[name],
+        }
+        for name in std.objectFields(api.config.ports)
       ],
     ) +
     service.mixin.metadata.withNamespace(api.config.namespace) +
@@ -49,27 +59,28 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
     local c =
       container.new('observatorium-api', api.config.image) +
       container.withArgs([
-        '--web.listen=0.0.0.0:8080',
-        '--metrics.ui.endpoint=' + api.config.uiEndpoint,
+        '--web.listen=0.0.0.0:%s' % api.config.ports.public,
+        '--web.internal.listen=0.0.0.0:%s' % api.config.ports.internal,
         '--metrics.read.endpoint=' + api.config.readEndpoint,
         '--metrics.write.endpoint=' + api.config.writeEndpoint,
         '--log.level=warn',
       ]) +
-      container.withPorts(
-        containerPort.newNamed(8080, 'http')
-      ) +
+      container.withPorts([
+        containerPort.newNamed(api.config.ports[name], name)
+        for name in std.objectFields(api.config.ports)
+      ]) +
       container.mixin.livenessProbe +
       container.mixin.livenessProbe.withPeriodSeconds(30) +
-      container.mixin.livenessProbe.withFailureThreshold(8) +
-      container.mixin.livenessProbe.httpGet.withPort(api.service.spec.ports[0].port) +
+      container.mixin.livenessProbe.withFailureThreshold(10) +
+      container.mixin.livenessProbe.httpGet.withPort(api.config.ports.internal) +
       container.mixin.livenessProbe.httpGet.withScheme('HTTP') +
-      container.mixin.livenessProbe.httpGet.withPath('/-/healthy') +
+      container.mixin.livenessProbe.httpGet.withPath('/live') +
       container.mixin.readinessProbe +
       container.mixin.readinessProbe.withPeriodSeconds(5) +
-      container.mixin.readinessProbe.withFailureThreshold(20) +
-      container.mixin.readinessProbe.httpGet.withPort(api.service.spec.ports[0].port) +
+      container.mixin.readinessProbe.withFailureThreshold(12) +
+      container.mixin.readinessProbe.httpGet.withPort(api.config.ports.internal) +
       container.mixin.readinessProbe.httpGet.withScheme('HTTP') +
-      container.mixin.readinessProbe.httpGet.withPath('/-/ready');
+      container.mixin.readinessProbe.httpGet.withPath('/ready');
 
     deployment.new(api.config.name, api.config.replicas, c, api.config.commonLabels) +
     deployment.mixin.metadata.withNamespace(api.config.namespace) +
@@ -93,7 +104,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           matchLabels: api.config.commonLabels,
         },
         endpoints: [
-          { port: 'http' },
+          { port: 'internal' },
         ],
       },
     },