From be15eaf0230e07d266e161983f30eccbb0cd876c Mon Sep 17 00:00:00 2001
From: Joshua Casey <joshua.casey@broadcom.com>
Date: Tue, 14 Oct 2025 09:33:00 -0500
Subject: [PATCH] Run integration tests on latest k8s versions

---
 pipelines/main/pipeline.yml          | 69 ++++++++++++++++++++++++++--
 pipelines/pull-requests/pipeline.yml |  6 +--
 2 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/pipelines/main/pipeline.yml b/pipelines/main/pipeline.yml
index 4935afe3c..908a4e884 100644
--- a/pipelines/main/pipeline.yml
+++ b/pipelines/main/pipeline.yml
@@ -46,6 +46,7 @@ groups:
       - integration-test-1.30
       - integration-test-1.31
       - integration-test-1.32
+      - integration-test-1.33
   - name: int-misc
     jobs:
       - run-int-misc
@@ -168,13 +169,15 @@ meta:
   kube_version_v1-29-x: &kube_version_v1-29-x
     KUBE_VERSION: v1.29.14
   kube_version_v1-30-x: &kube_version_v1-30-x
-    KUBE_VERSION: v1.30.10
+    KUBE_VERSION: v1.30.13
   kube_version_v1-31-x: &kube_version_v1-31-x
-    KUBE_VERSION: v1.31.6
+    KUBE_VERSION: v1.31.12
   kube_version_v1-32-x: &kube_version_v1-32-x
-    KUBE_VERSION: v1.32.3
+    KUBE_VERSION: v1.32.8
   kube_version_v1-33-x: &kube_version_v1-33-x
-    KUBE_VERSION: v1.33.0
+    KUBE_VERSION: v1.33.4
+  kube_version_v1-34-x: &kube_version_v1-34-x
+    KUBE_VERSION: v1.34.0
   kube_version_k8s-main: &kube_version_k8s-main
     KUBE_VERSION: "k8s-main"
     KIND_NODE_IMAGE: "ghcr.io/pinniped-ci-bot/kind-node-image:latest"
@@ -184,7 +187,7 @@ meta:
   oldest_kind_kube_version: &oldest_kind_kube_version
     <<: *kube_version_v1-21-x
   latest_kind_kube_version: &latest_kind_kube_version
-    <<: *kube_version_v1-33-x
+    <<: *kube_version_v1-34-x
 
   okta_integration_env_vars: &okta_integration_env_vars
     OKTA_CLI_CALLBACK: ((okta-cli-callback))
@@ -1698,6 +1701,62 @@ jobs:
         params:
           <<: *gcp_account_params
 
+  - name: integration-test-1.33
+    public: true # all logs are publicly visible
+    plan:
+      - in_parallel:
+          - get: pinniped
+            passed: [ run-int-k8s-versions ]
+            trigger: true
+          - get: pinniped-ci
+          - get: kind-release
+          - get: gcloud-image
+          - get: k8s-app-deployer-image
+          - get: ci-build-image
+            passed: [ run-int-k8s-versions ]
+            params:
+              skip_download: true
+          - get: ci-test-image
+            passed: [ run-int-k8s-versions ]
+          - get: integration-test-runner-image
+      - task: deploy-kind-instance
+        attempts: 5
+        timeout: 30m
+        file: pinniped-ci/pipelines/shared-tasks/deploy-kind-cluster-vm/task.yml
+        image: gcloud-image
+        params:
+          <<: *kube_version_v1-33-x
+          <<: *gcp_account_params
+      - task: deploy
+        input_mapping:
+          cluster-pool: deploy-kind-cluster-vm-output
+        params:
+          CLUSTER_CAPABILITIES_PATH: pinniped/test/cluster_capabilities/kind.yaml
+        file: pinniped-ci/pipelines/shared-tasks/deploy-to-integration/task.yml
+        image: integration-test-runner-image
+      - task: run-integration-tests
+        timeout: 75m
+        file: pinniped-ci/pipelines/shared-tasks/run-integration-tests/task.yml
+        image: integration-test-runner-image
+        params:
+          START_GCLOUD_PROXY: "yes"
+          <<: *gcp_account_params
+    ensure:
+      task: export-cluster-diagnostics
+      <<: *cluster_diagnostics_task
+      input_mapping:
+        cluster-pool: deploy-kind-cluster-vm-output
+      ensure:
+        task: remove-kind-instance
+        attempts: 2
+        timeout: 20m
+        file: pinniped-ci/pipelines/shared-tasks/remove-kind-cluster-vm/task.yml
+        image: gcloud-image
+        input_mapping:
+          kind-cluster-pool: deploy-kind-cluster-vm-output
+        params:
+          <<: *gcp_account_params
+
   - name: integration-test-latest
     public: true # all logs are publicly visible
     plan:
diff --git a/pipelines/pull-requests/pipeline.yml b/pipelines/pull-requests/pipeline.yml
index 022403d3d..09fd58790 100644
--- a/pipelines/pull-requests/pipeline.yml
+++ b/pipelines/pull-requests/pipeline.yml
@@ -106,8 +106,8 @@ meta:
   # so always check the tags using the above link.
   kube_version_v1-21-x: &kube_version_v1-21-x
     KUBE_VERSION: v1.21.14
-  kube_version_v1-33-x: &kube_version_v1-33-x
-    KUBE_VERSION: v1.33.0
+  kube_version_v1-34-x: &kube_version_v1-34-x
+    KUBE_VERSION: v1.34.0
   kube_version_k8s-main: &kube_version_k8s-main
     KUBE_VERSION: "k8s-main"
     KIND_NODE_IMAGE: "ghcr.io/pinniped-ci-bot/kind-node-image:latest"
@@ -116,7 +116,7 @@ meta:
   oldest_kind_kube_version: &oldest_kind_kube_version
     <<: *kube_version_v1-21-x
   latest_kind_kube_version: &latest_kind_kube_version
-    <<: *kube_version_v1-33-x
+    <<: *kube_version_v1-34-x
 
   okta_integration_env_vars: &okta_integration_env_vars
     OKTA_CLI_CALLBACK: ((okta-cli-callback))