Merge branch 'main' into promote/release-v5.10.3940

Author: DaedalusG

base/monitoring/jaeger/jaeger.Deployment.yaml

@@ -31,7 +31,12 @@ spec:
       containers:
         - name: jaeger
           image: index.docker.io/sourcegraph/jaeger-all-in-one:5.10.3940@sha256:d830a8c3e8c2be841de04118664f01710fa75d22f4302351309cb39932eee936
-          args: ["--memory.max-traces=20000", "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled"]
+          args:
+            [
+              "--memory.max-traces=20000",
+              "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json",
+              "--collector.otlp.enabled",
+            ]
           ports:
             - containerPort: 5775
               protocol: UDP

base/sourcegraph/codeinsights-db/codeinsights-db.StatefulSet.yaml

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

base/sourcegraph/codeintel-db/codeintel-db.StatefulSet.yaml

@@ -28,7 +28,12 @@ spec:
       initContainers:
         - name: correct-data-dir-permissions
           image: index.docker.io/sourcegraph/alpine-3.14:5.10.3940@sha256:e9008c3e20b445abb8788bb513479418ef55476e2c01228b6c094776919bcbe4
-          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

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:5.10.3940@sha256:e9008c3e20b445abb8788bb513479418ef55476e2c01228b6c094776919bcbe4
-          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/executors/dind/executor.Deployment.yaml

@@ -65,11 +65,11 @@ spec:
           securityContext:
             privileged: true
           command:
-            - 'dockerd'
-            - '--tls=false'
-            - '--mtu=1200'
-            - '--registry-mirror=http://private-docker-registry:5000'
-            - '--host=tcp://0.0.0.0:2375'
+            - "dockerd"
+            - "--tls=false"
+            - "--mtu=1200"
+            - "--registry-mirror=http://private-docker-registry:5000"
+            - "--host=tcp://0.0.0.0:2375"
           livenessProbe:
             tcpSocket:
               port: 2375

release.yaml

@@ -332,6 +332,7 @@ promoteToPublic:
           cat << EOF | buildkite-agent annotate --style info
           Promoted release is **publicly available** through a git tag at [\`{{version}}\`](https://github.com/sourcegraph/deploy-sourcegraph-k8s/tree/{{version}}).
           EOF
+
       - name: 'Promote on release registry'
         cmd: |
           echo "Promoting deploy-sourcegraph-k8s {{version}} release on release registry"
@@ -348,3 +349,61 @@ promoteToPublic:
             echo "Build created, see:"
             echo $body | jq .web_url
           fi
+
+      - name: "update main with latest version"
+        cmd: |
+          set -eu
+          branch="promote/release-{{version}}-update-main"
+          echo "Checking out origin/main"
+          git fetch origin main
+          git switch main
+          echo "Creating branch origin/${branch}"
+          git switch -c "${branch}"
+
+      - name: "sg ops"
+        cmd: |
+          set -eu
+          sg ops update-images \
+            --kind k8s \
+            --registry index.docker.io/sourcegraph \
+            --docker-username=$DOCKER_USERNAME \
+            --docker-password=$DOCKER_PASSWORD \
+            --pin-tag {{inputs.server.tag}} \
+            base/
+
+      - name: "sg ops (executors)"
+        cmd: |
+          set -eu
+          sg ops update-images \
+            --kind k8s \
+            --registry index.docker.io/sourcegraph \
+            --docker-username=$DOCKER_USERNAME \
+            --docker-password=$DOCKER_PASSWORD \
+            --pin-tag {{inputs.server.tag}} \
+            components/executors/
+
+      - name: "git:commit"
+        cmd: |
+          set -eu
+          branch="promote/release-{{version}}-update-main"
+          find . -name "*.yaml" | xargs git add
+          find . -name "*.yml" | xargs git add
+
+          # Careful with the quoting for the config, using double quotes will lead
+          # to the shell dropping out all quotes from the json, leading to failed
+          # parsing.
+          git commit -am 'update-main: {{version}}' -m 'update main with latest release'
+          git push origin "${branch}"
+          
+      - name: "github:pr"
+        cmd: |
+          set -eu
+          internal_branch="promote/release-{{version}}-update-main"
+          gh pr create \
+            --fill \
+            --draft \
+            --base "$internal_branch" \
+            --title "Update main: build {{version}}" \
+            --body "Test plan: automated release PR, CI will perform additional checks"
+          echo "🚢 Please check the associated CI build to ensure the process completed".
+