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.25.5
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.25.6
Choose a head ref
  • 5 commits
  • 2 files changed
  • 3 contributors

Commits on Jan 5, 2023

  1. Cherry pick 114857 to release-1.25 

    Kubernetes-commit: 647e31009fda5d0f22e70d1ad9125846af4e5dec
    @jpbetz @k8s-publishing-bot
    jpbetz authored and k8s-publishing-bot committed Jan 5, 2023

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    648839c View commit details

Commits on Jan 9, 2023

  1. Bump konnectivity-client to v0.0.35 

    ./hack/pin-dependency.sh sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35
./hack/update-codegen.sh
./hack/update-vendor.sh

Manual adjustments:
vendor/modules.txt
cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml
cluster/gce/manifests/konnectivity-server.yaml

Kubernetes-commit: 126c178743e188e385d4c20de5464c7897365684
    @jkh52 @k8s-publishing-bot
    jkh52 authored and k8s-publishing-bot committed Jan 9, 2023
    Copy the full SHA
    6694461 View commit details

Commits on Jan 10, 2023

  1. Merge pull request #114929 from jkh52/release-1.25-knp-metrics 

    Bump Konnectivity to v0.0.35 in release-1.25

Kubernetes-commit: 5920a071b73c1077e89f35bac382225462073364
    @k8s-publishing-bot
    k8s-publishing-bot committed Jan 10, 2023
    Copy the full SHA
    65917a6 View commit details

Commits on Jan 12, 2023

  1. Merge pull request #114864 from jpbetz/release-1.25 

    Cherry pick 114857 to release-1.25

Kubernetes-commit: 85431a78c1d9dd70ad061eb43a379ae2a517e54f
    @k8s-publishing-bot
    k8s-publishing-bot committed Jan 12, 2023
    Copy the full SHA
    86ed610 View commit details

Commits on Jan 19, 2023

  1. Update dependencies to v0.25.6 tag

    @k8s-publishing-bot
    k8s-publishing-bot committed Jan 19, 2023
    Copy the full SHA
    3bb8779 View commit details
Showing with 30 additions and 30 deletions.
  1. +14 −14 go.mod
  2. +16 −16 go.sum
28 changes: 14 additions & 14 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ go 1.19
require (
github.com/emicklei/go-restful/v3 v3.8.0
github.com/gogo/protobuf v1.3.2
github.com/google/cel-go v0.12.5
github.com/google/cel-go v0.12.6
github.com/google/gnostic v0.5.7-v3refs
github.com/google/go-cmp v0.5.8
github.com/google/gofuzz v1.1.0
@@ -22,12 +22,12 @@ require (
google.golang.org/grpc v1.47.0
google.golang.org/protobuf v1.28.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20221207015936-be0bf1dc3a1b
k8s.io/apimachinery v0.0.0-20221207015236-526d075b19f9
k8s.io/apiserver v0.0.0-20221207024700-d0e192d12dae
k8s.io/client-go v0.0.0-20221207022047-b2883ba878c4
k8s.io/code-generator v0.0.0-20221207014637-08edc9c26591
k8s.io/component-base v0.0.0-20221207023111-de5bbf2169a4
k8s.io/api v0.25.6
k8s.io/apimachinery v0.25.6
k8s.io/apiserver v0.25.6
k8s.io/client-go v0.25.6
k8s.io/code-generator v0.25.6
k8s.io/component-base v0.25.6
k8s.io/klog/v2 v2.70.1
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
@@ -120,14 +120,14 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.0.0-20221207015936-be0bf1dc3a1b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221207015236-526d075b19f9
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20221207024700-d0e192d12dae
k8s.io/client-go => k8s.io/client-go v0.0.0-20221207022047-b2883ba878c4
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20221207014637-08edc9c26591
k8s.io/component-base => k8s.io/component-base v0.0.0-20221207023111-de5bbf2169a4
k8s.io/api => k8s.io/api v0.25.6
k8s.io/apimachinery => k8s.io/apimachinery v0.25.6
k8s.io/apiserver => k8s.io/apiserver v0.25.6
k8s.io/client-go => k8s.io/client-go v0.25.6
k8s.io/code-generator => k8s.io/code-generator v0.25.6
k8s.io/component-base => k8s.io/component-base v0.25.6
)
32 changes: 16 additions & 16 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -198,8 +198,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
github.com/google/cel-go v0.12.5 h1:DmzaiSgoaqGCjtpPQWl26/gND+yRpim56H1jCVev6d8=
github.com/google/cel-go v0.12.5/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M=
github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -840,18 +840,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-20221207015936-be0bf1dc3a1b h1:SBgSsDsdFZbBSt+TMVAgk8OUkvV6f5cGUruytlHLCFo=
k8s.io/api v0.0.0-20221207015936-be0bf1dc3a1b/go.mod h1:YvZpuHvl+0aLny0+c5KuNrTfHfg3tZD+HDjQTLGxv3E=
k8s.io/apimachinery v0.0.0-20221207015236-526d075b19f9 h1:2NBWv9juNrLv5jYWe1VDMo0Tv0JETLrTniwM5dL2SPM=
k8s.io/apimachinery v0.0.0-20221207015236-526d075b19f9/go.mod h1:1S2i1QHkmxc8+EZCIxe/fX5hpldVXk4gvnJInMEb8D4=
k8s.io/apiserver v0.0.0-20221207024700-d0e192d12dae h1:TVYiXUPH7zR6SZuCpOWmjAKeCdoAb9eCaasBRbxYDCY=
k8s.io/apiserver v0.0.0-20221207024700-d0e192d12dae/go.mod h1:kd2GT8SnfL35eS7mjX0Z9a6qlPoCiUL8Tuo0S4llCNg=
k8s.io/client-go v0.0.0-20221207022047-b2883ba878c4 h1:kVsfgS31oNfGZqqURb+H3OrcRB3+Zi4femXmzDpaXog=
k8s.io/client-go v0.0.0-20221207022047-b2883ba878c4/go.mod h1:0w1GFTVywsqLqr0oSdRPuws3XkkCkIXUpZZpf7Fc4yI=
k8s.io/code-generator v0.0.0-20221207014637-08edc9c26591 h1:Dh/ADZ7eCZsuyBIhHchCebSX4ed1VR6/9ZhZagt/w1c=
k8s.io/code-generator v0.0.0-20221207014637-08edc9c26591/go.mod h1:aDxzxJynLKQkaa117y0FFcgZ5jG8+GobxZ2JUntmvKk=
k8s.io/component-base v0.0.0-20221207023111-de5bbf2169a4 h1:HbieytmZytCaa/9ZEj/j9XuXGoBjhYwtmsuoW0wjO2o=
k8s.io/component-base v0.0.0-20221207023111-de5bbf2169a4/go.mod h1:PJrFXl0R/ChoVCDG2Ny4TCiQDCaJ0YFOvBrSSMiJbkU=
k8s.io/api v0.25.6 h1:LwDY2H6kD/3R8TekJYYaJWOdekNdXDO44eVpX6sNtJA=
k8s.io/api v0.25.6/go.mod h1:bVp01KUcl8VUHFBTJMOknWNo7XvR0cMbeTTuFg1zCUs=
k8s.io/apimachinery v0.25.6 h1:r6KIF2AHwLqFfZ0LcOA3I11SF62YZK83dxj1fn14NOQ=
k8s.io/apimachinery v0.25.6/go.mod h1:1S2i1QHkmxc8+EZCIxe/fX5hpldVXk4gvnJInMEb8D4=
k8s.io/apiserver v0.25.6 h1:32mn8HAlsEl1tpuiVmhAl0YCVkOugjybsJ6l6kf0c8k=
k8s.io/apiserver v0.25.6/go.mod h1:IEp2B2/FvQ8GmdspscUoUS0iFF/GGc6NVrJ/cTM4OaA=
k8s.io/client-go v0.25.6 h1:CHxACHi0DijmlYyUR7ooZoXnD5P8jYLgBHcxp775x/U=
k8s.io/client-go v0.25.6/go.mod h1:s9mMAGFYiH3Z66j7BESzu0GEradT9GQ2LjFf/YRrnyc=
k8s.io/code-generator v0.25.6 h1:md8jqhQiMqos8WaTY0ZxhDk8ttlmJl/ijCneJ8ahBNQ=
k8s.io/code-generator v0.25.6/go.mod h1:aDxzxJynLKQkaa117y0FFcgZ5jG8+GobxZ2JUntmvKk=
k8s.io/component-base v0.25.6 h1:v3ci6FbXFcxpjyQJaaLq0MgzT3vyFzwUDWtO+KRv9Bk=
k8s.io/component-base v0.25.6/go.mod h1:k7DfcfJ8cOI6A2xTCfU5LxsnXV+lWw1ME8cRCHzIh6o=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@@ -865,8 +865,8 @@ k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 h1:LYqFq+6Cj2D0gFfrJvL7iElD4ET6ir3VDdhDdTK7rgc=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSNf2tZC7aMibXEqVhCd73GOY5fJikn8qbdzemB0=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 h1:+xBL5uTc+BkPBwmMi3vYfUJjq+N3K+H6PXeETwf5cPI=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35/go.mod h1:WxjusMwXlKzfAs4p9km6XJRndVt2FROgMVCE4cdohFo=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=