Converting deprecating Kustomize fields to supported fields. (#8)

Author: abeatrix

README.md

@@ -2,8 +2,8 @@
 
 [![sourcegraph: beta](https://img.shields.io/badge/sourcegraph-beta-blue.svg)](https://sourcegraph.com/github.com/sourcegraph/deploy-sourcegrap-k8s)
 
-> **Warning**
-> The contents of this repository are currently in beta and will not be officially released until v4.5.0. While we encourage testing and feedback, please do not use this in production environments. We cannot guarantee support for these beta features and recommend that you use them at your own risk. We will keep you updated as development progresses and official releases become available.
+> **Note**
+> This deployment method only supports Sourcegraph version 4.5.0 and above.
 
 Deploying Sourcegraph into a Kubernetes cluster is for organizations that need highly scalable and
 available code search and code intelligence. This repository contains documentation for creating,
@@ -26,9 +26,7 @@ Please refer to the [Sourcegraph Kustomize docs](https://docs.sourcegraph.com/ad
 
 When upgrading Sourcegraph, please check the [upgrade docs for Kubernetes](https://docs.sourcegraph.com/admin/updates/kubernetes) to confirm if manual migrations is necessary.
 
-## Development
-
-The `dev` branch is used to track development.
+## Feedback
 
 We've made our deployment configurations open source to better serve our customers' needs. If there is anything we can do to make deploying Sourcegraph easier just [open an issue (in sourcegraph/sourcegraph)](https://github.com/sourcegraph/sourcegraph/issues/new?assignees=&labels=deploy-sourcegraph-k8s&template=deploy-sourcegraph.md&title=%5Bdeploy-sourcegraph-k8s%5D) or a pull request and we will respond as soon as possible!
 

base/monitoring/prometheus/prometheus.ConfigMap.yaml

@@ -56,8 +56,12 @@ data:
               - '/sg_prometheus_add_ons/*_targets.yml'
       
       - job_name: 'cadvisor'
-        static_configs:
-          - targets: ['cadvisor:48080']
+        dns_sd_configs:
+          - names:
+            - 'cadvisor.default.svc.cluster.local'
+            - 'cadvisor.ns-sourcegraph.svc.cluster.local'
+            type: A
+            port: 48080
         relabel_configs:
           - source_labels: [__address__]
             target_label: instance
@@ -74,6 +78,38 @@ data:
             action: replace
             target_label: name
             separator: '-'
+          # - source_labels: [container_label_io_kubernetes_pod_namespace]
+          #   regex: ^$|ns-sourcegraph # ACTION: replace ns-sourcegraph with your namespace
+          #   action: keep
+      
+      - job_name: 'sourcegraph-statefulsets'
+        dns_sd_configs:
+          - names:
+            - 'symbols.default.svc.cluster.local'
+            - 'symbols.ns-sourcegraph.svc.cluster.local'
+            - 'searcher.default.svc.cluster.local'
+            - 'searcher.ns-sourcegraph.svc.cluster.local'
+            - 'gitserver.default.svc.cluster.local'
+            - 'gitserver.ns-sourcegraph.svc.cluster.local'
+            - 'sourcegraph-frontend.default.svc.cluster.local'
+            - 'sourcegraph-frontend.ns-sourcegraph.svc.cluster.local'
+            type: A
+            port: 6060
+          - names:
+            - 'indexed-search.default.svc.cluster.local'
+            - 'indexed-search.ns-sourcegraph.svc.cluster.local'
+            type: A
+            port: 6070
+          - names:
+            - 'indexed-search-indexer.default.svc.cluster.local'
+            - 'indexed-search-indexer.ns-sourcegraph.svc.cluster.local'
+            type: A
+            port: 6072
+        relabel_configs:
+          - source_labels: [__meta_dns_name]
+            target_label: service_name
+            regex: (.*)\..*\..*\..*\..*
+            replacement: ${1}
 
   # Extra rules
   extra_rules.yml: |
@@ -91,6 +127,11 @@ data:
 
   # List of static targets
   prometheus_targets.yml: |
+    - labels:
+        nodename: "sourcegraph-services"
+        job: cadvisor
+      targets:
+        - cadvisor:48080
     - labels:
         nodename: "sourcegraph-services"
         job: sourcegraph-frontend

base/monitoring/prometheus/prometheus.Deployment.yaml

@@ -27,6 +27,11 @@ spec:
         - name: prometheus
           image: index.docker.io/sourcegraph/prometheus:4.4.2@sha256:d833d00a39937cf700f276f816dc789615d6396979418a7d9362386513b1fc9d
           terminationMessagePolicy: FallbackToLogsOnError
+          env:
+            - name: MY_POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
           readinessProbe:
             httpGet:
               path: /-/ready

base/sourcegraph/kustomization.yaml

@@ -16,11 +16,3 @@ resources:
   - symbols
   - syntect-server
   - worker
-# Create config map for kustomize configuration
-generatorOptions:
-  labels:
-    name: sourcegraph-kustomize-configs
-configMapGenerator:
-  - name: sourcegraph-kustomize-env
-    literals:
-      - deploy=sourcegraph

base/sourcegraph/pgsql/pgsql.StatefulSet.yaml

@@ -28,7 +28,12 @@ spec:
       initContainers:
         - name: correct-data-dir-permissions
           image: index.docker.io/sourcegraph/alpine-3.14:4.4.2@sha256:f5b9588d8bc2107cf37ed135ae63ba1930df0828a425bd445a8d9eb3aad5f783
-          command: ["sh", "-c", "if [ -d /data/pgdata-12 ]; then chmod 750 /data/pgdata-12; fi"]
+          command:
+            [
+              "sh",
+              "-c",
+              "if [ -d /data/pgdata-12 ]; then chmod 750 /data/pgdata-12; fi",
+            ]
           volumeMounts:
             - mountPath: /data
               name: disk

components/clusters/aws/eks-ebs/README.md renamed to components/clusters/aws/aws-ebs/README.md

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 components:
+  - ../../../storage-class/aws/aws-ebs
   - ../../../storage-class/sourcegraph
-  - ../../../storage-class/aws/eks-ebs
   - ../../../ingress/alb

components/clusters/aws/eks-ebs/kustomization.yaml renamed to components/clusters/aws/aws-ebs/kustomization.yaml

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 components:
-  - ../../../storage-class/sourcegraph
   - ../../../storage-class/aws/ebs-csi
+  - ../../../storage-class/sourcegraph
   - ../../../ingress/alb

components/clusters/aws/ebs-csi/kustomization.yaml

@@ -0,0 +1,16 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+replacements:
+  - source:
+      fieldPath: data.AWS_MANAGED_CERT_ARN
+      kind: SourcegraphBuildConfig
+      name: sourcegraph-kustomize-config
+      version: v1
+    targets:
+      - fieldPaths:
+          - metadata.annotations.[alb.ingress.kubernetes.io/certificate-arn]
+        select:
+          kind: Ingress
+          name: sourcegraph-frontend
+patches:
+  - path: patches/frontend.Ingress.yaml