From 1a5ff2d4189681879f57848a45d123ccf4dbff0c Mon Sep 17 00:00:00 2001
From: levan-m <116471169+levan-m@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:26:02 -0400
Subject: [PATCH] Bump Go to 1.22.7; CVE-2024-34156, VULN-8399 (#1402)

---
 .gitlab-ci.yml            | 2 +-
 Dockerfile                | 2 +-
 check-operator.Dockerfile | 2 +-
 go.mod                    | 2 +-
 go.work                   | 2 +-
 test/e2e/go.mod           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0209a42a67..0b2f1f9bf6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.ddbuild.io/images/mirror/golang:1.22.4
+image: registry.ddbuild.io/images/mirror/golang:1.22.7
 variables:
   PROJECTNAME: "datadog-operator"
   PROJECTNAME_CHECK: "datadog-operator-check"
diff --git a/Dockerfile b/Dockerfile
index 0382dd11ff..829ac8c390 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.22.4 AS builder
+FROM golang:1.22.7 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
diff --git a/check-operator.Dockerfile b/check-operator.Dockerfile
index 2f3bd2d255..ab377851f0 100644
--- a/check-operator.Dockerfile
+++ b/check-operator.Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.22.4 AS builder
+FROM golang:1.22.7 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
diff --git a/go.mod b/go.mod
index 973cdeb5f2..5a80f248dd 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/DataDog/datadog-operator
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.7
 
 require (
 	github.com/DataDog/datadog-api-client-go/v2 v2.27.0
diff --git a/go.work b/go.work
index d8ecd31866..29382a2568 100644
--- a/go.work
+++ b/go.work
@@ -1,4 +1,4 @@
-go 1.22.4
+go 1.22.7
 
 use (
 	.
diff --git a/test/e2e/go.mod b/test/e2e/go.mod
index 9e85cd3247..dcb4158a31 100644
--- a/test/e2e/go.mod
+++ b/test/e2e/go.mod
@@ -2,7 +2,7 @@ module github.com/DataDog/datadog-operator/e2e
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.7
 
 require (
 	github.com/DataDog/datadog-agent/test/new-e2e v0.55.2