Clean up base

Author: abeatrix

.gitignore

@@ -1,3 +1,4 @@
+ingress-controller.yaml
 cluster
 cluster.yaml
 generated-cluster

base/monitoring/cadvisor/cadvisor.DaemonSet.yaml

@@ -3,7 +3,7 @@ kind: DaemonSet
 metadata:
   annotations:
     description: DaemonSet to ensure all nodes run a cAdvisor pod.
-    seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
+    seccomp.security.alpha.kubernetes.io/pod: "docker/default"
   labels:
     deploy: sourcegraph
     sourcegraph-resource-requires: cluster-admin
@@ -25,60 +25,60 @@ spec:
     spec:
       serviceAccountName: cadvisor
       containers:
-      - name: cadvisor
-        image: index.docker.io/sourcegraph/cadvisor:187572_2022-12-06_cbecc5321c7d@sha256:755748f2f9b00d8f70bd65349e85235585bdf1a663e26198c8eaf91dfd5636e1
-        args:
-        # Kubernetes-specific flags below (other flags are baked into the Docker image)
-        #
-        # disable container labels to allow whitelisting to reduce noise
-        - --store_container_labels=false
-        - --whitelisted_container_labels=io.kubernetes.container.name,io.kubernetes.pod.name,io.kubernetes.pod.namespace,io.kubernetes.pod.uid
-        # it is safe to uncomment this option if you use docker as your container runtime to reduce noise
-        # - --docker_only
-        resources:
-          requests:
-            memory: 200Mi
-            cpu: 150m
-          limits:
-            memory: 2000Mi
-            cpu: 300m
-        volumeMounts:
+        - name: cadvisor
+          image: index.docker.io/sourcegraph/cadvisor:187572_2022-12-06_cbecc5321c7d@sha256:755748f2f9b00d8f70bd65349e85235585bdf1a663e26198c8eaf91dfd5636e1
+          args:
+            # Kubernetes-specific flags below (other flags are baked into the Docker image)
+            #
+            # disable container labels to allow whitelisting to reduce noise
+            - --store_container_labels=false
+            - --whitelisted_container_labels=io.kubernetes.container.name,io.kubernetes.pod.name,io.kubernetes.pod.namespace,io.kubernetes.pod.uid
+          # it is safe to uncomment this option if you use docker as your container runtime to reduce noise
+          # - --docker_only
+          resources:
+            requests:
+              memory: 200Mi
+              cpu: 150m
+            limits:
+              memory: 2000Mi
+              cpu: 300m
+          volumeMounts:
+            - name: rootfs
+              mountPath: /rootfs
+              readOnly: true
+            - name: var-run
+              mountPath: /var/run
+              readOnly: true
+            - name: sys
+              mountPath: /sys
+              readOnly: true
+            - name: docker
+              mountPath: /var/lib/docker
+              readOnly: true
+            - name: disk
+              mountPath: /dev/disk
+              readOnly: true
+          ports:
+            - name: http
+              containerPort: 48080
+              protocol: TCP
+          securityContext:
+            privileged: true
+      automountServiceAccountToken: false
+      terminationGracePeriodSeconds: 30
+      volumes:
         - name: rootfs
-          mountPath: /rootfs
-          readOnly: true
+          hostPath:
+            path: /
         - name: var-run
-          mountPath: /var/run
-          readOnly: true
+          hostPath:
+            path: /var/run
         - name: sys
-          mountPath: /sys
-          readOnly: true
+          hostPath:
+            path: /sys
         - name: docker
-          mountPath: /var/lib/docker
-          readOnly: true
+          hostPath:
+            path: /var/lib/docker
         - name: disk
-          mountPath: /dev/disk
-          readOnly: true
-        ports:
-        - name: http
-          containerPort: 48080
-          protocol: TCP
-        securityContext:
-          privileged: true
-      automountServiceAccountToken: false
-      terminationGracePeriodSeconds: 30
-      volumes:
-      - name: rootfs
-        hostPath:
-          path: /
-      - name: var-run
-        hostPath:
-          path: /var/run
-      - name: sys
-        hostPath:
-          path: /sys
-      - name: docker
-        hostPath:
-          path: /var/lib/docker
-      - name: disk
-        hostPath:
-          path: /dev/disk
+          hostPath:
+            path: /dev/disk

base/monitoring/grafana/grafana.StatefulSet.yaml

@@ -25,54 +25,54 @@ spec:
         deploy: sourcegraph
     spec:
       containers:
-      - name: grafana
-        image: index.docker.io/sourcegraph/grafana:187572_2022-12-06_cbecc5321c7d@sha256:cf295a1dada50607a364390a54744dbc9142aa99b42c07f1bb623ca251639d2c
-        terminationMessagePolicy: FallbackToLogsOnError
-        ports:
-        - containerPort: 3370
-          name: http
-        volumeMounts:
-        - mountPath: /var/lib/grafana
-          name: grafana-data
-        - mountPath: /sg_config_grafana/provisioning/datasources
-          name: config
-        - mountPath: /sg_grafana_additional_dashboards
-          name: dashboards
-        # Grafana is relied upon to send alerts to site admins when something is wrong with
-        # Sourcegraph, thus its memory requests and limits are the same to guarantee it has enough
-        # memory to perform its job reliably and prevent conflicts with other pods on the same
-        # host node.
-        resources:
-          limits:
-            cpu: "1"
-            memory: 512Mi
-          requests:
-            cpu: 100m
-            memory: 512Mi
-        securityContext:
-          allowPrivilegeEscalation: false
-          runAsGroup: 472
-          runAsUser: 472
+        - name: grafana
+          image: index.docker.io/sourcegraph/grafana:187572_2022-12-06_cbecc5321c7d@sha256:cf295a1dada50607a364390a54744dbc9142aa99b42c07f1bb623ca251639d2c
+          terminationMessagePolicy: FallbackToLogsOnError
+          ports:
+            - containerPort: 3370
+              name: http
+          volumeMounts:
+            - mountPath: /var/lib/grafana
+              name: grafana-data
+            - mountPath: /sg_config_grafana/provisioning/datasources
+              name: config
+            - mountPath: /sg_grafana_additional_dashboards
+              name: dashboards
+          # Grafana is relied upon to send alerts to site admins when something is wrong with
+          # Sourcegraph, thus its memory requests and limits are the same to guarantee it has enough
+          # memory to perform its job reliably and prevent conflicts with other pods on the same
+          # host node.
+          resources:
+            limits:
+              cpu: "1"
+              memory: 512Mi
+            requests:
+              cpu: 100m
+              memory: 512Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            runAsGroup: 472
+            runAsUser: 472
       # serviceAccountName: grafana
       volumes:
-      - name: config
-        configMap:
-          defaultMode: 0777
-          name: grafana
-      - name: dashboards
-        configMap:
-          defaultMode: 0777
-          name: grafana-dashboards
+        - name: config
+          configMap:
+            defaultMode: 0777
+            name: grafana
+        - name: dashboards
+          configMap:
+            defaultMode: 0777
+            name: grafana-dashboards
       securityContext:
         runAsUser: 472
         fsGroup: 472
         fsGroupChangePolicy: OnRootMismatch
   volumeClaimTemplates:
-  - metadata:
-      name: grafana-data
-    spec:
-      accessModes: ["ReadWriteOnce"]
-      resources:
-        requests:
-          storage: 2Gi
-      storageClassName: sourcegraph
+    - metadata:
+        name: grafana-data
+      spec:
+        accessModes: ["ReadWriteOnce"]
+        resources:
+          requests:
+            storage: 2Gi
+        storageClassName: sourcegraph

base/monitoring/node-exporter/node-exporter.DaemonSet.yaml

@@ -3,7 +3,7 @@ kind: DaemonSet
 metadata:
   annotations:
     description: DaemonSet to ensure all nodes run a node-exporter pod.
-    seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
+    seccomp.security.alpha.kubernetes.io/pod: "docker/default"
   labels:
     deploy: sourcegraph
     app: node-exporter
@@ -23,68 +23,68 @@ spec:
         app: node-exporter
     spec:
       containers:
-      - name: node-exporter
-        image: index.docker.io/sourcegraph/node-exporter:187572_2022-12-06_cbecc5321c7d@sha256:2d9dcdf0b2226f0c3d550a64d2667710265462350a3ba9ebe37d0302bc64af0f
-        imagePullPolicy: IfNotPresent
-        resources:
-          limits:
-            cpu: '1'
-            memory: 1Gi
-          requests:
-            cpu: 200m
-            memory: 100Mi
-        args:
-        - --web.listen-address=:9100
-        - --path.sysfs=/host/sys
-        - --path.rootfs=/host/root
-        - --path.procfs=/host/proc
-        - --no-collector.wifi
-        - --no-collector.hwmon
-        - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
-        - --collector.netclass.ignored-devices=^(veth.*)$
-        - --collector.netdev.device-exclude=^(veth.*)$
-        env:
-        securityContext:
-          allowPrivilegeEscalation: false
-          readOnlyRootFilesystem: true
-          runAsGroup: 65534
-          runAsUser: 65534
-        volumeMounts:
-        - name: rootfs
-          mountPath: /host/root
-          mountPropagation: HostToContainer
-          readOnly: true
-        - name: sys
-          mountPath: /host/sys
-          mountPropagation: HostToContainer
-          readOnly: true
-        - name: proc
-          mountPath: /host/proc
-          mountPropagation: HostToContainer
-          readOnly: true
-        ports:
-        - name: metrics
-          containerPort: 9100
-          protocol: TCP
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            scheme: HTTP
-            port: metrics
-          initialDelaySeconds: 0
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        livenessProbe:
-          failureThreshold: 3
-          httpGet:
-            scheme: HTTP
-            port: metrics
-          initialDelaySeconds: 0
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        terminationMessagePolicy: FallbackToLogsOnError
+        - name: node-exporter
+          image: index.docker.io/sourcegraph/node-exporter:187572_2022-12-06_cbecc5321c7d@sha256:2d9dcdf0b2226f0c3d550a64d2667710265462350a3ba9ebe37d0302bc64af0f
+          imagePullPolicy: IfNotPresent
+          resources:
+            limits:
+              cpu: "1"
+              memory: 1Gi
+            requests:
+              cpu: 200m
+              memory: 100Mi
+          args:
+            - --web.listen-address=:9100
+            - --path.sysfs=/host/sys
+            - --path.rootfs=/host/root
+            - --path.procfs=/host/proc
+            - --no-collector.wifi
+            - --no-collector.hwmon
+            - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
+            - --collector.netclass.ignored-devices=^(veth.*)$
+            - --collector.netdev.device-exclude=^(veth.*)$
+          env:
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            runAsGroup: 65534
+            runAsUser: 65534
+          volumeMounts:
+            - name: rootfs
+              mountPath: /host/root
+              mountPropagation: HostToContainer
+              readOnly: true
+            - name: sys
+              mountPath: /host/sys
+              mountPropagation: HostToContainer
+              readOnly: true
+            - name: proc
+              mountPath: /host/proc
+              mountPropagation: HostToContainer
+              readOnly: true
+          ports:
+            - name: metrics
+              containerPort: 9100
+              protocol: TCP
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              scheme: HTTP
+              port: metrics
+            initialDelaySeconds: 0
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              scheme: HTTP
+              port: metrics
+            initialDelaySeconds: 0
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+          terminationMessagePolicy: FallbackToLogsOnError
       automountServiceAccountToken: false
       terminationGracePeriodSeconds: 30
       securityContext:
@@ -98,12 +98,12 @@ spec:
       tolerations:
       hostPID: true
       volumes:
-      - name: rootfs
-        hostPath:
-          path: /
-      - name: sys
-        hostPath:
-          path: /sys
-      - name: proc
-        hostPath:
-          path: /proc
+        - name: rootfs
+          hostPath:
+            path: /
+        - name: sys
+          hostPath:
+            path: /sys
+        - name: proc
+          hostPath:
+            path: /proc