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

Commits on Aug 8, 2023

  1. Avoid returning nil responseKind in v1beta1 aggregated discovery 

    Kubernetes-commit: fc529b6d0c93caa5fb5c94dcab80bc8943216f6b
    @liggitt @k8s-publishing-bot
    liggitt authored and k8s-publishing-bot committed Aug 8, 2023
    Copy the full SHA
    0ea68f4 View commit details

Commits on Aug 10, 2023

  1. Merge pull request #119871 from liggitt/automated-cherry-pick-of-#119… 

    …835-upstream-release-1.26

Automated cherry pick of #119835: Avoid returning nil responseKind in v1beta1 aggregated

Kubernetes-commit: 81c519fc099227707ac2eb73df0fa34759e08c5d
    @k8s-publishing-bot
    k8s-publishing-bot committed Aug 10, 2023
    Copy the full SHA
    191d751 View commit details

Commits on Aug 24, 2023

  1. Update dependencies to v0.26.8 tag

    @k8s-publishing-bot
    k8s-publishing-bot committed Aug 24, 2023
    Copy the full SHA
    1b9e0b9 View commit details
Showing with 8 additions and 8 deletions.
  1. +2 −2 apidiscovery/v2beta1/generated.proto
  2. +2 −2 apidiscovery/v2beta1/types.go
  3. +2 −2 go.mod
  4. +2 −2 go.sum
4 changes: 2 additions & 2 deletions apidiscovery/v2beta1/generated.proto
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apidiscovery/v2beta1/types.go
View file
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ type APIResourceDiscovery struct {
Resource string `json:"resource" protobuf:"bytes,1,opt,name=resource"`
// responseKind describes the group, version, and kind of the serialization schema for the object type this endpoint typically returns.
// APIs may return other objects types at their discretion, such as error conditions, requests for alternate representations, or other operation specific behavior.
// This value will be null if an APIService reports subresources but supports no operations on the parent resource
// This value will be null or empty if an APIService reports subresources but supports no operations on the parent resource
ResponseKind *v1.GroupVersionKind `json:"responseKind,omitempty" protobuf:"bytes,2,opt,name=responseKind"`
// scope indicates the scope of a resource, either Cluster or Namespaced
Scope ResourceScope `json:"scope" protobuf:"bytes,3,opt,name=scope"`
@@ -141,7 +141,7 @@ type APISubresourceDiscovery struct {
// for this resource across all versions.
Subresource string `json:"subresource" protobuf:"bytes,1,opt,name=subresource"`
// responseKind describes the group, version, and kind of the serialization schema for the object type this endpoint typically returns.
// Some subresources do not return normal resources, these will have null return types.
// Some subresources do not return normal resources, these will have null or empty return types.
ResponseKind *v1.GroupVersionKind `json:"responseKind,omitempty" protobuf:"bytes,2,opt,name=responseKind"`
// acceptedTypes describes the kinds that this endpoint accepts.
// Subresources may accept the standard content types or define
4 changes: 2 additions & 2 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/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.0
k8s.io/apimachinery v0.0.0-20230612171130-c23a82e9e261
k8s.io/apimachinery v0.26.8
)

require (
@@ -34,4 +34,4 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230612171130-c23a82e9e261
replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.8
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -81,8 +81,8 @@ 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/apimachinery v0.0.0-20230612171130-c23a82e9e261 h1:e1ALI+iTI9xlG8DENWPhx4uZhrL5O5fU507otSjo9nU=
k8s.io/apimachinery v0.0.0-20230612171130-c23a82e9e261/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
k8s.io/apimachinery v0.26.8 h1:SzpGtRX3/j/Ylg8Eg65Iobpxi9Jz4vOvI0qcBZyPVrM=
k8s.io/apimachinery v0.26.8/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=