Merge branch 'openshift:master' into modern-tlsprofile-support

openshift · Oct 23, 2024 · e120bdc · e120bdc
2 parents eea8646 + 33d201f
commit e120bdc
Show file tree

Hide file tree

Showing 9,200 changed files with 496,342 additions and 1,380,376 deletions.
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.22-openshift-4.17
+  tag: rhel-9-release-golang-1.22-openshift-4.18
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.5
+1.22.6
diff --git a/CHANGELOG/CHANGELOG-1.30.md b/CHANGELOG/CHANGELOG-1.30.md
diff --git a/CHANGELOG/CHANGELOG-1.31.md b/CHANGELOG/CHANGELOG-1.31.md
diff --git a/CHANGELOG/README.md b/CHANGELOG/README.md
@@ -1,5 +1,6 @@
 # CHANGELOGs
 
+- [CHANGELOG-1.31.md](./CHANGELOG-1.31.md)
 - [CHANGELOG-1.30.md](./CHANGELOG-1.30.md)
 - [CHANGELOG-1.29.md](./CHANGELOG-1.29.md)
 - [CHANGELOG-1.28.md](./CHANGELOG-1.28.md)

diff --git a/LICENSES/vendor/cloud.google.com/go/compute/LICENSE b/LICENSES/vendor/cloud.google.com/go/compute/LICENSE