From 2bd9c55e4c991e7b585a41627219abd9626efb5e Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Wed, 7 Oct 2026 11:46:18 -0700 Subject: [PATCH] use k8s 1.37 in pipelines and remove 1.31 codegen Signed-off-by: Ryan Richard --- pipelines/dockerfile-builders/pipeline.yml | 46 ---------- pipelines/main/pipeline.yml | 99 +++++++++++++++++----- pipelines/pull-requests/pipeline.yml | 40 ++++----- 3 files changed, 99 insertions(+), 86 deletions(-) diff --git a/pipelines/dockerfile-builders/pipeline.yml b/pipelines/dockerfile-builders/pipeline.yml index b370ee82a..7ec7b95e5 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.31-image-ghcr - type: registry-image - icon: docker - <<: *check-every-for-image - source: - repository: ((ci-ghcr-registry))/k8s-code-generator-1.31 - username: ((ci-ghcr-pusher-username)) - password: ((ci-ghcr-pusher-token)) - tag: latest - - name: k8s-code-generator-1.32-image-ghcr type: registry-image icon: docker @@ -624,42 +614,6 @@ jobs: params: image: image/image.tar - - name: build-k8s-code-generator-1.31 - 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.31.14 - <<: *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.31-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.32 public: true # all logs are publicly visible serial: true diff --git a/pipelines/main/pipeline.yml b/pipelines/main/pipeline.yml index 2079e28d8..200688f35 100644 --- a/pipelines/main/pipeline.yml +++ b/pipelines/main/pipeline.yml @@ -52,6 +52,7 @@ groups: - integration-test-1.33 - integration-test-1.34 - integration-test-1.35 + - integration-test-1.36 - name: int-misc jobs: - ready-for-int # this job is auto-triggered, but show it again here to make it easy to see in the UI which versions are ready to go @@ -185,11 +186,13 @@ meta: kube_version_v1-33-x: &kube_version_v1-33-x KUBE_VERSION: v1.33.12 kube_version_v1-34-x: &kube_version_v1-34-x - KUBE_VERSION: v1.34.8 + KUBE_VERSION: v1.34.11 kube_version_v1-35-x: &kube_version_v1-35-x - KUBE_VERSION: v1.35.5 + KUBE_VERSION: v1.35.8 kube_version_v1-36-x: &kube_version_v1-36-x - KUBE_VERSION: v1.36.1 + KUBE_VERSION: v1.36.4 + kube_version_v1-37-x: &kube_version_v1-37-x + KUBE_VERSION: v1.37.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" @@ -199,7 +202,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-36-x + <<: *kube_version_v1-37-x okta_integration_env_vars: &okta_integration_env_vars OKTA_CLI_CALLBACK: ((okta-cli-callback)) @@ -457,15 +460,6 @@ resources: username: ((ci-ghcr-puller-username)) password: ((ci-ghcr-puller-token)) - - name: k8s-code-generator-1.31-image - type: registry-image - icon: docker - check_every: 3m - source: - repository: ((ci-ghcr-registry))/k8s-code-generator-1.31 - username: ((ci-ghcr-puller-username)) - password: ((ci-ghcr-puller-token)) - - name: k8s-code-generator-1.32-image type: registry-image icon: docker @@ -511,6 +505,15 @@ resources: username: ((ci-ghcr-puller-username)) password: ((ci-ghcr-puller-token)) + - name: k8s-code-generator-1.37-image + type: registry-image + icon: docker + check_every: 3m + source: + repository: ((ci-ghcr-registry))/k8s-code-generator-1.37 + username: ((ci-ghcr-puller-username)) + password: ((ci-ghcr-puller-token)) + - name: kind-release type: github-release check_every: 10m @@ -613,12 +616,12 @@ jobs: - get: pinniped trigger: true - get: pinniped-ci - - get: k8s-code-generator-1.31-image - get: k8s-code-generator-1.32-image - get: k8s-code-generator-1.33-image - get: k8s-code-generator-1.34-image - get: k8s-code-generator-1.35-image - get: k8s-code-generator-1.36-image + - get: k8s-code-generator-1.37-image - in_parallel: - task: verify-go-mod-tidy timeout: 20m @@ -626,12 +629,6 @@ jobs: - task: verify-go-generate timeout: 20m file: pinniped-ci/pipelines/shared-tasks/run-verify-go-generate/task.yml - - task: codegen-1.31 - timeout: 20m - file: pinniped-ci/pipelines/shared-tasks/run-verify-codegen/task.yml - image: k8s-code-generator-1.31-image - params: - KUBE_MINOR_VERSION: "1.31" - task: codegen-1.32 timeout: 20m file: pinniped-ci/pipelines/shared-tasks/run-verify-codegen/task.yml @@ -662,6 +659,12 @@ jobs: image: k8s-code-generator-1.36-image params: KUBE_MINOR_VERSION: "1.36" + - task: codegen-1.37 + timeout: 20m + file: pinniped-ci/pipelines/shared-tasks/run-verify-codegen/task.yml + image: k8s-code-generator-1.37-image + params: + KUBE_MINOR_VERSION: "1.37" - name: unit-test public: true # all logs are publicly visible @@ -1975,6 +1978,62 @@ jobs: params: <<: *gcp_account_params + - name: integration-test-1.36 + 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-36-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 cde120dd7..b2f26a8ac 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-36-x: &kube_version_v1-36-x - KUBE_VERSION: v1.36.1 + kube_version_v1-37-x: &kube_version_v1-37-x + KUBE_VERSION: v1.37.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-36-x + <<: *kube_version_v1-37-x okta_integration_env_vars: &okta_integration_env_vars OKTA_CLI_CALLBACK: ((okta-cli-callback)) @@ -347,15 +347,6 @@ resources: username: ((ci-ghcr-puller-username)) password: ((ci-ghcr-puller-token)) - - name: k8s-code-generator-1.31-image - type: registry-image - icon: docker - check_every: 3m - source: - repository: ((ci-ghcr-registry))/k8s-code-generator-1.31 - username: ((ci-ghcr-puller-username)) - password: ((ci-ghcr-puller-token)) - - name: k8s-code-generator-1.32-image type: registry-image icon: docker @@ -401,6 +392,15 @@ resources: username: ((ci-ghcr-puller-username)) password: ((ci-ghcr-puller-token)) + - name: k8s-code-generator-1.37-image + type: registry-image + icon: docker + check_every: 3m + source: + repository: ((ci-ghcr-registry))/k8s-code-generator-1.37 + username: ((ci-ghcr-puller-username)) + password: ((ci-ghcr-puller-token)) + jobs: - name: start @@ -487,12 +487,12 @@ jobs: version: every passed: [ start ] - get: pinniped-ci - - get: k8s-code-generator-1.31-image - get: k8s-code-generator-1.32-image - get: k8s-code-generator-1.33-image - get: k8s-code-generator-1.34-image - get: k8s-code-generator-1.35-image - get: k8s-code-generator-1.36-image + - get: k8s-code-generator-1.37-image - { <<: *pr-status-on-pending, params: { <<: *pr-status-on-pending-params, context: verify-codegen } } - in_parallel: - task: verify-go-mod-tidy @@ -503,13 +503,6 @@ jobs: timeout: 20m <<: *pinniped-pr-input-mapping file: pinniped-ci/pipelines/shared-tasks/run-verify-go-generate/task.yml - - task: codegen-1.31 - timeout: 20m - <<: *pinniped-pr-input-mapping - file: pinniped-ci/pipelines/shared-tasks/run-verify-codegen/task.yml - image: k8s-code-generator-1.31-image - params: - KUBE_MINOR_VERSION: "1.31" - task: codegen-1.32 timeout: 20m <<: *pinniped-pr-input-mapping @@ -545,6 +538,13 @@ jobs: image: k8s-code-generator-1.36-image params: KUBE_MINOR_VERSION: "1.36" + - task: codegen-1.37 + timeout: 20m + <<: *pinniped-pr-input-mapping + file: pinniped-ci/pipelines/shared-tasks/run-verify-codegen/task.yml + image: k8s-code-generator-1.37-image + params: + KUBE_MINOR_VERSION: "1.37" - name: unit-test on_success: { <<: *pr-status-on-success, params: { <<: *pr-status-on-success-params, context: unit-test } }