From 6b88b8824f85ada509f1cda134b48a55a27a4743 Mon Sep 17 00:00:00 2001 From: Sourcegraph Engineers Date: Mon, 9 Sep 2024 16:08:15 +0300 Subject: [PATCH 1/4] Removing prometheus annotations --- charts/sourcegraph-executor/k8s/templates/executor.Service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml b/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml index 319a9d5f..852bca0c 100644 --- a/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml +++ b/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml @@ -21,4 +21,4 @@ spec: selector: {{- include "sourcegraph.selectorLabels" . | nindent 4 }} app: {{ include "executor.name" . }} - type: {{ .Values.executor.serviceType | default "ClusterIP" }} + type: {{ .Values.executor.serviceType | default "ClusterIP" }} \ No newline at end of file From 4f947d9458216bb32045c9ebdf40b476ca85f2df Mon Sep 17 00:00:00 2001 From: Sourcegraph Engineers Date: Thu, 19 Sep 2024 15:35:20 +0300 Subject: [PATCH 2/4] Updating service manifest --- .../sourcegraph-executor/k8s/templates/executor.Service.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml b/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml index 852bca0c..c5d8bf84 100644 --- a/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml +++ b/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Service metadata: annotations: - prometheus.io/port: "6060" - sourcegraph.prometheus/scrape: "true" {{- if .Values.executor.serviceAnnotations }} {{- toYaml .Values.executor.serviceAnnotations | nindent 4 }} {{- end }} @@ -21,4 +19,4 @@ spec: selector: {{- include "sourcegraph.selectorLabels" . | nindent 4 }} app: {{ include "executor.name" . }} - type: {{ .Values.executor.serviceType | default "ClusterIP" }} \ No newline at end of file + type: {{ .Values.executor.serviceType | default "ClusterIP" }} type: {{ .Values.executor.serviceType | default "ClusterIP" }} \ No newline at end of file From ccc2d8bcfba9aeea599b35e79fbcc2aa3777dd1b Mon Sep 17 00:00:00 2001 From: loujar Date: Thu, 19 Sep 2024 16:15:31 -0400 Subject: [PATCH 3/4] removed duplicate type attribute --- .../sourcegraph-executor/k8s/templates/executor.Service.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml b/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml index c5d8bf84..7efc8519 100644 --- a/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml +++ b/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml @@ -19,4 +19,5 @@ spec: selector: {{- include "sourcegraph.selectorLabels" . | nindent 4 }} app: {{ include "executor.name" . }} - type: {{ .Values.executor.serviceType | default "ClusterIP" }} type: {{ .Values.executor.serviceType | default "ClusterIP" }} \ No newline at end of file + type: {{ .Values.executor.serviceType | default "ClusterIP" }} + From 442396d83f1d6ede1a62e3bbdce0aa54cd5c4669 Mon Sep 17 00:00:00 2001 From: loujar Date: Thu, 19 Sep 2024 16:16:21 -0400 Subject: [PATCH 4/4] removed extra linebreak --- charts/sourcegraph-executor/k8s/templates/executor.Service.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml b/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml index 7efc8519..e7b3c58b 100644 --- a/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml +++ b/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml @@ -20,4 +20,3 @@ spec: {{- include "sourcegraph.selectorLabels" . | nindent 4 }} app: {{ include "executor.name" . }} type: {{ .Values.executor.serviceType | default "ClusterIP" }} -