Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kubernetes/dynamic-resource-allocation
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.30.1
Choose a base ref
...
head repository: kubernetes/dynamic-resource-allocation
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.30.2
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on May 1, 2024

  1. Adding the feature gates to fix cost for VAP and webhook matchConditi… 

    …ons.

Kubernetes-commit: 3d896724760a957e8059ff80e9f399248eacac66
    @cici37 @k8s-publishing-bot
    cici37 authored and k8s-publishing-bot committed May 1, 2024
    Copy the full SHA
    255222a View commit details

Commits on Jun 4, 2024

  1. Merge pull request #124676 from cici37/automated-cherry-pick-of-#1246… 

    …75-upstream-release-1.30

Automated cherry pick of #124675: Adding a deprecating featurer gate to fix cost

Kubernetes-commit: 4844fb18766bb713587044b244a1c1e5b9363da6
    @k8s-publishing-bot
    k8s-publishing-bot committed Jun 4, 2024
    Copy the full SHA
    81db3ec View commit details

Commits on Jun 12, 2024

  1. Update dependencies to v0.30.2 tag

    @k8s-publishing-bot
    k8s-publishing-bot committed Jun 12, 2024
    Copy the full SHA
    cc8a7a6 View commit details
Showing with 17 additions and 16 deletions.
  1. +5 −5 go.mod
  2. +10 −10 go.sum
  3. +2 −1 structured/namedresources/cel/compile.go
10 changes: 5 additions & 5 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@ require (
github.com/google/go-cmp v0.6.0
github.com/stretchr/testify v1.8.4
google.golang.org/grpc v1.58.3
k8s.io/api v0.0.0-20240405200954-d014286182f6
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16
k8s.io/apiserver v0.0.0-20240405202321-d97582edf43f
k8s.io/client-go v0.0.0-20240405201205-2df4de16d44f
k8s.io/api v0.30.2
k8s.io/apimachinery v0.30.2
k8s.io/apiserver v0.30.2
k8s.io/client-go v0.30.2
k8s.io/klog/v2 v2.120.1
k8s.io/kubelet v0.0.0-20240405203700-993e56fc10e8
k8s.io/kubelet v0.30.2
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
)

20 changes: 10 additions & 10 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -156,20 +156,20 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20240405200954-d014286182f6 h1:D+8jSRFaZCyBrxoU33jNMTIXrTLHt6/WSsfRXttR384=
k8s.io/api v0.0.0-20240405200954-d014286182f6/go.mod h1:72LmHV9KJWB464cJMYgnWZqh3GiKgX70hjmgoYjR67Y=
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16 h1:GjoXk5Gb8LqhZJjGbYOqIw8JbuDJZv9MKd94i2DXzg8=
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/apiserver v0.0.0-20240405202321-d97582edf43f h1:JxhHFeNTB4uDnUdLHAlj4yqYaLFbchNUr2cHYIuYY6w=
k8s.io/apiserver v0.0.0-20240405202321-d97582edf43f/go.mod h1:qQmcIz9MzZvE5CB6F8uTtGMFlOKrowA4xWPJmS30J54=
k8s.io/client-go v0.0.0-20240405201205-2df4de16d44f h1:Db7qKhB5C0hFLkG/JIiSMJJo9nYgl3M0oLfA+87MgUE=
k8s.io/client-go v0.0.0-20240405201205-2df4de16d44f/go.mod h1:b74WgxBhDtN8IQcRO+B6p2Lyt/XBiJNBaROf1gEuAlg=
k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/apiserver v0.30.2 h1:ACouHiYl1yFI2VFI3YGM+lvxgy6ir4yK2oLOsLI1/tw=
k8s.io/apiserver v0.30.2/go.mod h1:BOTdFBIch9Sv0ypSEcUR6ew/NUFGocRFNl72Ra7wTm8=
k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
k8s.io/kubelet v0.0.0-20240405203700-993e56fc10e8 h1:OFTL4EQUo9qg4f3AOC1BpOVzZlvnxc844YpT5WuRwKI=
k8s.io/kubelet v0.0.0-20240405203700-993e56fc10e8/go.mod h1:1763fnPLcSnyhxivj93ZkimX+/LsufervO16M3uuG+E=
k8s.io/kubelet v0.30.2 h1:Ck4E/pHndI20IzDXxS57dElhDGASPO5pzXF7BcKfmCY=
k8s.io/kubelet v0.30.2/go.mod h1:DSwwTbLQmdNkebAU7ypIALR4P9aXZNFwgRmedojUE94=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
3 changes: 2 additions & 1 deletion structured/namedresources/cel/compile.go
View file
Original file line number Diff line number Diff line change
@@ -184,7 +184,8 @@ func (c CompilationResult) Evaluate(ctx context.Context, attributes []resourceap
}

func mustBuildEnv() *environment.EnvSet {
envset := environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion())
// strictCost is always true to enforce cost limits.
envset := environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), true)
versioned := []environment.VersionedOptions{
{
// Feature epoch was actually 1.30, but we artificially set it to 1.0 because these