diff --git a/README.dev.md b/README.dev.md index 2a0fc5f7307e..2c7fb907f6ce 100644 --- a/README.dev.md +++ b/README.dev.md @@ -121,9 +121,9 @@ Additionally you may want to deploy a modified version of a service locally. Min ```shell eval $(minikube docker-env) -IMAGE=repo-updater:dev ./cmd/repo-updater/build.sh -kubectl edit deployment/repo-updater # set imagePullPolicy to Never -kubectl set image deployment repo-updater '*=repo-updater:dev' +IMAGE=frontend:dev ./cmd/frontend/build.sh +kubectl edit deployment/frontend # set imagePullPolicy to Never +kubectl set image deployment frontend '*=frontend:dev' ``` You can also use the [minikube overlay](overlays/minikube/README.md). This avoids modifying the config files in `base`. diff --git a/base/repo-updater/repo-updater.Deployment.yaml b/base/repo-updater/repo-updater.Deployment.yaml deleted file mode 100644 index f44d86bd65c8..000000000000 --- a/base/repo-updater/repo-updater.Deployment.yaml +++ /dev/null @@ -1,71 +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: - runAsUser: 0 diff --git a/base/repo-updater/repo-updater.Service.yaml b/base/repo-updater/repo-updater.Service.yaml deleted file mode 100644 index 3f4ff29eb66f..000000000000 --- a/base/repo-updater/repo-updater.Service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - prometheus.io/port: "6060" - sourcegraph.prometheus/scrape: "true" - labels: - app: repo-updater - deploy: sourcegraph - sourcegraph-resource-requires: no-cluster-admin - app.kubernetes.io/component: repo-updater - name: repo-updater -spec: - ports: - - name: http - port: 3182 - targetPort: http - selector: - app: repo-updater - type: ClusterIP diff --git a/overlays/bases/deployments/kustomization.yaml b/overlays/bases/deployments/kustomization.yaml index d32ada7af9bd..ca01c51ac117 100644 --- a/overlays/bases/deployments/kustomization.yaml +++ b/overlays/bases/deployments/kustomization.yaml @@ -31,8 +31,6 @@ resources: - base/prometheus/prometheus.ConfigMap.yaml - base/prometheus/prometheus.Deployment.yaml - base/prometheus/prometheus.Service.yaml -- base/repo-updater/repo-updater.Service.yaml -- base/repo-updater/repo-updater.Deployment.yaml - base/worker/worker.Deployment.yaml - base/worker/worker.Service.yaml - base/worker/worker-executors.Service.yaml diff --git a/overlays/low-resource/kustomization.yaml b/overlays/low-resource/kustomization.yaml index 6a961c79f42f..0da3601831cb 100644 --- a/overlays/low-resource/kustomization.yaml +++ b/overlays/low-resource/kustomization.yaml @@ -68,12 +68,6 @@ patches: group: apps version: v1 path: delete-resources-2.yaml -- target: - kind: Deployment - name: repo-updater - group: apps - version: v1 - path: delete-resources.yaml - target: kind: Deployment name: searcher @@ -424,22 +418,6 @@ patches: target: kind: Deployment name: precise-code-intel-worker -- patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: - name: unused - spec: - template: - spec: - containers: - - name: repo-updater - env: - - name: NEW_MIGRATIONS - value: "true" - target: - kind: Deployment - name: repo-updater patchesStrategicMerge: - cadvisor/delete-Daemonset.yaml diff --git a/overlays/minikube/kustomization.yaml b/overlays/minikube/kustomization.yaml index 5093b3200945..38a7050991c0 100644 --- a/overlays/minikube/kustomization.yaml +++ b/overlays/minikube/kustomization.yaml @@ -68,12 +68,6 @@ patches: group: apps version: v1 path: delete-resources-2.yaml - - target: - kind: Deployment - name: repo-updater - group: apps - version: v1 - path: delete-resources.yaml - target: kind: Deployment name: searcher diff --git a/overlays/non-privileged/kustomization.yaml b/overlays/non-privileged/kustomization.yaml index 8471ac948368..a5c1962889cf 100644 --- a/overlays/non-privileged/kustomization.yaml +++ b/overlays/non-privileged/kustomization.yaml @@ -21,7 +21,6 @@ patchesStrategicMerge: - redis/redis-cache.Deployment.yaml - redis/redis-store.Deployment.yaml - worker/worker.Deployment.yaml - - repo-updater/repo-updater.Deployment.yaml - searcher/searcher.Deployment.yaml - symbols/symbols.Deployment.yaml - syntect-server/syntect-server.Deployment.yaml diff --git a/overlays/non-privileged/repo-updater/repo-updater.Deployment.yaml b/overlays/non-privileged/repo-updater/repo-updater.Deployment.yaml deleted file mode 100644 index 88d9fe767729..000000000000 --- a/overlays/non-privileged/repo-updater/repo-updater.Deployment.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: repo-updater -spec: - template: - spec: - containers: - - name: repo-updater - securityContext: - # Required to prevent escalations to root. - allowPrivilegeEscalation: false - runAsUser: 100 - runAsGroup: 101 diff --git a/overlays/resources-update/resources.yaml b/overlays/resources-update/resources.yaml index f2728945912d..6a0997e963d0 100644 --- a/overlays/resources-update/resources.yaml +++ b/overlays/resources-update/resources.yaml @@ -307,24 +307,6 @@ metadata: --- 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: