github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 14:23:37 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kubernetes Release Robot 2024-03-27 20:07:30 +00:00
commit d5113d861c
2 changed files with 515 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

487
staging/publishing/rules.yaml
View File

@ -30,6 +30,12 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/apimachinery
- name: release-1.30
go: 1.22.1
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/apimachinery
library: true
- destination: api
branches:
@ -77,6 +83,15 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/api
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/api
library: true
- destination: client-go
branches:
@ -154,17 +169,32 @@ rules:
# assumes GO111MODULE=on
go build -mod=mod ./...
go test -mod=mod ./...
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: api
branch: release-1.30
source:
branch: release-1.30
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:
- name: master
dependencies:
- repository: apimachinery
branch: master
source:
branch: master
dirs:
- staging/src/k8s.io/code-generator
dependencies:
- repository: apimachinery # for tests
branch: master
- name: release-1.26
go: 1.21.8
source:
@ -189,6 +219,15 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/code-generator
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/code-generator
- destination: component-base
branches:
- name: master
@ -255,6 +294,19 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/component-base
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/component-base
library: true
- destination: component-helpers
branches:
@ -322,6 +374,19 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/component-helpers
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/component-helpers
library: true
- destination: kms
branches:
@ -374,6 +439,15 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/kms
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/kms
library: true
- destination: apiserver
branches:
@ -461,6 +535,23 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/apiserver
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: kms
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/apiserver
library: true
- destination: kube-aggregator
branches:
@ -568,6 +659,27 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/kube-aggregator
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: apiserver
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: kms
branch: release-1.30
- repository: code-generator
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/kube-aggregator
- destination: sample-apiserver
branches:
- name: master
@ -699,6 +811,32 @@ rules:
smoke-test: |
# assumes GO111MODULE=on
go build -mod=mod .
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: apiserver
branch: release-1.30
- repository: code-generator
branch: release-1.30
- repository: kms
branch: release-1.30
- repository: component-base
branch: release-1.30
source:
branch: release-1.30
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
@ -800,6 +938,26 @@ rules:
smoke-test: |
# assumes GO111MODULE=on
go build -mod=mod .
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: code-generator
branch: release-1.30
source:
branch: release-1.30
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
@ -916,6 +1074,29 @@ rules:
- staging/src/k8s.io/apiextensions-apiserver
required-packages:
- k8s.io/code-generator
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: apiserver
branch: release-1.30
- repository: code-generator
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: kms
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/apiextensions-apiserver
required-packages:
- k8s.io/code-generator
- destination: metrics
branches:
- name: master
@ -992,6 +1173,21 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/metrics
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: code-generator
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/metrics
library: true
- destination: cli-runtime
branches:
@ -1059,6 +1255,19 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/cli-runtime
- name: release-1.30
go: 1.22.1
dependencies:
- repository: api
branch: release-1.30
- repository: apimachinery
branch: release-1.30
- repository: client-go
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/cli-runtime
library: true
- destination: sample-cli-plugin
branches:
@ -1136,6 +1345,21 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/sample-cli-plugin
- name: release-1.30
go: 1.22.1
dependencies:
- repository: api
branch: release-1.30
- repository: apimachinery
branch: release-1.30
- repository: cli-runtime
branch: release-1.30
- repository: client-go
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/sample-cli-plugin
- destination: kube-proxy
branches:
- name: master
@ -1212,6 +1436,21 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/kube-proxy
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/kube-proxy
library: true
- destination: cri-api
branches:
@ -1244,6 +1483,12 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/cri-api
- name: release-1.30
go: 1.22.1
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/cri-api
library: true
- destination: kubelet
branches:
@ -1339,6 +1584,27 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/kubelet
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: apiserver
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: cri-api
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: kms
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/kubelet
library: true
- destination: kube-scheduler
branches:
@ -1416,6 +1682,21 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/kube-scheduler
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/kube-scheduler
library: true
- destination: controller-manager
branches:
@ -1513,6 +1794,25 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/controller-manager
- name: release-1.30
go: 1.22.1
dependencies:
- repository: api
branch: release-1.30
- repository: apimachinery
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: apiserver
branch: release-1.30
- repository: kms
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/controller-manager
library: true
- destination: cloud-provider
branches:
@ -1630,6 +1930,29 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/cloud-provider
- name: release-1.30
go: 1.22.1
dependencies:
- repository: api
branch: release-1.30
- repository: apimachinery
branch: release-1.30
- repository: apiserver
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: controller-manager
branch: release-1.30
- repository: component-helpers
branch: release-1.30
- repository: kms
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/cloud-provider
library: true
- destination: kube-controller-manager
branches:
@ -1757,6 +2080,31 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/kube-controller-manager
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: apiserver
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: controller-manager
branch: release-1.30
- repository: cloud-provider
branch: release-1.30
- repository: component-helpers
branch: release-1.30
- repository: kms
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/kube-controller-manager
library: true
- destination: cluster-bootstrap
branches:
@ -1814,6 +2162,17 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/cluster-bootstrap
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: api
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/cluster-bootstrap
library: true
- destination: csi-translation-lib
branches:
@ -1871,6 +2230,17 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/csi-translation-lib
- name: release-1.30
go: 1.22.1
dependencies:
- repository: api
branch: release-1.30
- repository: apimachinery
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/csi-translation-lib
library: true
- destination: mount-utils
branches:
@ -1903,6 +2273,12 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/mount-utils
- name: release-1.30
go: 1.22.1
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/mount-utils
library: true
- destination: legacy-cloud-providers
branches:
@ -2034,6 +2410,31 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/legacy-cloud-providers
- name: release-1.30
go: 1.22.1
dependencies:
- repository: api
branch: release-1.30
- repository: apimachinery
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: cloud-provider
branch: release-1.30
- repository: apiserver
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: controller-manager
branch: release-1.30
- repository: component-helpers
branch: release-1.30
- repository: kms
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/legacy-cloud-providers
library: true
- destination: kubectl
branches:
@ -2151,6 +2552,29 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/kubectl
- name: release-1.30
go: 1.22.1
dependencies:
- repository: api
branch: release-1.30
- repository: apimachinery
branch: release-1.30
- repository: cli-runtime
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: code-generator
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: component-helpers
branch: release-1.30
- repository: metrics
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/kubectl
library: true
- destination: pod-security-admission
branches:
@ -2248,6 +2672,25 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/pod-security-admission
- name: release-1.30
go: 1.22.1
dependencies:
- repository: api
branch: release-1.30
- repository: apimachinery
branch: release-1.30
- repository: apiserver
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: kms
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/pod-security-admission
library: true
- destination: dynamic-resource-allocation
branches:
@ -2349,6 +2792,29 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/dynamic-resource-allocation
- name: release-1.30
go: 1.22.1
dependencies:
- repository: apimachinery
branch: release-1.30
- repository: apiserver
branch: release-1.30
- repository: api
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: cri-api
branch: release-1.30
- repository: component-base
branch: release-1.30
- repository: kms
branch: release-1.30
- repository: kubelet
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/dynamic-resource-allocation
- destination: endpointslice
branches:
- name: master
@ -2395,6 +2861,21 @@ rules:
branch: release-1.29
dirs:
- staging/src/k8s.io/endpointslice
- name: release-1.30
go: 1.22.1
dependencies:
- repository: api
branch: release-1.30
- repository: apimachinery
branch: release-1.30
- repository: client-go
branch: release-1.30
- repository: component-base
branch: release-1.30
source:
branch: release-1.30
dirs:
- staging/src/k8s.io/endpointslice
recursive-delete-patterns:
- '*/.gitattributes'
default-go-version: 1.22.1

31
test/e2e_node/oomkiller_linux_test.go
View File

@ -31,6 +31,7 @@ import (
"github.com/onsi/ginkgo/v2"
libcontainercgroups "github.com/opencontainers/runc/libcontainer/cgroups"
"k8s.io/utils/ptr"
)
type testCase struct {
@ -211,6 +212,16 @@ func getOOMTargetContainer(name string) v1.Container {
v1.ResourceMemory: resource.MustParse("15Mi"),
},
},
SecurityContext: &v1.SecurityContext{
SeccompProfile: &v1.SeccompProfile{
Type: v1.SeccompProfileTypeRuntimeDefault,
},
AllowPrivilegeEscalation: ptr.To(false),
RunAsUser: ptr.To[int64](999),
RunAsGroup: ptr.To[int64](999),
RunAsNonRoot: ptr.To(true),
Capabilities: &v1.Capabilities{Drop: []v1.Capability{"ALL"}},
},
}
}
@ -234,6 +245,16 @@ func getOOMTargetContainerMultiProcess(name string) v1.Container {
v1.ResourceMemory: resource.MustParse("15Mi"),
},
},
SecurityContext: &v1.SecurityContext{
SeccompProfile: &v1.SeccompProfile{
Type: v1.SeccompProfileTypeRuntimeDefault,
},
AllowPrivilegeEscalation: ptr.To(false),
RunAsUser: ptr.To[int64](999),
RunAsGroup: ptr.To[int64](999),
RunAsNonRoot: ptr.To(true),
Capabilities: &v1.Capabilities{Drop: []v1.Capability{"ALL"}},
},
}
}
@ -249,5 +270,15 @@ func getOOMTargetContainerWithoutLimit(name string) v1.Container {
// use the dd tool to attempt to allocate huge block of memory which exceeds the node allocatable
"sleep 5 && dd if=/dev/zero of=/dev/null iflag=fullblock count=10 bs=10G",
},
SecurityContext: &v1.SecurityContext{
SeccompProfile: &v1.SeccompProfile{
Type: v1.SeccompProfileTypeRuntimeDefault,
},
AllowPrivilegeEscalation: ptr.To(false),
RunAsUser: ptr.To[int64](999),
RunAsGroup: ptr.To[int64](999),
RunAsNonRoot: ptr.To(true),
Capabilities: &v1.Capabilities{Drop: []v1.Capability{"ALL"}},
},
}
}