Update precise-code-intel service definitions (sourcegraph#682)

Author: efritz

base/precise-code-intel/api-server.Deployment.yaml

@@ -37,20 +37,22 @@ spec:
         livenessProbe:
           httpGet:
             path: /healthz
-            port: server
+            port: http
             scheme: HTTP
           initialDelaySeconds: 60
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
             path: /healthz
-            port: server
+            port: http
             scheme: HTTP
           periodSeconds: 5
           timeoutSeconds: 5
         ports:
         - containerPort: 3186
-          name: server
+          name: http
+        - containerPort: 6060
+          name: debug
         resources:
           limits:
             cpu: "2"

base/precise-code-intel/api-server.Service.yaml

@@ -2,17 +2,20 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    prometheus.io/port: "3186"
+    prometheus.io/port: "6060"
     sourcegraph.prometheus/scrape: "true"
   labels:
     app: precise-code-intel-api-server
     deploy: sourcegraph
   name: precise-code-intel-api-server
 spec:
   ports:
-  - name: server
+  - name: http
     port: 3186
-    targetPort: server
+    targetPort: http
+  - name: debug
+    port: 6060
+    targetPort: debug
   selector:
     app: precise-code-intel-api-server
   type: ClusterIP

base/precise-code-intel/bundle-manager.Deployment.yaml

@@ -24,7 +24,7 @@ spec:
       - env:
         - name: PRECISE_CODE_INTEL_API_SERVER_URL
           value: http://precise-code-intel-api-server:3186
-        - name: LSIF_STORAGE_ROOT
+        - name: PRECISE_CODE_INTEL_BUNDLE_DIR
           value: /lsif-storage
         - name: POD_NAME
           valueFrom:
@@ -36,20 +36,22 @@ spec:
         livenessProbe:
           httpGet:
             path: /healthz
-            port: server
+            port: http
             scheme: HTTP
           initialDelaySeconds: 60
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
             path: /healthz
-            port: server
+            port: http
             scheme: HTTP
           periodSeconds: 5
           timeoutSeconds: 5
         ports:
         - containerPort: 3187
-          name: server
+          name: http
+        - containerPort: 6060
+          name: debug
         resources:
           limits:
             cpu: "2"

base/precise-code-intel/bundle-manager.Service.yaml

@@ -2,17 +2,20 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    prometheus.io/port: "3187"
+    prometheus.io/port: "6060"
     sourcegraph.prometheus/scrape: "true"
   labels:
     app: precise-code-intel-bundle-manager
     deploy: sourcegraph
   name: precise-code-intel-bundle-manager
 spec:
   ports:
-  - name: server
+  - name: http
     port: 3187
-    targetPort: server
+    targetPort: http
+  - name: debug
+    port: 6060
+    targetPort: debug
   selector:
     app: precise-code-intel-bundle-manager
   type: ClusterIP

base/precise-code-intel/worker.Deployment.yaml

@@ -36,25 +36,9 @@ spec:
         image: index.docker.io/sourcegraph/precise-code-intel-worker:3.15.1@sha256:00642b4bd6f37ff3e80b4b94a5699cef5ededae6875a5010c4202fd91ad0dfaf
         terminationMessagePolicy: FallbackToLogsOnError
         name: precise-code-intel-worker
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: server
-            scheme: HTTP
-          initialDelaySeconds: 60
-          timeoutSeconds: 5
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: server
-            scheme: HTTP
-          periodSeconds: 5
-          timeoutSeconds: 5
         ports:
-        - containerPort: 3188
-          name: server
-        - containerPort: 9090
-          name: prometheus
+        - containerPort: 6060
+          name: debug
         resources:
           limits:
             cpu: "2"

base/precise-code-intel/worker.Service.yaml

@@ -2,20 +2,17 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    prometheus.io/port: "9090"
-    sourcegraph.prometheus/federate: "true"
+    prometheus.io/port: "6060"
+    sourcegraph.prometheus/scrape: "true"
   labels:
     app: precise-code-intel-worker
     deploy: sourcegraph
   name: precise-code-intel-worker
 spec:
   ports:
-  - name: server
-    port: 3188
-    targetPort: server
-  - name: prometheus
-    port: 9090
-    targetPort: prometheus
+  - name: debug
+    port: 6060
+    targetPort: debug
   selector:
     app: precise-code-intel-worker
   type: ClusterIP

base/prometheus/prometheus.ConfigMap.yaml

@@ -156,64 +156,6 @@ data:
         action: replace
         target_label: instance
 
-    # Scrape config for federated Prometheus instance endpoints. This is currently only
-    # used to proxy the metrics from multiple processes inside the precise code intel
-    # containers to be made available (as we can't have Prometheus scrape a dynamic port
-    # range based on a ConfigMap value).
-    #
-    # The relabeling allows the actual service scrape endpoint to be configured
-    # via the following annotations:
-    #
-    # * `prometheus.io/federate`: Only scrape services that have a value of `true`
-    # * `prometheus.io/scheme`: If the metrics endpoint is secured then you will need
-    # to set this to `https` & most likely set the `tls_config` of the scrape config.
-    # * `prometheus.io/port`: The port the Prometheus cluster is exposed on (usually 9090).
-    #
-    # TODO(efritz,uwedeportivo) - see if the value for 'match[]' can be supplied as an
-    # annotation so that this selector can be generalized if we want to use federation for
-    # another application in the future.
-    - job_name: 'kubernetes-federate'
-      honor_labels: true
-      metrics_path: '/federate'
-      params:
-        'match[]':
-          - '{__name__=~"lsif_.*"}'
-
-      kubernetes_sd_configs:
-      - role: endpoints
-
-      relabel_configs:
-      - source_labels: [__meta_kubernetes_service_annotation_sourcegraph_prometheus_federate]
-        action: keep
-        regex: true
-      - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
-        action: replace
-        target_label: __scheme__
-        regex: (https?)
-      - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
-        action: replace
-        target_label: __address__
-        regex: (.+)(?::\d+);(\d+)
-        replacement: $1:$2
-      - action: labelmap
-        regex: __meta_kubernetes_service_label_(.+)
-      - source_labels: [__meta_kubernetes_namespace]
-        action: replace
-        # Sourcegraph specific customization. We want a more convenient to type label.
-        # target_label: kubernetes_namespace
-        target_label: ns
-      - source_labels: [__meta_kubernetes_service_name]
-        action: replace
-        target_label: kubernetes_name
-      # Sourcegraph specific customization. We want a nicer name for job
-      - source_labels: [app]
-        action: replace
-        target_label: job
-      # Sourcegraph specific customization. We want a nicer name for instance
-      - source_labels: [__meta_kubernetes_pod_name]
-        action: replace
-        target_label: instance
-
     # Example scrape config for probing services via the Blackbox Exporter.
     #
     # The relabeling allows the actual service scrape endpoint to be configured