diff --git a/base/monitoring/prometheus/prometheus.yml b/base/monitoring/prometheus/prometheus.yml index f31f222d..7e413552 100644 --- a/base/monitoring/prometheus/prometheus.yml +++ b/base/monitoring/prometheus/prometheus.yml @@ -145,7 +145,6 @@ scrape_configs: # Configure targets to scrape group: sourcegraph-service targets: - sourcegraph-frontend:6060 - - repo-updater:6060 - worker:6060 - worker-executors:6996 - syntect-server:6060 diff --git a/base/sourcegraph/kustomization.yaml b/base/sourcegraph/kustomization.yaml index 5c9b2d8e..5526df76 100644 --- a/base/sourcegraph/kustomization.yaml +++ b/base/sourcegraph/kustomization.yaml @@ -10,7 +10,6 @@ resources: - pgsql - precise-code-intel - redis - - repo-updater - searcher - symbols - syntactic-code-intel diff --git a/base/sourcegraph/repo-updater/kustomization.yaml b/base/sourcegraph/repo-updater/kustomization.yaml deleted file mode 100644 index 03b6d022..00000000 --- a/base/sourcegraph/repo-updater/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - repo-updater.Deployment.yaml - - repo-updater.Service.yaml diff --git a/base/sourcegraph/repo-updater/repo-updater.Deployment.yaml b/base/sourcegraph/repo-updater/repo-updater.Deployment.yaml deleted file mode 100644 index 9cc8dc85..00000000 --- a/base/sourcegraph/repo-updater/repo-updater.Deployment.yaml +++ /dev/null @@ -1,77 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - description: Handles repository metadata (not Git data) lookups and updates from external code hosts and other similar services. - kubectl.kubernetes.io/default-container: repo-updater - labels: - deploy: sourcegraph - sourcegraph-resource-requires: no-cluster-admin - app.kubernetes.io/component: repo-updater - name: repo-updater -spec: - minReadySeconds: 10 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - app: repo-updater - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - type: RollingUpdate - template: - metadata: - labels: - deploy: sourcegraph - app: repo-updater - spec: - containers: - - name: repo-updater - image: index.docker.io/sourcegraph/repo-updater:6.2.1106@sha256:4a37051d8221e41e23c491334995dac1db3561c614344386856c9ac2dafab815 - env: - # OTEL_AGENT_HOST must be defined before OTEL_EXPORTER_OTLP_ENDPOINT to substitute the node IP on which the DaemonSet pod instance runs in the latter variable - - name: OTEL_AGENT_HOST - valueFrom: - fieldRef: - fieldPath: status.hostIP - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_AGENT_HOST):4317 - terminationMessagePolicy: FallbackToLogsOnError - ports: - - containerPort: 3182 - name: http - - containerPort: 6060 - name: debug - readinessProbe: - failureThreshold: 3 - httpGet: - path: /ready - port: debug - scheme: HTTP - periodSeconds: 1 - timeoutSeconds: 5 - livenessProbe: - failureThreshold: 3 - httpGet: - path: /healthz - port: debug - scheme: HTTP - periodSeconds: 1 - timeoutSeconds: 5 - resources: - limits: - cpu: "1" - memory: 2Gi - requests: - cpu: "1" - memory: 500Mi - securityContext: - runAsGroup: 101 - runAsUser: 100 - allowPrivilegeEscalation: false - securityContext: - runAsUser: 100 - fsGroup: 101 - fsGroupChangePolicy: "OnRootMismatch" diff --git a/base/sourcegraph/repo-updater/repo-updater.Service.yaml b/base/sourcegraph/repo-updater/repo-updater.Service.yaml deleted file mode 100644 index 82a1d07b..00000000 --- a/base/sourcegraph/repo-updater/repo-updater.Service.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - prometheus.io/port: "6060" - sourcegraph.prometheus/scrape: "true" - labels: - app: repo-updater - app.kubernetes.io/component: repo-updater - deploy: sourcegraph - sourcegraph-resource-requires: no-cluster-admin - name: repo-updater -spec: - ports: - - name: http - port: 3182 - targetPort: http - - name: debug - port: 6060 - targetPort: debug - selector: - app: repo-updater - type: ClusterIP diff --git a/components/clusters/old-base/kustomization.yaml b/components/clusters/old-base/kustomization.yaml index 2ec6cedf..2df60393 100644 --- a/components/clusters/old-base/kustomization.yaml +++ b/components/clusters/old-base/kustomization.yaml @@ -65,6 +65,5 @@ patches: - path: patches/precise-code-intel/worker.Deployment.yaml - path: patches/redis/redis-cache.Deployment.yaml - path: patches/redis/redis-store.Deployment.yaml - - path: patches/repo-updater/repo-updater.Deployment.yaml - path: patches/syntect-server/syntect-server.Deployment.yaml - path: patches/worker/worker.Deployment.yaml diff --git a/components/clusters/old-base/patches/repo-updater/repo-updater.Deployment.yaml b/components/clusters/old-base/patches/repo-updater/repo-updater.Deployment.yaml deleted file mode 100644 index dd0d8662..00000000 --- a/components/clusters/old-base/patches/repo-updater/repo-updater.Deployment.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: repo-updater -spec: - template: - spec: - securityContext: - runAsUser: 0 - fsGroup: 0 - containers: - - name: repo-updater - securityContext: - allowPrivilegeEscalation: true - runAsGroup: 0 - runAsUser: 0 diff --git a/components/custom/resources/kustomization.yaml b/components/custom/resources/kustomization.yaml index ef07e2be..4471a93f 100644 --- a/components/custom/resources/kustomization.yaml +++ b/components/custom/resources/kustomization.yaml @@ -328,24 +328,6 @@ patches: # memory: 100Mi # - patch: |- # apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: repo-updater -# spec: -# replicas: 1 # IMPORTANT: Singleton service. Do NOT add more replica. -# template: -# spec: -# containers: -# - name: repo-updater -# resources: -# limits: -# cpu: "1" -# memory: 2Gi -# requests: -# cpu: "1" -# memory: 500Mi -# - patch: |- -# apiVersion: apps/v1 # kind: StatefulSet # metadata: # name: searcher diff --git a/components/enable/otel-collector/kustomization.yaml b/components/enable/otel-collector/kustomization.yaml index fae614fd..be6f0a6b 100644 --- a/components/enable/otel-collector/kustomization.yaml +++ b/components/enable/otel-collector/kustomization.yaml @@ -21,7 +21,7 @@ patches: target: group: apps kind: StatefulSet|Deployment - name: sourcegraph-frontend|gitserver|indexed-search|precise-code-intel-worker|repo-updater|searcher|symbols|worker + name: sourcegraph-frontend|gitserver|indexed-search|precise-code-intel-worker|searcher|symbols|worker version: v1 - patch: |- - op: add diff --git a/components/patches/resources.yaml b/components/patches/resources.yaml index e5ee22f5..0c75e6e4 100644 --- a/components/patches/resources.yaml +++ b/components/patches/resources.yaml @@ -337,24 +337,6 @@ # apiVersion: apps/v1 # kind: Deployment # metadata: -# name: repo-updater -# spec: -# replicas: 1 # IMPORTANT: Singleton service. Do NOT add more replica. -# template: -# spec: -# containers: -# - name: repo-updater -# resources: -# limits: -# cpu: "1" -# memory: 2Gi -# requests: -# cpu: "1" -# memory: 500Mi ---- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: # name: searcher # spec: # replicas: 2 diff --git a/components/patches/security-context/sourcegraph/repo-updater.Deployment.yaml b/components/patches/security-context/sourcegraph/repo-updater.Deployment.yaml deleted file mode 100644 index 7ed9d898..00000000 --- a/components/patches/security-context/sourcegraph/repo-updater.Deployment.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: repo-updater -# spec: -# template: -# spec: -# containers: -# - name: repo-updater -# securityContext: -# runAsGroup: 101 -# runAsUser: 100 -# allowPrivilegeEscalation: false -# securityContext: -# runAsUser: 100 -# fsGroup: 101 diff --git a/components/privileged/kustomization.yaml b/components/privileged/kustomization.yaml index 15fd052c..3dcac220 100644 --- a/components/privileged/kustomization.yaml +++ b/components/privileged/kustomization.yaml @@ -27,6 +27,5 @@ patches: - path: patches/precise-code-intel/worker.Deployment.yaml - path: patches/redis/redis-cache.Deployment.yaml - path: patches/redis/redis-store.Deployment.yaml - - path: patches/repo-updater/repo-updater.Deployment.yaml - path: patches/syntect-server/syntect-server.Deployment.yaml - path: patches/worker/worker.Deployment.yaml diff --git a/components/privileged/patches/repo-updater/repo-updater.Deployment.yaml b/components/privileged/patches/repo-updater/repo-updater.Deployment.yaml deleted file mode 100644 index dd0d8662..00000000 --- a/components/privileged/patches/repo-updater/repo-updater.Deployment.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: repo-updater -spec: - template: - spec: - securityContext: - runAsUser: 0 - fsGroup: 0 - containers: - - name: repo-updater - securityContext: - allowPrivilegeEscalation: true - runAsGroup: 0 - runAsUser: 0 diff --git a/components/services/redis/kustomization.yaml b/components/services/redis/kustomization.yaml index f995bbb5..e48ec3b1 100644 --- a/components/services/redis/kustomization.yaml +++ b/components/services/redis/kustomization.yaml @@ -38,11 +38,6 @@ replacements: select: kind: Deployment name: symbols - - fieldPaths: - - spec.template.spec.containers.0.env.[name=REDIS_CACHE_ENDPOINT].value - select: - kind: Deployment - name: repo-updater - fieldPaths: - spec.template.spec.containers.0.env.[name=REDIS_CACHE_ENDPOINT].value select: @@ -85,11 +80,6 @@ replacements: select: kind: Deployment name: symbols - - fieldPaths: - - spec.template.spec.containers.0.env.[name=REDIS_STORE_ENDPOINT].value - select: - kind: Deployment - name: repo-updater - fieldPaths: - spec.template.spec.containers.0.env.[name=REDIS_STORE_ENDPOINT].value select: @@ -110,5 +100,5 @@ patches: target: group: apps kind: StatefulSet|Deployment - name: repo-updater|gitserver|searcher|symbols|worker + name: gitserver|searcher|symbols|worker version: v1 diff --git a/components/sizes/l/kustomization.yaml b/components/sizes/l/kustomization.yaml index 163cc02b..f4808ae1 100644 --- a/components/sizes/l/kustomization.yaml +++ b/components/sizes/l/kustomization.yaml @@ -91,20 +91,6 @@ patches: limits: cpu: "1" memory: 6Gi - - patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: - name: repo-updater - spec: - template: - spec: - containers: - - name: repo-updater - resources: - limits: - cpu: "4" - memory: 4Gi - patch: |- apiVersion: apps/v1 kind: Deployment diff --git a/components/sizes/m/kustomization.yaml b/components/sizes/m/kustomization.yaml index 0e1a2722..204921cc 100644 --- a/components/sizes/m/kustomization.yaml +++ b/components/sizes/m/kustomization.yaml @@ -92,20 +92,6 @@ patches: limits: cpu: "1" memory: 5Gi - - patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: - name: repo-updater - spec: - template: - spec: - containers: - - name: repo-updater - resources: - limits: - cpu: "4" - memory: 4Gi - patch: |- apiVersion: apps/v1 kind: Deployment diff --git a/components/sizes/s/kustomization.yaml b/components/sizes/s/kustomization.yaml index 0aad58f6..658f8e7a 100644 --- a/components/sizes/s/kustomization.yaml +++ b/components/sizes/s/kustomization.yaml @@ -91,20 +91,6 @@ patches: limits: cpu: "1" memory: 4Gi - - patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: - name: repo-updater - spec: - template: - spec: - containers: - - name: repo-updater - resources: - limits: - cpu: "4" - memory: 4Gi - patch: |- apiVersion: apps/v1 kind: Deployment diff --git a/components/sizes/xl/kustomization.yaml b/components/sizes/xl/kustomization.yaml index 4ad7f4c4..2f45f853 100644 --- a/components/sizes/xl/kustomization.yaml +++ b/components/sizes/xl/kustomization.yaml @@ -91,20 +91,6 @@ patches: limits: cpu: "1" memory: 8Gi - - patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: - name: repo-updater - spec: - template: - spec: - containers: - - name: repo-updater - resources: - limits: - cpu: "4" - memory: 4Gi - patch: |- apiVersion: apps/v1 kind: Deployment diff --git a/components/sizes/xs/kustomization.yaml b/components/sizes/xs/kustomization.yaml index 2af16833..2288b698 100644 --- a/components/sizes/xs/kustomization.yaml +++ b/components/sizes/xs/kustomization.yaml @@ -79,20 +79,6 @@ patches: limits: cpu: "1" memory: 3Gi - - patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: - name: repo-updater - spec: - template: - spec: - containers: - - name: repo-updater - resources: - limits: - cpu: "1" - memory: 2Gi - patch: |- apiVersion: apps/v1 kind: Deployment