diff --git a/base/github-proxy/github-proxy.Deployment.yaml b/base/github-proxy/github-proxy.Deployment.yaml deleted file mode 100644 index 98e51fa1b42f..000000000000 --- a/base/github-proxy/github-proxy.Deployment.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - description: Rate-limiting proxy for the GitHub API. - kubectl.kubernetes.io/default-container: github-proxy - labels: - deploy: sourcegraph - sourcegraph-resource-requires: no-cluster-admin - app.kubernetes.io/component: github-proxy - name: github-proxy -spec: - minReadySeconds: 10 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - app: github-proxy - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - type: RollingUpdate - template: - metadata: - labels: - app: github-proxy - deploy: sourcegraph - spec: - containers: - - name: github-proxy - image: index.docker.io/sourcegraph/github-proxy:insiders@sha256:fc2610a2c5c530f577be95ac761442a73ca10d8a090208727e8d3bf36b7c1078 - 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: 3180 - name: http - resources: - limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 250M - securityContext: - runAsUser: 0 diff --git a/base/github-proxy/github-proxy.Service.yaml b/base/github-proxy/github-proxy.Service.yaml deleted file mode 100644 index a346064e50b8..000000000000 --- a/base/github-proxy/github-proxy.Service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - prometheus.io/port: "6060" - sourcegraph.prometheus/scrape: "true" - labels: - app: github-proxy - deploy: sourcegraph - sourcegraph-resource-requires: no-cluster-admin - app.kubernetes.io/component: github-proxy - name: github-proxy -spec: - ports: - - name: http - port: 80 - targetPort: http - selector: - app: github-proxy - type: ClusterIP diff --git a/overlays/bases/deployments/kustomization.yaml b/overlays/bases/deployments/kustomization.yaml index 0551ee1a91f5..d32ada7af9bd 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/github-proxy/github-proxy.Service.yaml -- base/github-proxy/github-proxy.Deployment.yaml - base/repo-updater/repo-updater.Service.yaml - base/repo-updater/repo-updater.Deployment.yaml - base/worker/worker.Deployment.yaml diff --git a/overlays/low-resource/kustomization.yaml b/overlays/low-resource/kustomization.yaml index fa7701b31c1d..6a961c79f42f 100644 --- a/overlays/low-resource/kustomization.yaml +++ b/overlays/low-resource/kustomization.yaml @@ -14,12 +14,6 @@ patches: group: apps version: v1 path: delete-resources.yaml -- target: - kind: Deployment - name: github-proxy - group: apps - version: v1 - path: delete-resources.yaml - target: kind: StatefulSet name: gitserver diff --git a/overlays/minikube/kustomization.yaml b/overlays/minikube/kustomization.yaml index bb55cfb4f80c..5093b3200945 100644 --- a/overlays/minikube/kustomization.yaml +++ b/overlays/minikube/kustomization.yaml @@ -14,12 +14,6 @@ patches: group: apps version: v1 path: delete-resources.yaml - - target: - kind: Deployment - name: github-proxy - group: apps - version: v1 - path: delete-resources.yaml - target: kind: StatefulSet name: gitserver diff --git a/overlays/non-privileged/github-proxy/github-proxy.Deployment.yaml b/overlays/non-privileged/github-proxy/github-proxy.Deployment.yaml deleted file mode 100644 index 0dc687574a76..000000000000 --- a/overlays/non-privileged/github-proxy/github-proxy.Deployment.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: github-proxy -spec: - template: - spec: - containers: - - name: github-proxy - securityContext: - # Required to prevent escalations to root. - allowPrivilegeEscalation: false - runAsUser: 100 - runAsGroup: 101 diff --git a/overlays/non-privileged/kustomization.yaml b/overlays/non-privileged/kustomization.yaml index 34ef5105fca7..8471ac948368 100644 --- a/overlays/non-privileged/kustomization.yaml +++ b/overlays/non-privileged/kustomization.yaml @@ -10,7 +10,6 @@ patchesStrategicMerge: - codeintel-db/codeintel-db.Deployment.yaml - codeinsights-db/codeinsights-db.Deployment.yaml - frontend/sourcegraph-frontend.Deployment.yaml - - github-proxy/github-proxy.Deployment.yaml - gitserver/gitserver.StatefulSet.yaml - grafana/grafana.StatefulSet.yaml - blobstore/blobstore.Deployment.yaml