From 68b928642b9373b714cd9595ae6303b1e951a7a9 Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Thu, 28 Sep 2023 17:01:43 +0200 Subject: [PATCH 01/16] wip --- release.yaml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 release.yaml diff --git a/release.yaml b/release.yaml new file mode 100644 index 00000000..4441b241 --- /dev/null +++ b/release.yaml @@ -0,0 +1,46 @@ +productName: deploy-sourcegraph-k8s +repository: "github.com/sourcegraph/deploy-sourcegraph-k8s" +owners: + - "@sourcegraph/release" +requirements: + - name: "Github CLI" + cmd: gh version + fixInstructions: brew install gh + - name: "Docker username" + env: DOCKER_USERNAME + - name: "Docker password" + env: DOCKER_PASSWORD +steps: + patch: + - name: "sg ops (base)" + cmd: | + sg ops update-images \ + --kind k8s \ + --docker-username=$DOCKER_USERNAME \ + --docker-password=$DOCKER_PASSWORD \ + --pin-tag {{tag}} \ + base/ + # - name: "sg ops (executors)" + # cmd: | + # sg ops update-images \ + # --kind k8s \ + # --docker-username=$DOCKER_USERNAME \ + # --docker-password=$DOCKER_PASSWORD \ + # --pin-tag {{tag}} \ + # components/executors/ + - name: "git" + cmd: | + echo "Creating branch wip_{{version}}" + release_branch="wip_{{version}}" + git checkout -b $release_branch + - name: "git" + cmd: | + find . -name "*.yaml" | xargs git add + find . -name "*.yml" | xargs git add + git commit -m "release_patch: build {{version}}" + - name: "git" + cmd: | + git push origin wip_{{version}} + - name: "gh cli" + cmd: | + gh pr create -f -t "PRETEND RELEASE WIP: release_patch: build {{version}}" # -l "wip_release" From 452f0c4bddd0fc72bd98dfb5e804f2f6537fbeca Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Thu, 12 Oct 2023 14:37:21 +0200 Subject: [PATCH 02/16] wip --- release.yaml | 83 ++++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/release.yaml b/release.yaml index 4441b241..34cb1cef 100644 --- a/release.yaml +++ b/release.yaml @@ -1,7 +1,9 @@ -productName: deploy-sourcegraph-k8s -repository: "github.com/sourcegraph/deploy-sourcegraph-k8s" -owners: - - "@sourcegraph/release" +meta: + productName: deploy-sourcegraph-k8s + repository: "github.com/sourcegraph/deploy-sourcegraph-k8s" + owners: + - "@sourcegraph/release" + requirements: - name: "Github CLI" cmd: gh version @@ -10,37 +12,42 @@ requirements: env: DOCKER_USERNAME - name: "Docker password" env: DOCKER_PASSWORD -steps: - patch: - - name: "sg ops (base)" - cmd: | - sg ops update-images \ - --kind k8s \ - --docker-username=$DOCKER_USERNAME \ - --docker-password=$DOCKER_PASSWORD \ - --pin-tag {{tag}} \ - base/ - # - name: "sg ops (executors)" - # cmd: | - # sg ops update-images \ - # --kind k8s \ - # --docker-username=$DOCKER_USERNAME \ - # --docker-password=$DOCKER_PASSWORD \ - # --pin-tag {{tag}} \ - # components/executors/ - - name: "git" - cmd: | - echo "Creating branch wip_{{version}}" - release_branch="wip_{{version}}" - git checkout -b $release_branch - - name: "git" - cmd: | - find . -name "*.yaml" | xargs git add - find . -name "*.yml" | xargs git add - git commit -m "release_patch: build {{version}}" - - name: "git" - cmd: | - git push origin wip_{{version}} - - name: "gh cli" - cmd: | - gh pr create -f -t "PRETEND RELEASE WIP: release_patch: build {{version}}" # -l "wip_release" + +inputs: + - releaseId: server + +create: + steps: + patch: + - name: "sg ops (base)" + cmd: | + sg ops update-images \ + --kind k8s \ + --docker-username=$DOCKER_USERNAME \ + --docker-password=$DOCKER_PASSWORD \ + --pin-tag wip_{{inputs.server.tag}} \ + base/ + # - name: "sg ops (executors)" + # cmd: | + # sg ops update-images \ + # --kind k8s \ + # --docker-username=$DOCKER_USERNAME \ + # --docker-password=$DOCKER_PASSWORD \ + # --pin-tag {{tag}} \ + # components/executors/ + - name: "git" + cmd: | + echo "Creating branch wip_{{version}}" + release_branch="wip_{{version}}" + git checkout -b $release_branch + - name: "git" + cmd: | + find . -name "*.yaml" | xargs git add + find . -name "*.yml" | xargs git add + git commit -m "release_patch: build {{output.version}}" + - name: "git" + cmd: | + git push origin wip_{{version}} + - name: "gh cli" + cmd: | + gh pr create -f -t "PRETEND RELEASE WIP: release_patch: build {{version}}" # -l "wip_release" From c488dc03905eb6b79413263f478112f1f5e61692 Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Thu, 12 Oct 2023 14:39:24 +0200 Subject: [PATCH 03/16] fixup --- release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/release.yaml b/release.yaml index 34cb1cef..7378e579 100644 --- a/release.yaml +++ b/release.yaml @@ -23,6 +23,7 @@ create: cmd: | sg ops update-images \ --kind k8s \ + --registry internal \ --docker-username=$DOCKER_USERNAME \ --docker-password=$DOCKER_PASSWORD \ --pin-tag wip_{{inputs.server.tag}} \ From 75d8a022aa7229b3f021a259f246c809a0e0ae05 Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Thu, 12 Oct 2023 14:40:37 +0200 Subject: [PATCH 04/16] wfp --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index 7378e579..cab372c8 100644 --- a/release.yaml +++ b/release.yaml @@ -26,7 +26,7 @@ create: --registry internal \ --docker-username=$DOCKER_USERNAME \ --docker-password=$DOCKER_PASSWORD \ - --pin-tag wip_{{inputs.server.tag}} \ + --pin-tag wip_v{{inputs.server.tag}} \ base/ # - name: "sg ops (executors)" # cmd: | From 72090aa3a34fbbc9564ede902ee8d31c4744a4d4 Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Tue, 17 Oct 2023 15:04:27 +0200 Subject: [PATCH 05/16] Test the finalize step --- .buildkite/pipeline.yaml | 7 +++++++ release.yaml | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index cfeff0b9..1f3e14b8 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -22,3 +22,10 @@ steps: - label: ":k8s:" command: .buildkite/verify-overlays.sh agents: { queue: standard } + + - label: "Release: finalize" + if: "build.branch =~ /^wip_v/" + command: | + git checkout -b release-test-jh + git push origin + git checkout - diff --git a/release.yaml b/release.yaml index cab372c8..ea37ae94 100644 --- a/release.yaml +++ b/release.yaml @@ -52,3 +52,11 @@ create: - name: "gh cli" cmd: | gh pr create -f -t "PRETEND RELEASE WIP: release_patch: build {{version}}" # -l "wip_release" + +finalize: + steps: + - name: "git" + cmd: | + git checkout -b release-{{version}} + git push origin + git checkout - From 712413bab7b94d8a19de66b0da8a1317a83ec08e Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Tue, 17 Oct 2023 17:47:50 +0200 Subject: [PATCH 06/16] foobar desc desc --- release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.yaml b/release.yaml index ea37ae94..7e9ba528 100644 --- a/release.yaml +++ b/release.yaml @@ -45,7 +45,7 @@ create: cmd: | find . -name "*.yaml" | xargs git add find . -name "*.yml" | xargs git add - git commit -m "release_patch: build {{output.version}}" + git commit -m "release_patch: {{version}}" -m "{{config}}" - name: "git" cmd: | git push origin wip_{{version}} @@ -58,5 +58,5 @@ finalize: - name: "git" cmd: | git checkout -b release-{{version}} - git push origin + git push origin release-{{version}} git checkout - From a19b2606324de33e12dc039a54791ee6358e2b13 Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Tue, 17 Oct 2023 17:57:12 +0200 Subject: [PATCH 07/16] finalize with config from commit --- .buildkite/pipeline.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 1f3e14b8..809ec031 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -24,8 +24,10 @@ steps: agents: { queue: standard } - label: "Release: finalize" - if: "build.branch =~ /^wip_v/" + if: "build.branch =~ /^wip_/" command: | - git checkout -b release-test-jh - git push origin - git checkout - + wget https://storage.googleapis.com/buildkite_public_assets/sg-rfc795.tar.gz + tar zxf sg-rfc795.tar.gz + chmod +x ./sg-rfc795 + + ./sg-rfc795 release finalize --workdir=. --config-from-commit From 9cc50e5b6a7d129df2793a1603b22ab78ddccbff Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Wed, 18 Oct 2023 11:48:05 +0200 Subject: [PATCH 08/16] fi --- release.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/release.yaml b/release.yaml index 7e9ba528..c6837b4a 100644 --- a/release.yaml +++ b/release.yaml @@ -46,12 +46,12 @@ create: find . -name "*.yaml" | xargs git add find . -name "*.yml" | xargs git add git commit -m "release_patch: {{version}}" -m "{{config}}" - - name: "git" - cmd: | - git push origin wip_{{version}} - - name: "gh cli" - cmd: | - gh pr create -f -t "PRETEND RELEASE WIP: release_patch: build {{version}}" # -l "wip_release" + # - name: "git" + # cmd: | + # git push origin wip_{{version}} + # - name: "gh cli" + # cmd: | + # gh pr create -f -t "PRETEND RELEASE WIP: release_patch: build {{version}}" # -l "wip_release" finalize: steps: From e637fd89b0085f3a82e2a765ca4a14760ee1b0f5 Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Wed, 18 Oct 2023 11:53:04 +0200 Subject: [PATCH 09/16] fofo --- release.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/release.yaml b/release.yaml index c6837b4a..6a5893ef 100644 --- a/release.yaml +++ b/release.yaml @@ -45,13 +45,16 @@ create: cmd: | find . -name "*.yaml" | xargs git add find . -name "*.yml" | xargs git add - git commit -m "release_patch: {{version}}" -m "{{config}}" - # - name: "git" - # cmd: | - # git push origin wip_{{version}} - # - name: "gh cli" - # cmd: | - # gh pr create -f -t "PRETEND RELEASE WIP: release_patch: build {{version}}" # -l "wip_release" + # 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 -m "release_patch: {{version}}" -m '{{config}}' + - name: "git" + cmd: | + git push origin wip_{{version}} + - name: "gh cli" + cmd: | + gh pr create -f -t "PRETEND RELEASE WIP: release_patch: build {{version}}" # -l "wip_release" finalize: steps: From bbdaafe46baf4fc33296bd9c584f4613ac0bb3b4 Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Wed, 18 Oct 2023 12:01:52 +0200 Subject: [PATCH 10/16] Wait before doing any finalization --- .buildkite/pipeline.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 809ec031..dd8f2d48 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -23,6 +23,8 @@ steps: command: .buildkite/verify-overlays.sh agents: { queue: standard } + - wait + - label: "Release: finalize" if: "build.branch =~ /^wip_/" command: | From 635060d0d8ab1a131b7fe0e5c5f7539ffb716c3c Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Wed, 18 Oct 2023 12:49:40 +0200 Subject: [PATCH 11/16] Add test placeholder --- release.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/release.yaml b/release.yaml index 6a5893ef..2ff8fd35 100644 --- a/release.yaml +++ b/release.yaml @@ -4,6 +4,9 @@ meta: owners: - "@sourcegraph/release" +inputs: + - releaseId: server + requirements: - name: "Github CLI" cmd: gh version @@ -13,9 +16,6 @@ requirements: - name: "Docker password" env: DOCKER_PASSWORD -inputs: - - releaseId: server - create: steps: patch: @@ -63,3 +63,9 @@ finalize: git checkout -b release-{{version}} git push origin release-{{version}} git checkout - + +test: + steps: + - name: "placeholder" + cmd: | + echo "-- pretending to test release ..." From 56d05311911ce38d4579014e19f47aa4004e3cd9 Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Wed, 18 Oct 2023 13:27:17 +0200 Subject: [PATCH 12/16] add release test phase --- .buildkite/pipeline.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index dd8f2d48..2d936bb7 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -23,6 +23,15 @@ steps: command: .buildkite/verify-overlays.sh agents: { queue: standard } + - label: "Release: test" + if: "build.branch =~ /^wip_/" + command: | + wget https://storage.googleapis.com/buildkite_public_assets/sg-rfc795.tar.gz + tar zxf sg-rfc795.tar.gz + chmod +x ./sg-rfc795 + + ./sg-rfc795 release test --workdir=. --config-from-commit + - wait - label: "Release: finalize" From 67981700afc6eeb3cc54965e9c60fde75047593d Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Mon, 23 Oct 2023 17:13:43 +0200 Subject: [PATCH 13/16] upup --- .buildkite/pipeline.yaml | 2 +- release.yaml | 90 ++++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 2d936bb7..cb620c4a 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -41,4 +41,4 @@ steps: tar zxf sg-rfc795.tar.gz chmod +x ./sg-rfc795 - ./sg-rfc795 release finalize --workdir=. --config-from-commit + ./sg-rfc795 release run internal finalize --workdir=. --config-from-commit diff --git a/release.yaml b/release.yaml index 2ff8fd35..62e0a8eb 100644 --- a/release.yaml +++ b/release.yaml @@ -16,53 +16,53 @@ requirements: - name: "Docker password" env: DOCKER_PASSWORD -create: - steps: - patch: - - name: "sg ops (base)" - cmd: | - sg ops update-images \ - --kind k8s \ - --registry internal \ - --docker-username=$DOCKER_USERNAME \ - --docker-password=$DOCKER_PASSWORD \ - --pin-tag wip_v{{inputs.server.tag}} \ - base/ - # - name: "sg ops (executors)" - # cmd: | - # sg ops update-images \ - # --kind k8s \ - # --docker-username=$DOCKER_USERNAME \ - # --docker-password=$DOCKER_PASSWORD \ - # --pin-tag {{tag}} \ - # components/executors/ - - name: "git" - cmd: | - echo "Creating branch wip_{{version}}" - release_branch="wip_{{version}}" - git checkout -b $release_branch - - name: "git" - cmd: | - 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 -m "release_patch: {{version}}" -m '{{config}}' +internal: + create: + steps: + patch: + - name: "sg ops (base)" + cmd: | + sg ops update-images \ + --kind k8s \ + --registry internal \ + --docker-username=$DOCKER_USERNAME \ + --docker-password=$DOCKER_PASSWORD \ + --pin-tag wip_v{{inputs.server.tag}} \ + base/ + # - name: "sg ops (executors)" + # cmd: | + # sg ops update-images \ + # --kind k8s \ + # --docker-username=$DOCKER_USERNAME \ + # --docker-password=$DOCKER_PASSWORD \ + # --pin-tag {{tag}} \ + # components/executors/ + - name: "git" + cmd: | + echo "Creating branch wip_{{version}}" + release_branch="wip_{{version}}" + git checkout -b $release_branch + - name: "git" + cmd: | + 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 -m "release_patch: {{version}}" -m '{{config}}' + - name: "git" + cmd: | + git push origin wip_{{version}} + - name: "gh cli" + cmd: | + gh pr create -f -t "PRETEND RELEASE WIP: release_patch: build {{version}}" # -l "wip_release" + finalize: + steps: - name: "git" cmd: | - git push origin wip_{{version}} - - name: "gh cli" - cmd: | - gh pr create -f -t "PRETEND RELEASE WIP: release_patch: build {{version}}" # -l "wip_release" - -finalize: - steps: - - name: "git" - cmd: | - git checkout -b release-{{version}} - git push origin release-{{version}} - git checkout - + git checkout -b release-{{version}} + git push origin release-{{version}} + git checkout - test: steps: From 18414e550cb2a65c02e87f9b8fc44b2d8ded4be2 Mon Sep 17 00:00:00 2001 From: Jean-Hadrien Chabran <jh@chabran.fr> Date: Mon, 30 Oct 2023 15:10:13 +0100 Subject: [PATCH 14/16] Fix manifest --- .buildkite/pipeline.yaml | 2 +- release.yaml | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index cb620c4a..d5ee2257 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -30,7 +30,7 @@ steps: tar zxf sg-rfc795.tar.gz chmod +x ./sg-rfc795 - ./sg-rfc795 release test --workdir=. --config-from-commit + ./sg-rfc795 release run test --workdir=. --config-from-commit - wait diff --git a/release.yaml b/release.yaml index 62e0a8eb..80ddac0b 100644 --- a/release.yaml +++ b/release.yaml @@ -69,3 +69,39 @@ test: - name: "placeholder" cmd: | echo "-- pretending to test release ..." + +promoteToPublic: + create: + steps: + - name: "git" + cmd: | + echo "Checking out origin/release-{{version}}" + git fetch origin + git checkout origin/release-{{version}} + - name: "sg ops" + cmd: | + # TODO switch to public + sg ops update-images \ + --kind k8s \ + --registry internal \ + --docker-username=$DOCKER_USERNAME \ + --docker-password=$DOCKER_PASSWORD \ + --pin-tag wip_v{{inputs.server.tag}} \ + base/ + - name: "git" + cmd: | + echo "Creating branch promote-release_{{version}}" + branch="promote-release_{{version}}" + git checkout -b $branch + - name: "git" + cmd: | + 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 -m "promote_release: {{version}}" -m '{{config}}' + - name: "github" + cmd: | + git push origin promote-release_{{version}} + gh pr create -f -t "PRETEND PROMOTE RELEASE WIP: promote-release: build {{version}}" --base release-{{version}} From 1651ad4436e06afe3c29188b2f20a9fa53f687aa Mon Sep 17 00:00:00 2001 From: William Bezuidenhout <william.bezuidenhout@sourcegraph.com> Date: Thu, 11 Jan 2024 14:53:52 +0200 Subject: [PATCH 15/16] small changes before internal build test --- release.yaml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/release.yaml b/release.yaml index 80ddac0b..00fcd596 100644 --- a/release.yaml +++ b/release.yaml @@ -22,13 +22,13 @@ internal: patch: - name: "sg ops (base)" cmd: | - sg ops update-images \ + sg-rfc795 ops update-images \ --kind k8s \ - --registry internal \ + --registry us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal \ --docker-username=$DOCKER_USERNAME \ --docker-password=$DOCKER_PASSWORD \ --pin-tag wip_v{{inputs.server.tag}} \ - base/ + base/ # - name: "sg ops (executors)" # cmd: | # sg ops update-images \ @@ -44,10 +44,10 @@ internal: git checkout -b $release_branch - name: "git" cmd: | - 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 + 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 -m "release_patch: {{version}}" -m '{{config}}' - name: "git" @@ -60,12 +60,12 @@ internal: steps: - name: "git" cmd: | - git checkout -b release-{{version}} - git push origin release-{{version}} - git checkout - + git checkout -b wip-release-{{version}} + git push origin wip-release-{{version}} + git checkout - -test: - steps: +test: + steps: - name: "placeholder" cmd: | echo "-- pretending to test release ..." @@ -75,19 +75,19 @@ promoteToPublic: steps: - name: "git" cmd: | - echo "Checking out origin/release-{{version}}" + echo "Checking out origin/wip-release-{{version}}" git fetch origin - git checkout origin/release-{{version}} + git checkout origin/wip-release-{{version}} - name: "sg ops" cmd: | # TODO switch to public - sg ops update-images \ + sg-rfc795 ops update-images \ --kind k8s \ - --registry internal \ + --registry us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-public \ --docker-username=$DOCKER_USERNAME \ --docker-password=$DOCKER_PASSWORD \ --pin-tag wip_v{{inputs.server.tag}} \ - base/ + base/ - name: "git" cmd: | echo "Creating branch promote-release_{{version}}" @@ -95,10 +95,10 @@ promoteToPublic: git checkout -b $branch - name: "git" cmd: | - 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 + 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 -m "promote_release: {{version}}" -m '{{config}}' - name: "github" From e79311aad9c4883af6bf79a605488a600a3ca87d Mon Sep 17 00:00:00 2001 From: William Bezuidenhout <william.bezuidenhout@sourcegraph.com> Date: Thu, 11 Jan 2024 12:57:59 +0000 Subject: [PATCH 16/16] release_patch: v6.6.666 {"version":"v6.6.666","inputs":"server=v5.3.666","type":"patch"} --- base/monitoring/cadvisor/cadvisor.DaemonSet.yaml | 2 +- base/monitoring/grafana/grafana.StatefulSet.yaml | 2 +- base/monitoring/jaeger/jaeger.Deployment.yaml | 2 +- .../monitoring/node-exporter/node-exporter.DaemonSet.yaml | 2 +- base/monitoring/otel-collector/otel-agent.DaemonSet.yaml | 2 +- .../otel-collector/otel-collector.Deployment.yaml | 2 +- base/monitoring/prometheus/prometheus.Deployment.yaml | 2 +- base/monitoring/prometheus/prometheus.yml | 8 ++------ base/sourcegraph/blobstore/blobstore.Deployment.yaml | 2 +- .../codeinsights-db/codeinsights-db.StatefulSet.yaml | 6 +++--- .../codeintel-db/codeintel-db.StatefulSet.yaml | 6 +++--- base/sourcegraph/embeddings/embeddings.Deployment.yaml | 2 +- .../frontend/sourcegraph-frontend.Deployment.yaml | 4 ++-- base/sourcegraph/gitserver/gitserver.StatefulSet.yaml | 2 +- .../indexed-search/indexed-search.StatefulSet.yaml | 4 ++-- base/sourcegraph/pgsql/pgsql.StatefulSet.yaml | 6 +++--- .../sourcegraph/precise-code-intel/worker.Deployment.yaml | 2 +- base/sourcegraph/redis/redis-cache.Deployment.yaml | 4 ++-- base/sourcegraph/redis/redis-store.Deployment.yaml | 4 ++-- .../sourcegraph/repo-updater/repo-updater.Deployment.yaml | 2 +- base/sourcegraph/searcher/searcher.StatefulSet.yaml | 2 +- base/sourcegraph/symbols/symbols.StatefulSet.yaml | 2 +- .../syntect-server/syntect-server.Deployment.yaml | 2 +- base/sourcegraph/worker/worker.Deployment.yaml | 2 +- release.yaml | 2 +- 25 files changed, 36 insertions(+), 40 deletions(-) diff --git a/base/monitoring/cadvisor/cadvisor.DaemonSet.yaml b/base/monitoring/cadvisor/cadvisor.DaemonSet.yaml index e7a1f3bb..58b83ca5 100644 --- a/base/monitoring/cadvisor/cadvisor.DaemonSet.yaml +++ b/base/monitoring/cadvisor/cadvisor.DaemonSet.yaml @@ -26,7 +26,7 @@ spec: serviceAccountName: cadvisor containers: - name: cadvisor - image: index.docker.io/sourcegraph/cadvisor:216430_2023-05-02_5.0-3cc9006de32c@sha256:6ea7f53807e4a559ee825ba2a0c4c3b3f721275f0b5ce0e979f4fdad8a4e478a + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/cadvisor:5.3.666@sha256:775a22b491a9956b725c12d72841adbcd9852964f171a942118f9aa8839e47d7 args: # Kubernetes-specific flags below (other flags are baked into the Docker image) # diff --git a/base/monitoring/grafana/grafana.StatefulSet.yaml b/base/monitoring/grafana/grafana.StatefulSet.yaml index 8819389d..048af432 100644 --- a/base/monitoring/grafana/grafana.StatefulSet.yaml +++ b/base/monitoring/grafana/grafana.StatefulSet.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: grafana - image: index.docker.io/sourcegraph/grafana:216430_2023-05-02_5.0-3cc9006de32c@sha256:63baeadda6d33195ccd7d742670e500a80bacace3ed5cf0eb7d3a6c276ef7c34 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/grafana:5.3.666@sha256:eee1c443786ef2100ec5334f97f3625aeda11e3133dc4402ca877a49af9b68fe terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 3370 diff --git a/base/monitoring/jaeger/jaeger.Deployment.yaml b/base/monitoring/jaeger/jaeger.Deployment.yaml index 826f76bb..03db2d9f 100644 --- a/base/monitoring/jaeger/jaeger.Deployment.yaml +++ b/base/monitoring/jaeger/jaeger.Deployment.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: jaeger - image: index.docker.io/sourcegraph/jaeger-all-in-one:216430_2023-05-02_5.0-3cc9006de32c@sha256:ec73cff6ea398d96241a9451634fc83682292b0175cc63c09f1f866cf03beb8d + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/jaeger-all-in-one:5.3.666@sha256:3b7d972994ba6ae3b58575db3249478e2d9393e8b7f1d5c952523aaf0fdd10cf args: ["--memory.max-traces=20000"] ports: - containerPort: 5775 diff --git a/base/monitoring/node-exporter/node-exporter.DaemonSet.yaml b/base/monitoring/node-exporter/node-exporter.DaemonSet.yaml index b06fe1ec..a1ef788f 100644 --- a/base/monitoring/node-exporter/node-exporter.DaemonSet.yaml +++ b/base/monitoring/node-exporter/node-exporter.DaemonSet.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: node-exporter - image: index.docker.io/sourcegraph/node-exporter:216430_2023-05-02_5.0-3cc9006de32c@sha256:fa8e5700b7762fffe0674e944762f44bb787a7e44d97569fe55348260453bf80 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/node-exporter:5.3.666@sha256:a43c3f58201c07243e130108e1904402a086d975447794ad37b970495e46211c imagePullPolicy: IfNotPresent resources: limits: diff --git a/base/monitoring/otel-collector/otel-agent.DaemonSet.yaml b/base/monitoring/otel-collector/otel-agent.DaemonSet.yaml index 6d86e0c2..1eb2f585 100644 --- a/base/monitoring/otel-collector/otel-agent.DaemonSet.yaml +++ b/base/monitoring/otel-collector/otel-agent.DaemonSet.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: otel-agent - image: index.docker.io/sourcegraph/opentelemetry-collector:216430_2023-05-02_5.0-3cc9006de32c@sha256:7783e0a2676813f955f45debc10099ee97e104c42fe27cd315848ba58de86cd4 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:5.3.666@sha256:918f2299cbfb23588e761844c9a99328c8dffdfca943166f6d94e2a285d9c18d command: - "/bin/otelcol-sourcegraph" - "--config=/etc/otel-agent/config.yaml" diff --git a/base/monitoring/otel-collector/otel-collector.Deployment.yaml b/base/monitoring/otel-collector/otel-collector.Deployment.yaml index a4dfe4ba..7b2614a6 100644 --- a/base/monitoring/otel-collector/otel-collector.Deployment.yaml +++ b/base/monitoring/otel-collector/otel-collector.Deployment.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: otel-collector - image: index.docker.io/sourcegraph/opentelemetry-collector:216430_2023-05-02_5.0-3cc9006de32c@sha256:7783e0a2676813f955f45debc10099ee97e104c42fe27cd315848ba58de86cd4 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:5.3.666@sha256:918f2299cbfb23588e761844c9a99328c8dffdfca943166f6d94e2a285d9c18d command: - "/bin/otelcol-sourcegraph" # To use a custom configuration, edit otel-collector.ConfigMap.yaml diff --git a/base/monitoring/prometheus/prometheus.Deployment.yaml b/base/monitoring/prometheus/prometheus.Deployment.yaml index 2b0756af..f335f71b 100644 --- a/base/monitoring/prometheus/prometheus.Deployment.yaml +++ b/base/monitoring/prometheus/prometheus.Deployment.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: prometheus - image: index.docker.io/sourcegraph/prometheus:216430_2023-05-02_5.0-3cc9006de32c@sha256:da67ba5c797a7b7752cebd6507e903a2726c172c01cab7ce0e7deadff288bab8 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/prometheus:5.3.666@sha256:a2e2bb043f6e61376b7a5bc8443a8570e8a2af6f4f912acd3f08a3aad048f116 terminationMessagePolicy: FallbackToLogsOnError env: - name: SG_NAMESPACE diff --git a/base/monitoring/prometheus/prometheus.yml b/base/monitoring/prometheus/prometheus.yml index 32dde634..12631c08 100644 --- a/base/monitoring/prometheus/prometheus.yml +++ b/base/monitoring/prometheus/prometheus.yml @@ -8,7 +8,7 @@ alerting: # Alertmanager configuration - static_configs: - targets: ["127.0.0.1:9093"] path_prefix: /alertmanager - # add more alertmanagers here + # add more alertmanagers here rule_files: # Load rules once and periodically evaluate them according to the global 'evaluation_interval'. - "/sg_config_prometheus/*_rules.yml" - "/sg_prometheus_add_ons/*_rules.yml" @@ -43,11 +43,7 @@ scrape_configs: # Configure targets to scrape - source_labels: [container_label_io_kubernetes_pod_namespace] regex: kube-system action: drop - - source_labels: - [ - container_label_io_kubernetes_container_name, - container_label_io_kubernetes_pod_name, - ] + - source_labels: [container_label_io_kubernetes_container_name, container_label_io_kubernetes_pod_name] regex: (.+) action: replace target_label: name diff --git a/base/sourcegraph/blobstore/blobstore.Deployment.yaml b/base/sourcegraph/blobstore/blobstore.Deployment.yaml index 477b73c9..4b95cbcf 100644 --- a/base/sourcegraph/blobstore/blobstore.Deployment.yaml +++ b/base/sourcegraph/blobstore/blobstore.Deployment.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: blobstore - image: index.docker.io/sourcegraph/blobstore:216430_2023-05-02_5.0-3cc9006de32c@sha256:ae1cf541f65441809f3495c037af4f9df1d049defdf0309a65d685f579c7e594 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/blobstore:5.3.666@sha256:bd5e1e25cc4e9d6a45e8ef660821d521eb212dccda20e61f496a7baf8806c537 livenessProbe: httpGet: path: / diff --git a/base/sourcegraph/codeinsights-db/codeinsights-db.StatefulSet.yaml b/base/sourcegraph/codeinsights-db/codeinsights-db.StatefulSet.yaml index d8ef66db..59ef211a 100644 --- a/base/sourcegraph/codeinsights-db/codeinsights-db.StatefulSet.yaml +++ b/base/sourcegraph/codeinsights-db/codeinsights-db.StatefulSet.yaml @@ -26,7 +26,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: index.docker.io/sourcegraph/alpine-3.14:216430_2023-05-02_5.0-3cc9006de32c@sha256:923c803fb975e905424b347e19839ae0077c0dec6eea0cb71c62acd910e8e9c8 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/alpine-3.14:5.3.666@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 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/ @@ -45,7 +45,7 @@ spec: runAsUser: 70 containers: - name: codeinsights - image: index.docker.io/sourcegraph/codeinsights-db:216430_2023-05-02_5.0-3cc9006de32c@sha256:910e98d4ddb6e5fef28be69f6395e567bbfab3f29f9d340dcdf45e83ca84cdd3 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/codeinsights-db:5.3.666@sha256:c4a1bd3908658e1c09558a638e378e5570d5f669d27f9f867eeda25fe60cb88f env: - name: POSTGRES_DB value: postgres @@ -82,7 +82,7 @@ spec: value: postgres://postgres:@localhost:5432/?sslmode=disable - name: PG_EXPORTER_EXTEND_QUERY_PATH value: /config/code_insights_queries.yaml - image: index.docker.io/sourcegraph/postgres_exporter:216430_2023-05-02_5.0-3cc9006de32c@sha256:0d88b491e837616f563fd3097cd4113338728e857ffee6d57b4c48ba1350af9f + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.3.666@sha256:7bc727119bc5b0900a9c3d7c0a79e3b548de93bc55df9da864244b3971168294 terminationMessagePolicy: FallbackToLogsOnError name: pgsql-exporter ports: diff --git a/base/sourcegraph/codeintel-db/codeintel-db.StatefulSet.yaml b/base/sourcegraph/codeintel-db/codeintel-db.StatefulSet.yaml index b1663965..b384d23d 100644 --- a/base/sourcegraph/codeintel-db/codeintel-db.StatefulSet.yaml +++ b/base/sourcegraph/codeintel-db/codeintel-db.StatefulSet.yaml @@ -27,7 +27,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: index.docker.io/sourcegraph/alpine-3.14:216430_2023-05-02_5.0-3cc9006de32c@sha256:923c803fb975e905424b347e19839ae0077c0dec6eea0cb71c62acd910e8e9c8 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/alpine-3.14:5.3.666@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 command: ["sh", "-c", "if [ -d /data/pgdata-12 ]; then chmod 750 /data/pgdata-12; fi"] volumeMounts: - mountPath: /data @@ -45,7 +45,7 @@ spec: memory: "50Mi" containers: - name: pgsql - image: index.docker.io/sourcegraph/codeintel-db:216430_2023-05-02_5.0-3cc9006de32c@sha256:931a3b043d79f4cc7692a96810e18f0db231f36534a6748ea862903768ceeef0 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/codeintel-db:5.3.666@sha256:1e0e93661a65c832b9697048c797f9894dfb502e2e1da2b8209f0018a6632b79 terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: @@ -87,7 +87,7 @@ spec: value: postgres://sg:@localhost:5432/?sslmode=disable - name: PG_EXPORTER_EXTEND_QUERY_PATH value: /config/code_intel_queries.yaml - image: index.docker.io/sourcegraph/postgres_exporter:216430_2023-05-02_5.0-3cc9006de32c@sha256:0d88b491e837616f563fd3097cd4113338728e857ffee6d57b4c48ba1350af9f + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.3.666@sha256:7bc727119bc5b0900a9c3d7c0a79e3b548de93bc55df9da864244b3971168294 terminationMessagePolicy: FallbackToLogsOnError name: pgsql-exporter ports: diff --git a/base/sourcegraph/embeddings/embeddings.Deployment.yaml b/base/sourcegraph/embeddings/embeddings.Deployment.yaml index 839d149a..7ee69186 100644 --- a/base/sourcegraph/embeddings/embeddings.Deployment.yaml +++ b/base/sourcegraph/embeddings/embeddings.Deployment.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: embeddings - image: index.docker.io/sourcegraph/embeddings:216430_2023-05-02_5.0-3cc9006de32c@sha256:c8cd7c5abca562d6a79bb524c49b9d0e76a3cb119226baa29ca0508faf652f03 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/embeddings:5.3.666@sha256:9a36a5f99f5be8d394a3bdaf71a79f2883916226440d3ccb51c32d9edad7f2c8 env: - name: POD_NAME valueFrom: diff --git a/base/sourcegraph/frontend/sourcegraph-frontend.Deployment.yaml b/base/sourcegraph/frontend/sourcegraph-frontend.Deployment.yaml index 53de5080..6b7eec3a 100644 --- a/base/sourcegraph/frontend/sourcegraph-frontend.Deployment.yaml +++ b/base/sourcegraph/frontend/sourcegraph-frontend.Deployment.yaml @@ -29,7 +29,7 @@ spec: spec: initContainers: - name: migrator - image: index.docker.io/sourcegraph/migrator:216430_2023-05-02_5.0-3cc9006de32c@sha256:b8e48a03a546e955eec228843b76f44ca86211c914fc0685f81985a2c20e269b + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/migrator:5.3.666@sha256:288f4261a70ed921f7b1f82b73e12a410d12e332ba3371c24a8278d8ad07826c args: ["up"] resources: limits: @@ -48,7 +48,7 @@ spec: name: sourcegraph-frontend-env containers: - name: frontend - image: index.docker.io/sourcegraph/frontend:216430_2023-05-02_5.0-3cc9006de32c@sha256:871772686b707f1e2d18524dc5d23837922eee244c91190ad8a636d88d3563df + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:5.3.666@sha256:09f2df0a6a3ce917262a74d2d893a989c9c094ade0db3453c3947f743d07d2b6 args: - serve envFrom: diff --git a/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml b/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml index c67e50fa..01bef301 100644 --- a/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml +++ b/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml @@ -35,7 +35,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: index.docker.io/sourcegraph/gitserver:216430_2023-05-02_5.0-3cc9006de32c@sha256:c8f62c859b789be15ecc78c16e9fbf21cb818262b3880d87e48b05ff8bf2c684 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/gitserver:5.3.666@sha256:89dae4fb05a31f0aec943588e2742d7fc35dd979aa744f0359da04b6cf7307e3 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 5 diff --git a/base/sourcegraph/indexed-search/indexed-search.StatefulSet.yaml b/base/sourcegraph/indexed-search/indexed-search.StatefulSet.yaml index 47041bae..38fb72e7 100644 --- a/base/sourcegraph/indexed-search/indexed-search.StatefulSet.yaml +++ b/base/sourcegraph/indexed-search/indexed-search.StatefulSet.yaml @@ -33,7 +33,7 @@ spec: value: http://$(OTEL_AGENT_HOST):4317 - name: OPENTELEMETRY_DISABLED value: "false" - image: index.docker.io/sourcegraph/indexed-searcher:216430_2023-05-02_5.0-3cc9006de32c@sha256:818a6d607f8ff35631a98d56ef8feb2a4257b6398473128132d85901c60b8b9d + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/indexed-searcher:5.3.666@sha256:de3d07b4026c6b0691d1f7087de6cb596b4a4fa804b193076c3cf2e5ffb1d622 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 6070 @@ -72,7 +72,7 @@ spec: value: http://$(OTEL_AGENT_HOST):4317 - name: OPENTELEMETRY_DISABLED value: "false" - image: index.docker.io/sourcegraph/search-indexer:216430_2023-05-02_5.0-3cc9006de32c@sha256:42e4dbd82a7038c8cc46f2748e897bdf8d8d0dea9d365151dec7946fabfef687 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/search-indexer:5.3.666@sha256:41e7f284a62268b0c5305ea41484fba13b895b3be1d0ed66f779d35e12be7a79 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 6072 diff --git a/base/sourcegraph/pgsql/pgsql.StatefulSet.yaml b/base/sourcegraph/pgsql/pgsql.StatefulSet.yaml index 0b27d110..68ec3031 100644 --- a/base/sourcegraph/pgsql/pgsql.StatefulSet.yaml +++ b/base/sourcegraph/pgsql/pgsql.StatefulSet.yaml @@ -27,7 +27,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: index.docker.io/sourcegraph/alpine-3.14:216430_2023-05-02_5.0-3cc9006de32c@sha256:923c803fb975e905424b347e19839ae0077c0dec6eea0cb71c62acd910e8e9c8 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/alpine-3.14:5.3.666@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 command: ["sh", "-c", "if [ -d /data/pgdata-12 ]; then chmod 750 /data/pgdata-12; fi"] volumeMounts: - mountPath: /data @@ -46,7 +46,7 @@ spec: memory: "50Mi" containers: - name: pgsql - image: index.docker.io/sourcegraph/postgres-12-alpine:216430_2023-05-02_5.0-3cc9006de32c@sha256:931a3b043d79f4cc7692a96810e18f0db231f36534a6748ea862903768ceeef0 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres-12-alpine:5.3.666@sha256:1e0e93661a65c832b9697048c797f9894dfb502e2e1da2b8209f0018a6632b79 terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: @@ -90,7 +90,7 @@ spec: value: postgres://sg:@localhost:5432/?sslmode=disable - name: PG_EXPORTER_EXTEND_QUERY_PATH value: /config/queries.yaml - image: index.docker.io/sourcegraph/postgres_exporter:216430_2023-05-02_5.0-3cc9006de32c@sha256:0d88b491e837616f563fd3097cd4113338728e857ffee6d57b4c48ba1350af9f + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.3.666@sha256:7bc727119bc5b0900a9c3d7c0a79e3b548de93bc55df9da864244b3971168294 terminationMessagePolicy: FallbackToLogsOnError name: pgsql-exporter ports: diff --git a/base/sourcegraph/precise-code-intel/worker.Deployment.yaml b/base/sourcegraph/precise-code-intel/worker.Deployment.yaml index 8bf0a0ac..a688f948 100644 --- a/base/sourcegraph/precise-code-intel/worker.Deployment.yaml +++ b/base/sourcegraph/precise-code-intel/worker.Deployment.yaml @@ -46,7 +46,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: index.docker.io/sourcegraph/precise-code-intel-worker:216430_2023-05-02_5.0-3cc9006de32c@sha256:6194050008a585b34e841f51529475312c24b17cbe36851d2a4988a5d1defb69 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/precise-code-intel-worker:5.3.666@sha256:2a9bd4223dca8917e53496304b76e2f554f9e36abdeab5cfdd5397b6dc0e7548 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/sourcegraph/redis/redis-cache.Deployment.yaml b/base/sourcegraph/redis/redis-cache.Deployment.yaml index c3cd8fd5..98615778 100644 --- a/base/sourcegraph/redis/redis-cache.Deployment.yaml +++ b/base/sourcegraph/redis/redis-cache.Deployment.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: redis-cache - image: index.docker.io/sourcegraph/redis-cache:216430_2023-05-02_5.0-3cc9006de32c@sha256:60d9265507efe5b9ae51087bc7433932dfcd84d7e75c2513800baeb93fa9ea0f + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-cache:5.3.666@sha256:7b5f4501ec28696b9c842def4217f03e21e687c824c277623425f9acddf1def8 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 30 @@ -54,7 +54,7 @@ spec: - mountPath: /redis-data name: redis-data - name: redis-exporter - image: index.docker.io/sourcegraph/redis_exporter:216430_2023-05-02_5.0-3cc9006de32c@sha256:edb0c9b19cacd90acc78f13f0908a7e6efd1df704e401805c24bffd241285f70 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis_exporter:5.3.666@sha256:e5c30856d511423b655c7e3c524f6118336845a0f9a339fc92738f5282a67c35 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9121 diff --git a/base/sourcegraph/redis/redis-store.Deployment.yaml b/base/sourcegraph/redis/redis-store.Deployment.yaml index d335b6fa..cc744ace 100644 --- a/base/sourcegraph/redis/redis-store.Deployment.yaml +++ b/base/sourcegraph/redis/redis-store.Deployment.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: redis-store - image: index.docker.io/sourcegraph/redis-store:216430_2023-05-02_5.0-3cc9006de32c@sha256:fd1640997cad4ce114b98a7885636e6f48483712cea754411cf4d47e770d9219 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-store:5.3.666@sha256:be2c0f4caff00d545a4cec70baee710040f2adb71df255665661142147820065 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 30 @@ -53,7 +53,7 @@ spec: - mountPath: /redis-data name: redis-data - name: redis-exporter - image: index.docker.io/sourcegraph/redis_exporter:216430_2023-05-02_5.0-3cc9006de32c@sha256:edb0c9b19cacd90acc78f13f0908a7e6efd1df704e401805c24bffd241285f70 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis_exporter:5.3.666@sha256:e5c30856d511423b655c7e3c524f6118336845a0f9a339fc92738f5282a67c35 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9121 diff --git a/base/sourcegraph/repo-updater/repo-updater.Deployment.yaml b/base/sourcegraph/repo-updater/repo-updater.Deployment.yaml index da942398..1992bfb1 100644 --- a/base/sourcegraph/repo-updater/repo-updater.Deployment.yaml +++ b/base/sourcegraph/repo-updater/repo-updater.Deployment.yaml @@ -29,7 +29,7 @@ spec: spec: containers: - name: repo-updater - image: index.docker.io/sourcegraph/repo-updater:216430_2023-05-02_5.0-3cc9006de32c@sha256:c91ae5f636b8a7a1b06d6c899da6a2b40f0be91aaf704116dac1c3a491db6517 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/repo-updater:5.3.666@sha256:2741a700fd2e1afdfb948d200433fec3d521155aa01f65dd1d7efa2bf93e1a70 env: # Required when service discovery is disabled - name: GITHUB_BASE_URL diff --git a/base/sourcegraph/searcher/searcher.StatefulSet.yaml b/base/sourcegraph/searcher/searcher.StatefulSet.yaml index c52c8792..decb08e7 100644 --- a/base/sourcegraph/searcher/searcher.StatefulSet.yaml +++ b/base/sourcegraph/searcher/searcher.StatefulSet.yaml @@ -46,7 +46,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: index.docker.io/sourcegraph/searcher:216430_2023-05-02_5.0-3cc9006de32c@sha256:4a40c10251454e5fda00f4b367f4f378e19b532bc93ba8a7dbfdefed27e10f05 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/searcher:5.3.666@sha256:5fc904befa819bcb19eaf6ad5b446a0712f0e685d62ba364c06881d688f20753 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 3181 diff --git a/base/sourcegraph/symbols/symbols.StatefulSet.yaml b/base/sourcegraph/symbols/symbols.StatefulSet.yaml index 55d6b6f1..d9a71424 100644 --- a/base/sourcegraph/symbols/symbols.StatefulSet.yaml +++ b/base/sourcegraph/symbols/symbols.StatefulSet.yaml @@ -43,7 +43,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: index.docker.io/sourcegraph/symbols:216430_2023-05-02_5.0-3cc9006de32c@sha256:bcf074d381291574d9e34df9c31665981bd4dc3ca737412bbeedf8fedcc6372b + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/symbols:5.3.666@sha256:bb91b15c9cedff3bf6a85b857a0c876d13526446b2ecf317d907f0731bfec3fb livenessProbe: httpGet: path: /healthz diff --git a/base/sourcegraph/syntect-server/syntect-server.Deployment.yaml b/base/sourcegraph/syntect-server/syntect-server.Deployment.yaml index 65ec8105..3badd906 100644 --- a/base/sourcegraph/syntect-server/syntect-server.Deployment.yaml +++ b/base/sourcegraph/syntect-server/syntect-server.Deployment.yaml @@ -32,7 +32,7 @@ spec: allowPrivilegeEscalation: false runAsGroup: 101 runAsUser: 100 - image: index.docker.io/sourcegraph/syntax-highlighter:216430_2023-05-02_5.0-3cc9006de32c@sha256:d39a9234cf5f9128d5bf7430448efd4284c505fab6a310c1ec08a62a9d396fea + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/syntax-highlighter:5.3.666@sha256:860a653cdaca532d6d3dfce006753d655d3d5aa681eded10ed6e10ff1b56ee14 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/sourcegraph/worker/worker.Deployment.yaml b/base/sourcegraph/worker/worker.Deployment.yaml index df8bf876..093937d9 100644 --- a/base/sourcegraph/worker/worker.Deployment.yaml +++ b/base/sourcegraph/worker/worker.Deployment.yaml @@ -52,7 +52,7 @@ spec: - configMapRef: name: embeddings-backend optional: true - image: index.docker.io/sourcegraph/worker:216430_2023-05-02_5.0-3cc9006de32c@sha256:d3d9e1d684a1a4a337810dc0a9caa95bd9caa17120527be227ca3b5cae622b59 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/worker:5.3.666@sha256:328a1196b908fab7f8f5d4e923fd3caf97e32a27c8d3675cccc34103deb4f9f8 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/release.yaml b/release.yaml index 00fcd596..84c5f7e3 100644 --- a/release.yaml +++ b/release.yaml @@ -27,7 +27,7 @@ internal: --registry us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal \ --docker-username=$DOCKER_USERNAME \ --docker-password=$DOCKER_PASSWORD \ - --pin-tag wip_v{{inputs.server.tag}} \ + --pin-tag {{inputs.server.tag}} \ base/ # - name: "sg ops (executors)" # cmd: |