golang: Build 1.18beta1 images and drop temp buster variants

Signed-off-by: Stephen Augustus <foo@auggie.dev>
ashnehete · Dec 17, 2021 · 36d84d6 · 36d84d6
1 parent a0465ee
commit 36d84d6
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml
@@ -1,4 +1,14 @@
 variants:
+  v1.24-go1.18-bullseye:
+    CONFIG: 'go1.18-bullseye'
+    TYPE: 'default'
+    IMAGE_VERSION: 'v1.24.0-go1.18beta1-bullseye.0'
+    KUBERNETES_VERSION: 'v1.24.0'
+    GO_VERSION: '1.18beta1'
+    GO_MAJOR_VERSION: '1.18'
+    OS_CODENAME: 'bullseye'
+    REVISION: '0'
+    PROTOBUF_VERSION: '3.7.0'
   v1.24-go1.17-bullseye:
     CONFIG: 'go1.17-bullseye'
     TYPE: 'default'
@@ -19,16 +29,6 @@ variants:
     OS_CODENAME: 'bullseye'
     REVISION: '0'
     PROTOBUF_VERSION: '3.7.0'
-  v1.23-go1.17-buster:
-    CONFIG: 'go1.17-buster'
-    TYPE: 'default'
-    IMAGE_VERSION: 'v1.23.0-go1.17.5-buster.0'
-    KUBERNETES_VERSION: 'v1.23.0'
-    GO_VERSION: '1.17.5'
-    GO_MAJOR_VERSION: '1.17'
-    OS_CODENAME: 'buster'
-    REVISION: '0'
-    PROTOBUF_VERSION: '3.7.0'
   v1.22-go1.16-buster:
     CONFIG: 'go1.16-buster'
     TYPE: 'default'

diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml
@@ -1,4 +1,12 @@
 variants:
+  go1.18-bullseye:
+    CONFIG: 'go1.18-bullseye'
+    IMAGE_VERSION: 'v2.3.1-go1.18beta1-bullseye.0'
+    GO_MAJOR_VERSION: '1.18'
+    OS_CODENAME: 'bullseye'
+    REVISION: '0'
+    GO_VERSION: '1.18beta1'
+    DISTROLESS_IMAGE: 'static-debian11'
   go1.17-bullseye:
     CONFIG: 'go1.17-bullseye'
     IMAGE_VERSION: 'v2.3.1-go1.17.5-bullseye.0'
@@ -7,14 +15,6 @@ variants:
     REVISION: '0'
     GO_VERSION: '1.17.5'
     DISTROLESS_IMAGE: 'static-debian11'
-  go1.17-buster:
-    CONFIG: 'go1.17-buster'
-    IMAGE_VERSION: 'v2.3.1-go1.17.5-buster.0'
-    GO_MAJOR_VERSION: '1.17'
-    OS_CODENAME: 'buster'
-    REVISION: '0'
-    GO_VERSION: '1.17.5'
-    DISTROLESS_IMAGE: 'static-debian10'
   go1.16-buster:
     CONFIG: 'go1.16-buster'
     IMAGE_VERSION: 'v2.3.1-go1.16.12-buster.0'

diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml
@@ -1,14 +1,14 @@
 variants:
+  go1.18-bullseye:
+    CONFIG: 'go1.18-bullseye'
+    GO_VERSION: '1.18beta1'
+    OS_CODENAME: 'bullseye'
+    REVISION: '0'
   go1.17-bullseye:
     CONFIG: 'go1.17-bullseye'
     GO_VERSION: '1.17.5'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-  go1.17-buster:
-    CONFIG: 'go1.17-buster'
-    GO_VERSION: '1.17.5'
-    OS_CODENAME: 'buster'
-    REVISION: '0'
   go1.16-buster:
     CONFIG: 'go1.16-buster'
     GO_VERSION: '1.16.12'

diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml
@@ -1,20 +1,20 @@
 variants:
   default:
     CONFIG: default
-    GO_VERSION: '1.16.12'
-    OS_CODENAME: 'buster'
+    GO_VERSION: '1.17.5'
+    OS_CODENAME: 'bullseye'
   next:
     CONFIG: next
-    GO_VERSION: '1.17.5'
+    GO_VERSION: '1.18beta1'
     OS_CODENAME: 'bullseye'
   '1.24':
     CONFIG: '1.24'
-    GO_VERSION: '1.17.5'
+    GO_VERSION: '1.18beta1'
     OS_CODENAME: 'bullseye'
   '1.23':
     CONFIG: '1.23'
     GO_VERSION: '1.17.5'
-    OS_CODENAME: 'buster'
+    OS_CODENAME: 'bullseye'
   '1.22':
     CONFIG: '1.22'
     GO_VERSION: '1.16.12'