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/apiextensions-apiserver
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.23.10
Choose a base ref
...
head repository: kubernetes/apiextensions-apiserver
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.23.11
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on May 23, 2022

  1. Prune defaults for CRD serving 

    Kubernetes-commit: e6cce430f9cd6e0378290f523ea414431b58fccf
    @Jefftree @k8s-publishing-bot
    Jefftree authored and k8s-publishing-bot committed May 23, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    eps1lon Sebastian "Sebbie" Silbermann
    SSH Key Fingerprint: 4yGi1DM6n1CGrsr6FQ9lv1EeXS8x5gd7Z1mhaLboCCw
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c3f2562 View commit details

Commits on Sep 8, 2022

  1. Merge pull request #110578 from Jefftree/automated-cherry-pick-of-#11… 

    …0179-upstream-release-1.23

Automated cherry pick of #110179: Prune defaults for CRD serving

Kubernetes-commit: 92781a13bf3b49573a961cc5b7893db71efeba7f
    @k8s-publishing-bot
    k8s-publishing-bot committed Sep 8, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    eps1lon Sebastian "Sebbie" Silbermann
    SSH Key Fingerprint: 4yGi1DM6n1CGrsr6FQ9lv1EeXS8x5gd7Z1mhaLboCCw
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4798bd7 View commit details

Commits on Sep 15, 2022

  1. Update dependencies to v0.23.11 tag

    @k8s-publishing-bot
    k8s-publishing-bot committed Sep 15, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    eps1lon Sebastian "Sebbie" Silbermann
    SSH Key Fingerprint: 4yGi1DM6n1CGrsr6FQ9lv1EeXS8x5gd7Z1mhaLboCCw
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8b70335 View commit details
Showing with 27 additions and 25 deletions.
  1. +12 −12 go.mod
  2. +12 −12 go.sum
  3. +3 −1 pkg/controller/openapi/controller.go
24 changes: 12 additions & 12 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -21,12 +21,12 @@ require (
google.golang.org/grpc v1.40.0
google.golang.org/protobuf v1.27.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220222194917-a6b22073a6bd
k8s.io/apimachinery v0.0.0-20220124172104-276a8a7530a3
k8s.io/apiserver v0.0.0-20220325134358-1a6cf35891fa
k8s.io/client-go v0.0.0-20220331091936-a475c2871397
k8s.io/code-generator v0.0.0-20220331052100-31c00a6b95fa
k8s.io/component-base v0.0.0-20220124174242-95a6431a4277
k8s.io/api v0.23.11
k8s.io/apimachinery v0.23.11
k8s.io/apiserver v0.23.11
k8s.io/client-go v0.23.11
k8s.io/code-generator v0.23.11
k8s.io/component-base v0.23.11
k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/utils v0.0.0-20211116205334-6203023598ed
@@ -36,10 +36,10 @@ require (
)

replace (
k8s.io/api => k8s.io/api v0.0.0-20220222194917-a6b22073a6bd
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220124172104-276a8a7530a3
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220325134358-1a6cf35891fa
k8s.io/client-go => k8s.io/client-go v0.0.0-20220331091936-a475c2871397
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220331052100-31c00a6b95fa
k8s.io/component-base => k8s.io/component-base v0.0.0-20220124174242-95a6431a4277
k8s.io/api => k8s.io/api v0.23.11
k8s.io/apimachinery => k8s.io/apimachinery v0.23.11
k8s.io/apiserver => k8s.io/apiserver v0.23.11
k8s.io/client-go => k8s.io/client-go v0.23.11
k8s.io/code-generator => k8s.io/code-generator v0.23.11
k8s.io/component-base => k8s.io/component-base v0.23.11
)
24 changes: 12 additions & 12 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -962,18 +962,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220222194917-a6b22073a6bd h1:zkhSmvtAvkp9uWoM0Djrk9GsNCcXsxZiTUXbwte8eMg=
k8s.io/api v0.0.0-20220222194917-a6b22073a6bd/go.mod h1:9Vo9KEQyesRPDP6eG+jDkliZvSar3OLe8f5zfqiRoec=
k8s.io/apimachinery v0.0.0-20220124172104-276a8a7530a3 h1:n2y4Rh6ixZSeru9imTOu4bYNuAObzwMBnUcPVFzaXnk=
k8s.io/apimachinery v0.0.0-20220124172104-276a8a7530a3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
k8s.io/apiserver v0.0.0-20220325134358-1a6cf35891fa h1:qm4KEeEFozMPPzQI6x4wD2fqSM1/JqDi/CqIgG5F64g=
k8s.io/apiserver v0.0.0-20220325134358-1a6cf35891fa/go.mod h1:vP64VGV52UwClr1m7F/tn6ZAoU12MGA+USDRnvBMyOc=
k8s.io/client-go v0.0.0-20220331091936-a475c2871397 h1:KHcjgM1J5cgsmSveyTnidOIqFOvOODkYiDdLE3UyuuI=
k8s.io/client-go v0.0.0-20220331091936-a475c2871397/go.mod h1:izfSZIwqe/CwZnRIQtvTWezLZwfLeQWRD/cILSHRixw=
k8s.io/code-generator v0.0.0-20220331052100-31c00a6b95fa h1:YfYadH6JIdM2rnqOHvrhOBuzXzWX3u2sWMkfrgZJ2tY=
k8s.io/code-generator v0.0.0-20220331052100-31c00a6b95fa/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
k8s.io/component-base v0.0.0-20220124174242-95a6431a4277 h1:Avm1ar/AB4Hi8+FABiWTYGZFfD0pwMEkHv244Ar1j6k=
k8s.io/component-base v0.0.0-20220124174242-95a6431a4277/go.mod h1:liKXZIJJu+NNA3mVaYnMGyRsDxyEQ6ItKPqX/YWLVxA=
k8s.io/api v0.23.11 h1:mXwx2fr3TePYSWtM0CyEZTnAL8ijrRFaFSvfb4yjm2s=
k8s.io/api v0.23.11/go.mod h1:04WNPUceD7Px51WR0fI2rTAx272Hyg0p3DASQr1mP40=
k8s.io/apimachinery v0.23.11 h1:n5cfgs2CS4sCh1U9HLC3rYFodVEK3YPEcxLCTI5Ly/Y=
k8s.io/apimachinery v0.23.11/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
k8s.io/apiserver v0.23.11 h1:24ZryOylQExnCrHBzApnajASHwG24ASoH8X9kswinSk=
k8s.io/apiserver v0.23.11/go.mod h1:K+UoYirmCD0uokptPbp0Jz7kjq3oPeRQPKQR1EJqb0s=
k8s.io/client-go v0.23.11 h1:GwQAmbAsieNud3UmzkOqtxdpoAYZtEfXWuTSvCwaT+g=
k8s.io/client-go v0.23.11/go.mod h1:Jsqc/I9WKG/DD+oBJ1uVcAchcU008NV8TbjlPaZM6AI=
k8s.io/code-generator v0.23.11 h1:id12oGF+RQTKXUmmXvbX7pY4xxZRFSL8odUe5YFuzF8=
k8s.io/code-generator v0.23.11/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
k8s.io/component-base v0.23.11 h1:lHy6HfxZKcvgFah6wz157ZV8bEXLfDikxdpWd7ls+s4=
k8s.io/component-base v0.23.11/go.mod h1:n7sCPcTpN6q0dMN5HWlOUdebJBJvQsBC9yYSI6MmRPI=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
4 changes: 3 additions & 1 deletion pkg/controller/openapi/controller.go
View file
Original file line number Diff line number Diff line change
@@ -201,8 +201,10 @@ func buildVersionSpecs(crd *apiextensionsv1.CustomResourceDefinition, oldSpecs m
if !v.Served {
continue
}
// Defaults are not pruned here, but before being served.
spec, err := builder.BuildOpenAPIV2(crd, v.Name, builder.Options{V2: true})
// Defaults must be pruned here for CRDs to cleanly merge with the static
// spec that already has defaults pruned
spec.Definitions = handler.PruneDefaults(spec.Definitions)
if err != nil {
return nil, false, err
}