From 2f00a6b1260193e469daa63c87af0d9e7e54704b Mon Sep 17 00:00:00 2001
From: Ryan Richard <richardry@vmware.com>
Date: Tue, 13 May 2025 12:30:37 -0700
Subject: [PATCH] remove 1.25 and add 1.33 codegen to pipelines

---
 pipelines/dockerfile-builders/pipeline.yml | 46 ----------------------
 pipelines/main/pipeline.yml                | 16 ++++++++
 pipelines/pull-requests/pipeline.yml       | 17 ++++++++
 3 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/pipelines/dockerfile-builders/pipeline.yml b/pipelines/dockerfile-builders/pipeline.yml
index ea71d0e2a..fa7f841af 100644
--- a/pipelines/dockerfile-builders/pipeline.yml
+++ b/pipelines/dockerfile-builders/pipeline.yml
@@ -172,16 +172,6 @@ resources:
       password: ((ci-ghcr-pusher-token))
       tag: latest
 
-  - name: k8s-code-generator-1.25-image-ghcr
-    type: registry-image
-    icon: docker
-    <<: *check-every-for-image
-    source:
-      repository: ((ci-ghcr-registry))/k8s-code-generator-1.25
-      username: ((ci-ghcr-pusher-username))
-      password: ((ci-ghcr-pusher-token))
-      tag: latest
-
   - name: k8s-code-generator-1.26-image-ghcr
     type: registry-image
     icon: docker
@@ -644,42 +634,6 @@ jobs:
         params:
           image: image/image.tar
 
-  - name: build-k8s-code-generator-1.25
-    public: true # all logs are publicly visible
-    serial: true
-    plan:
-      - get: k8s-code-generator-dockerfile
-        trigger: true
-      - get: daily
-        trigger: true
-      - task: build-image
-        privileged: true
-        config:
-          platform: linux
-          image_resource:
-            type: registry-image
-            source:
-              repository: concourse/oci-build-task
-          inputs:
-            - name: k8s-code-generator-dockerfile
-          outputs:
-            - name: image
-          run:
-            path: build
-          caches:
-            - path: cache
-          params:
-            CONTEXT: k8s-code-generator-dockerfile/dockerfiles/k8s-code-generator
-            BUILD_ARG_K8S_PKG_VERSION: 0.25.16
-            <<: *codegen-versions
-            OUTPUT_OCI: true # needed for building multi-arch images
-            IMAGE_PLATFORM: "linux/amd64,linux/arm64" # build a multi-arch images which includes these platforms
-      - put: k8s-code-generator-1.25-image-ghcr
-        get_params:
-          format: oci # needed for multi-arch images
-        params:
-          image: image/image # this is a directory for OCI (multi-arch images)
-
   - name: build-k8s-code-generator-1.26
     public: true # all logs are publicly visible
     serial: true
diff --git a/pipelines/main/pipeline.yml b/pipelines/main/pipeline.yml
index d8e4f4842..be8c60386 100644
--- a/pipelines/main/pipeline.yml
+++ b/pipelines/main/pipeline.yml
@@ -456,6 +456,15 @@ resources:
       username: ((ci-ghcr-puller-username))
       password: ((ci-ghcr-puller-token))
 
+  - name: k8s-code-generator-1.33-image
+    type: registry-image
+    icon: docker
+    check_every: 3m
+    source:
+      repository: ((ci-ghcr-registry))/k8s-code-generator-1.33
+      username: ((ci-ghcr-puller-username))
+      password: ((ci-ghcr-puller-token))
+
   - name: kind-release
     type: github-release
     check_every: 10m
@@ -565,6 +574,7 @@ jobs:
           - get: k8s-code-generator-1.30-image
           - get: k8s-code-generator-1.31-image
           - get: k8s-code-generator-1.32-image
+          - get: k8s-code-generator-1.33-image
       - in_parallel:
           - task: verify-go-mod-tidy
             timeout: 20m
@@ -614,6 +624,12 @@ jobs:
             image: k8s-code-generator-1.32-image
             params:
               KUBE_MINOR_VERSION: "1.32"
+          - task: codegen-1.33
+            timeout: 20m
+            file: pinniped-ci/pipelines/shared-tasks/run-verify-codegen/task.yml
+            image: k8s-code-generator-1.33-image
+            params:
+              KUBE_MINOR_VERSION: "1.33"
 
   - name: unit-test
     public: true # all logs are publicly visible
diff --git a/pipelines/pull-requests/pipeline.yml b/pipelines/pull-requests/pipeline.yml
index 7c0c8642a..bceca9e20 100644
--- a/pipelines/pull-requests/pipeline.yml
+++ b/pipelines/pull-requests/pipeline.yml
@@ -372,6 +372,15 @@ resources:
       username: ((ci-ghcr-puller-username))
       password: ((ci-ghcr-puller-token))
 
+  - name: k8s-code-generator-1.33-image
+    type: registry-image
+    icon: docker
+    check_every: 3m
+    source:
+      repository: ((ci-ghcr-registry))/k8s-code-generator-1.33
+      username: ((ci-ghcr-puller-username))
+      password: ((ci-ghcr-puller-token))
+
 jobs:
 
   - name: start
@@ -462,6 +471,7 @@ jobs:
           - get: k8s-code-generator-1.30-image
           - get: k8s-code-generator-1.31-image
           - get: k8s-code-generator-1.32-image
+          - get: k8s-code-generator-1.33-image
       - { <<: *pr-status-on-pending, params: { <<: *pr-status-on-pending-params, context: verify-codegen } }
       - in_parallel:
           - task: verify-go-mod-tidy
@@ -521,6 +531,13 @@ jobs:
             image: k8s-code-generator-1.32-image
             params:
               KUBE_MINOR_VERSION: "1.32"
+          - task: codegen-1.33
+            timeout: 20m
+            <<: *pinniped-pr-input-mapping
+            file: pinniped-ci/pipelines/shared-tasks/run-verify-codegen/task.yml
+            image: k8s-code-generator-1.33-image
+            params:
+              KUBE_MINOR_VERSION: "1.33"
 
   - name: unit-test
     on_success: { <<: *pr-status-on-success, params: { <<: *pr-status-on-success-params, context: unit-test } }