update tools go.mod and fix package import (sourcegraph#4288)

* update tools go.mod and fix package import

* bump go in .tool-versions

* bump nodejs and kubectl

* update test specific .tool-versions

* use pnpm instead of yarn in integration test

* update pnpm in main .tool-versions

* move prettier to root and install from there

* prettier updates

* update update-tags go version

.buildkite/prettier-check.sh

@@ -3,8 +3,5 @@
 cd $(dirname "${BASH_SOURCE[0]}")/..
 set -euxo pipefail
 
-cd tests/integration/fresh/step1
-
-yarn
-
-yarn run prettier-check
+pnpm install
+pnpm prettier

.github/ISSUE_TEMPLATE/stop--do-not-file-issues-here.md

@@ -4,7 +4,6 @@ about: File issues in github.com/sourcegraph/sourcegraph/issues
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
 Issues filed in this repository will generally be ignored. This issue tracker exists only so bots can open issues when necessary.

.github/workflows/update-tags.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
       - uses: actions/setup-go@331ce1d993939866bb63c32c6cbbfd48fa76fc57 # renovate: tag=v2
         with:
-          go-version: '^1.19'
+          go-version: '^1.21'
 
       # generate update
       - name: Pin tags to ${{ github.event.inputs.semver }}

.tool-versions

@@ -1,8 +1,8 @@
-golang 1.19.8
-yarn 1.22.4
-kubectl 1.21.7
+golang 1.21.5
+pnpm 8.9.2
+kubectl 1.25.9
 fd 7.4.0
 kustomize 4.5.7
 shfmt 3.1.0
-nodejs 12.10.0
+nodejs 20.8.1
 python system

.vscode/extensions.json

@@ -6,6 +6,6 @@
     "esbenp.prettier-vscode",
     "dbaeumer.vscode-eslint",
     "foxundermoon.shell-format",
-    "timonwong.shellcheck"
-  ]
+    "timonwong.shellcheck",
+  ],
 }

.vscode/settings.json

@@ -1,10 +1,10 @@
 {
   "[yaml]": {
-    "editor.formatOnSave": false
+    "editor.formatOnSave": false,
   },
   "[shellscript]": {
     "editor.defaultFormatter": "foxundermoon.shell-format",
-    "editor.formatOnSave": true
+    "editor.formatOnSave": true,
   },
-  "shellformat.flag": "-i 2 -ci"
+  "shellformat.flag": "-i 2 -ci",
 }

base/prometheus/README.md

@@ -1,7 +1,7 @@
 # Prometheus
 
 [Prometheus](https://prometheus.io/) is an open-source application monitoring system and time series database.
- It is commonly used to track key performance metrics over time, such as the following:
+It is commonly used to track key performance metrics over time, such as the following:
 
 - QPS
 - Application requests by URL route name
@@ -103,7 +103,7 @@ Some customers may want to make the Prometheus API endpoint accessible to other
 following:
 
 - An analytics visualization tool like Grafana
-(note: an instance of Grafana is part of the default Sourcegraph cluster installation)
+  (note: an instance of Grafana is part of the default Sourcegraph cluster installation)
 - An metrics ingestion pipeline
 
 To expose the Prometheus API to such a service, follow the steps to expose Prometheus via Kubernetes

configure/executors/README.md

@@ -11,18 +11,20 @@ It is expected that all components contained in this directory and any subdirect
 There are two distribution methods supported:
 
 ### Native Kubernetes Executors (Recommended)
+
 Requirements: RBAC, persistent volumes
 
 This distribution method makes use of native Kubernetes Deployments, Services, and Jobs to execute workloads. It is suitable for clusters that meet Sourcegraph's minimum requirements.
 
 The following components will deployed:
+
 - [Executor Deployment](./executor/k8s/executor.Deployment.yaml) An Executor replica with a Docker sidecar to run isolated batch changes and auto-indexing jobs. This deployment requires a [privileged security context](https://kubernetes.io/docs/concepts/security/pod-security-standards/).
 - [Executor Service](./executor/k8s/executor.Service.yaml) A headless service for executor metrics access. Executors are not externally accessible.
 - [Executor ConfigMap](./executor/k8s/executor.ConfigMap.yaml) configuration for the Executor deployment
 - RBAC
-  - [Role](./executor/k8s/rbac/executor.Role.yaml) 
-  - [RoleBinding](./executor/k8s/rbac/executor.RoleBinding.yaml) 
-  - [ServiceAccount](./executor/k8s/rbac/executor.ServiceAccount.yaml) 
+  - [Role](./executor/k8s/rbac/executor.Role.yaml)
+  - [RoleBinding](./executor/k8s/rbac/executor.RoleBinding.yaml)
+  - [ServiceAccount](./executor/k8s/rbac/executor.ServiceAccount.yaml)
 - [Private docker registory]
   - [Registry Deployment](./private-docker-registry/private-docker-registry.Deployment.yaml) A private docker registry configured as a pull-through cache to avoid docker hub rate limiting.
   - [Registry Service](./private-docker-registry/private-docker-registry.Service.yaml) A service to access the private-docker-registry.
@@ -36,11 +38,13 @@ kubectl apply -f . --recursive k8s
 ```
 
 ### Docker-in-Docker Kubernetes Executors
+
 Requirements: elevated permissions, persistent volumes
 
 This distribution method makes use of a docker-in-docker sidecar container to execute the workloads. It is suitable for clusters that meet Sourcegraph's minimum requirements that cannot utilize native Kubenretes executors.
 
 The following components will deployed:
+
 - [Executor Deployment](./executor/dind/executor.Deployment.yaml) An Executor replica with a Docker sidecar to run isolated batch changes and auto-indexing jobs. This deployment requires a [privileged security context](https://kubernetes.io/docs/concepts/security/pod-security-standards/).
 - [Executor Service](./executor/dind/executor.Service.yaml) A headless service for executor metrics access. Executors are not externally accessible.
 - [Docker ConfigMap](./executor/dind/docker-daemon.ConfigMap.yaml) configuration for the docker sidecar to use the pull-through cache.
@@ -55,4 +59,3 @@ To apply these manifests, run the following command:
 kubectl apply -f . --recursive private-docker-registry
 kubectl apply -f . --recursive dind
 ```
-

go.mod

@@ -1,20 +1,17 @@
-module github.com/sourcegraph/deploy-sourcegraph
+module sourcegraph/deploy-sourcegraph
 
-go 1.16
+go 1.21.5
 
 require (
-	cloud.google.com/go/logging v1.4.2 // indirect
-	github.com/docker/docker v1.13.1 // indirect
-	github.com/fatih/color v1.10.0 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/pulumi/pulumi v1.12.0
-	github.com/sethgrid/pester v1.1.0
-	github.com/sourcegraph/sourcegraph/enterprise/dev/ci/images v0.0.0-20221215223216-8c996a77af64
+	github.com/sourcegraph/sourcegraph/dev/ci/images v0.0.0-20231229114136-300ec6158254
 	github.com/sourcegraph/update-docker-tags v0.10.0
-	github.com/spf13/cobra v1.1.3 // indirect
-	github.com/stretchr/testify v1.7.0
-	golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	github.com/stretchr/testify v1.8.4
 )
 
-replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible
+require (
+	github.com/Masterminds/semver/v3 v3.1.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)