Merge remote-tracking branch 'origin/master' into release-1.33

2025-07-20 18:31:15 +00:00 · 2025-04-11 01:29:22 +00:00 · 2025-04-11 01:29:22 +00:00 · 41a81b7bd5
commit 41a81b7bd5
parent 00a10a7c6f 908bdb3f2c
1 changed files with 481 additions and 0 deletions
--- a/staging/publishing/rules.yaml
+++ b/staging/publishing/rules.yaml
@ -29,6 +29,12 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/apimachinery
+  - name: release-1.33
+    go: 1.24.0
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/apimachinery
  library: true
 - destination: api
  branches:
@ -75,6 +81,15 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/api
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/api
  library: true
 - destination: client-go
  branches:
@ -151,6 +166,21 @@ rules:
      # assumes GO111MODULE=on
      go build -mod=mod ./...
      go test -mod=mod ./...
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/client-go
+    smoke-test: |
+      # assumes GO111MODULE=on
+      go build -mod=mod ./...
+      go test -mod=mod ./...
  library: true
 - destination: code-generator
  branches:
@ -194,6 +224,15 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/code-generator
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/code-generator
 - destination: component-base
  branches:
  - name: master
@ -259,6 +298,19 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/component-base
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/component-base
  library: true
 - destination: component-helpers
  branches:
@ -325,6 +377,19 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/component-helpers
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/component-helpers
  library: true
 - destination: kms
  branches:
@ -371,6 +436,15 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/kms
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/kms
  library: true
 - destination: apiserver
  branches:
@ -457,6 +531,23 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/apiserver
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: kms
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/apiserver
  library: true
 - destination: kube-aggregator
  branches:
@ -563,6 +654,27 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/kube-aggregator
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: apiserver
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: kms
+      branch: release-1.33
+    - repository: code-generator
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/kube-aggregator
 - destination: sample-apiserver
  branches:
  - name: master
@ -693,6 +805,32 @@ rules:
    smoke-test: |
      # assumes GO111MODULE=on
      go build -mod=mod .
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: apiserver
+      branch: release-1.33
+    - repository: code-generator
+      branch: release-1.33
+    - repository: kms
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/sample-apiserver
+    required-packages:
+    - k8s.io/code-generator
+    smoke-test: |
+      # assumes GO111MODULE=on
+      go build -mod=mod .
 - destination: sample-controller
  branches:
  - name: master
@ -793,6 +931,26 @@ rules:
    smoke-test: |
      # assumes GO111MODULE=on
      go build -mod=mod .
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: code-generator
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/sample-controller
+    required-packages:
+    - k8s.io/code-generator
+    smoke-test: |
+      # assumes GO111MODULE=on
+      go build -mod=mod .
 - destination: apiextensions-apiserver
  branches:
  - name: master
@ -908,6 +1066,29 @@ rules:
      - staging/src/k8s.io/apiextensions-apiserver
    required-packages:
    - k8s.io/code-generator
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: apiserver
+      branch: release-1.33
+    - repository: code-generator
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: kms
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/apiextensions-apiserver
+    required-packages:
+    - k8s.io/code-generator
 - destination: metrics
  branches:
  - name: master
@ -983,6 +1164,21 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/metrics
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: code-generator
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/metrics
  library: true
 - destination: cli-runtime
  branches:
@ -1049,6 +1245,19 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/cli-runtime
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: api
+      branch: release-1.33
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/cli-runtime
  library: true
 - destination: sample-cli-plugin
  branches:
@ -1125,6 +1334,21 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/sample-cli-plugin
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: api
+      branch: release-1.33
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: cli-runtime
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/sample-cli-plugin
 - destination: kube-proxy
  branches:
  - name: master
@ -1200,6 +1424,21 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/kube-proxy
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/kube-proxy
  library: true
 - destination: cri-api
  branches:
@ -1231,6 +1470,12 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/cri-api
+  - name: release-1.33
+    go: 1.24.0
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/cri-api
  library: true
 - destination: cri-client
  branches:
@ -1283,6 +1528,23 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/cri-client
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: api
+      branch: release-1.33
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: cri-api
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/cri-client
  library: true
 - destination: kubelet
  branches:
@ -1389,6 +1651,27 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/kubelet
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: apiserver
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: cri-api
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: kms
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/kubelet
  library: true
 - destination: kube-scheduler
  branches:
@ -1465,6 +1748,21 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/kube-scheduler
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/kube-scheduler
  library: true
 - destination: controller-manager
  branches:
@ -1561,6 +1859,25 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/controller-manager
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: api
+      branch: release-1.33
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: apiserver
+      branch: release-1.33
+    - repository: kms
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/controller-manager
  library: true
 - destination: cloud-provider
  branches:
@ -1677,6 +1994,29 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/cloud-provider
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: api
+      branch: release-1.33
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: apiserver
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: controller-manager
+      branch: release-1.33
+    - repository: component-helpers
+      branch: release-1.33
+    - repository: kms
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/cloud-provider
  library: true
 - destination: kube-controller-manager
  branches:
@ -1803,6 +2143,31 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/kube-controller-manager
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: apiserver
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: controller-manager
+      branch: release-1.33
+    - repository: cloud-provider
+      branch: release-1.33
+    - repository: component-helpers
+      branch: release-1.33
+    - repository: kms
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/kube-controller-manager
  library: true
 - destination: cluster-bootstrap
  branches:
@ -1859,6 +2224,17 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/cluster-bootstrap
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/cluster-bootstrap
  library: true
 - destination: csi-translation-lib
  branches:
@ -1915,6 +2291,17 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/csi-translation-lib
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: api
+      branch: release-1.33
+    - repository: apimachinery
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/csi-translation-lib
  library: true
 - destination: mount-utils
  branches:
@ -1946,6 +2333,12 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/mount-utils
+  - name: release-1.33
+    go: 1.24.0
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/mount-utils
  library: true
 - destination: legacy-cloud-providers
  branches:
@ -2115,6 +2508,29 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/kubectl
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: api
+      branch: release-1.33
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: cli-runtime
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: code-generator
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: component-helpers
+      branch: release-1.33
+    - repository: metrics
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/kubectl
  library: true
 - destination: pod-security-admission
  branches:
@ -2211,6 +2627,25 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/pod-security-admission
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: api
+      branch: release-1.33
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: apiserver
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: kms
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/pod-security-admission
  library: true
 - destination: dynamic-resource-allocation
  branches:
@ -2331,6 +2766,31 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/dynamic-resource-allocation
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: apiserver
+      branch: release-1.33
+    - repository: api
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: cri-api
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    - repository: component-helpers
+      branch: release-1.33
+    - repository: kms
+      branch: release-1.33
+    - repository: kubelet
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/dynamic-resource-allocation
 - destination: endpointslice
  branches:
  - name: master
@ -2406,6 +2866,21 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/endpointslice
+  - name: release-1.33
+    go: 1.24.0
+    dependencies:
+    - repository: api
+      branch: release-1.33
+    - repository: apimachinery
+      branch: release-1.33
+    - repository: client-go
+      branch: release-1.33
+    - repository: component-base
+      branch: release-1.33
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/endpointslice
 - destination: externaljwt
  branches:
  - name: master
@ -2418,6 +2893,12 @@ rules:
      branch: release-1.32
      dirs:
      - staging/src/k8s.io/externaljwt
+  - name: release-1.33
+    go: 1.24.0
+    source:
+      branch: release-1.33
+      dirs:
+      - staging/src/k8s.io/externaljwt
 recursive-delete-patterns:
 - '*/.gitattributes'
 default-go-version: 1.24.0