From 30b8ae9b4f6c7904b702e767d8ac630823b82ba7 Mon Sep 17 00:00:00 2001
From: apmmachine <58790750+apmmachine@users.noreply.github.com>
Date: Thu, 4 May 2023 15:30:36 -0400
Subject: [PATCH] [Automation] Bump Golang version to 1.20.4 (#290)

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
---
 Jenkinsfile                 | 2 +-
 go/Makefile.common          | 2 +-
 go/base-arm/Dockerfile.tmpl | 4 ++--
 go/base/install-go.sh       | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5e7c6fda..e120a6d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,7 +29,7 @@ pipeline {
     DOCKER_REGISTRY_SECRET = 'secret/observability-team/ci/docker-registry/prod'
     DOCKER_REGISTRY = 'docker.elastic.co'
     STAGING_IMAGE = "${env.DOCKER_REGISTRY}/observability-ci"
-    GO_VERSION = '1.20.3'
+    GO_VERSION = '1.20.4'
     BUILDX = "1"
   }
   options {
diff --git a/go/Makefile.common b/go/Makefile.common
index 5c348017..54cffef6 100644
--- a/go/Makefile.common
+++ b/go/Makefile.common
@@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 include $(SELF_DIR)/../Makefile.common
 
 NAME           := golang-crossbuild
-VERSION        := 1.20.3
+VERSION        := 1.20.4
 DEBIAN_VERSION ?= 9
 SUFFIX         := -$(shell basename $(CURDIR))
 TAG_EXTENSION  ?=
diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl
index abafbcd1..63aee98c 100644
--- a/go/base-arm/Dockerfile.tmpl
+++ b/go/base-arm/Dockerfile.tmpl
@@ -37,9 +37,9 @@ RUN \
             libsqlite3-0 \
         && rm -rf /var/lib/apt/lists/*
 
-ARG GOLANG_VERSION=1.20.3
+ARG GOLANG_VERSION=1.20.4
 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz
-ARG GOLANG_DOWNLOAD_SHA256=eb186529f13f901e7a2c4438a05c2cd90d74706aaa0a888469b2a4a617b6ee54
+ARG GOLANG_DOWNLOAD_SHA256=105889992ee4b1d40c7c108555222ca70ae43fccb42e20fbf1eebb822f5e72c6
 
 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
 	&& echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
diff --git a/go/base/install-go.sh b/go/base/install-go.sh
index 2dc8cf95..43bdc531 100644
--- a/go/base/install-go.sh
+++ b/go/base/install-go.sh
@@ -2,10 +2,10 @@
 # This script install the Go version correct for each architecture.
 set -e
 
-GOLANG_VERSION=1.20.3
+GOLANG_VERSION=1.20.4
 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-GOLANG_DOWNLOAD_SHA256_AMD=979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca
-GOLANG_DOWNLOAD_SHA256_ARM=eb186529f13f901e7a2c4438a05c2cd90d74706aaa0a888469b2a4a617b6ee54
+GOLANG_DOWNLOAD_SHA256_AMD=698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd
+GOLANG_DOWNLOAD_SHA256_ARM=105889992ee4b1d40c7c108555222ca70ae43fccb42e20fbf1eebb822f5e72c6
 
 GO_TAR_FILE=/tmp/golang.tar.gz