From daa5d8c7257a530f83e9c34186976926ad6f9698 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 26 Sep 2022 17:09:19 +0000
Subject: [PATCH] Update to Go v1.18.6 and v1.19.1

---
 .gitlab/ci/gitaly.images.yml    |  2 +-
 .gitlab/ci/gitlab.images.yml    |  2 +-
 .gitlab/ci/kas.images.yml       |  2 +-
 scripts/lib/custom-docker-build | 18 +++++++++---------
 scripts/lib/custom-docker.sh    |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitlab/ci/gitaly.images.yml b/.gitlab/ci/gitaly.images.yml
index 5414f47..a360a99 100644
--- a/.gitlab/ci/gitaly.images.yml
+++ b/.gitlab/ci/gitaly.images.yml
@@ -8,7 +8,7 @@ gitaly:
     matrix:
       - OS: ['debian:bullseye']
         RUBY: ['2.7', '3.0']
-        GOLANG: ['1.17', '1.18']
+        GOLANG: ['1.18', '1.19']
         GIT: ['2.36']
       - OS: ['ubi:8.6']
         RUBY: ['2.7']
diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml
index 85c3ad7..0fa8507 100644
--- a/.gitlab/ci/gitlab.images.yml
+++ b/.gitlab/ci/gitlab.images.yml
@@ -14,7 +14,7 @@ gitlab:
         RUBY: ['2.7.patched', '3.0.patched']
         GIT: ['2.36']
         POSTGRESQL: ['11', '12', '13']
-        GOLANG: ['1.17', '1.18']
+        GOLANG: ['1.18', '1.19']
         NODE: ['16.14']
         CHROME: ['101', '103']
 
diff --git a/.gitlab/ci/kas.images.yml b/.gitlab/ci/kas.images.yml
index 51543b0..d97451a 100644
--- a/.gitlab/ci/kas.images.yml
+++ b/.gitlab/ci/kas.images.yml
@@ -3,7 +3,7 @@ gitlab-kas:
   extends:
     - .build_and_push
   variables:
-    GOLANG: '1.16'
+    GOLANG: '1.19'
     LFS: '2.9'
     CHROME: '101'
     NODE: '14.15'
diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build
index f42ee4a..6465450 100755
--- a/scripts/lib/custom-docker-build
+++ b/scripts/lib/custom-docker-build
@@ -17,20 +17,20 @@ function print_golang_args() {
     declare -A GOLANG_DOWNLOAD_SHA256
 
     case "$1" in
-        1.16)
+        1.16) # Only used for gitlab-operator
             INSTALL_GOLANG_VERSION=1.16.12
             GOLANG_DOWNLOAD_SHA256[amd64]=7d657e86493ac1d5892f340a7d88b862b12edb5ac6e73c099e8e0668a6c916b7
             GOLANG_DOWNLOAD_SHA256[arm64]=7dbf50ab2e665ecd6c86a3f1ce8c04f7167f9895b91921e25cf1bdc1cb9b5fd7
             ;;
-        1.17)
-            INSTALL_GOLANG_VERSION=1.17.13
-            GOLANG_DOWNLOAD_SHA256[amd64]=4cdd2bc664724dc7db94ad51b503512c5ae7220951cac568120f64f8e94399fc
-            GOLANG_DOWNLOAD_SHA256[arm64]=914daad3f011cc2014dea799bb7490442677e4ad6de0b2ac3ded6cee7e3f493d
-            ;;
         1.18)
-            INSTALL_GOLANG_VERSION=1.18.5
-            GOLANG_DOWNLOAD_SHA256[amd64]=9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2
-            GOLANG_DOWNLOAD_SHA256[arm64]=006f6622718212363fa1ff004a6ab4d87bbbe772ec5631bab7cac10be346e4f1
+            INSTALL_GOLANG_VERSION=1.18.6
+            GOLANG_DOWNLOAD_SHA256[amd64]=bb05f179a773fed60c6a454a24141aaa7e71edfd0f2d465ad610a3b8f1dc7fe8
+            GOLANG_DOWNLOAD_SHA256[arm64]=838ffa94158125f16e4aa667ee4f6b499ea57e3e35a7e2517ad357ea06714691
+            ;;
+        1.19)
+            INSTALL_GOLANG_VERSION=1.19.1
+            GOLANG_DOWNLOAD_SHA256[amd64]=acc512fbab4f716a8f97a8b3fbaa9ddd39606a28be6c2515ef7c6c6311acffde
+            GOLANG_DOWNLOAD_SHA256[arm64]=49960821948b9c6b14041430890eccee58c76b52e2dbaafce971c3c38d43df9f
             ;;
         *) echo "Unknown golang version $1"; exit 1;
     esac
diff --git a/scripts/lib/custom-docker.sh b/scripts/lib/custom-docker.sh
index b64a877..27b437b 100644
--- a/scripts/lib/custom-docker.sh
+++ b/scripts/lib/custom-docker.sh
@@ -9,11 +9,11 @@ TAG_TOOLS=(BUNDLER RUBYGEMS GIT LFS CHROME YARN GRAPHICSMAGICK BAZELISK DOCKER B
 # For example, consider a CI job which specifies the following variables:
 # OS: debian:bullseye
 # RUBY: 2.7
-# GOLANG: 1.16
+# GOLANG: 1.19
 # GIT: 2.33
 # POSTGRESQL: 11
 # With the above variables, this function will return
-# `debian-bullseye-ruby-2.7-golang-1.16-postgresql-11`
+# `debian-bullseye-ruby-2.7-golang-1.19-postgresql-11`
 function get_image_path() {
     local path
     path=""
@@ -43,7 +43,7 @@ function get_image_path() {
 # For example, consider a CI job which specifies the following variables:
 # OS: debian:bullseye
 # RUBY: 2.7
-# GOLANG: 1.16
+# GOLANG: 1.19
 # GIT: 2.33
 # POSTGRESQL: 11
 # For that job, this function will return