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.27.5
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.27.6
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Aug 28, 2023

  1. Mark Job onPodConditions as optional in pod failure policy 

    Kubernetes-commit: 3449ab21b4bde3d947d692a5a25543aafaf448d5
    @mimowo @k8s-publishing-bot
    mimowo authored and k8s-publishing-bot committed Aug 28, 2023
    Copy the full SHA
    62f7673 View commit details

  2. Merge pull request #120209 from mimowo/automated-cherry-pick-of-#1202… 

    …04-upstream-release-1.27

Automated cherry pick of #120204: Mark Job onPodConditions as optional in pod failure policy

Kubernetes-commit: 7c74995186772400741adbd0c920cd2f4315991f
    @k8s-publishing-bot
    k8s-publishing-bot committed Aug 28, 2023
    Copy the full SHA
    acad300 View commit details

Commits on Sep 13, 2023

  1. Update dependencies to v0.27.6 tag

    @k8s-publishing-bot
    k8s-publishing-bot committed Sep 13, 2023
    Copy the full SHA
    6e7eda9 View commit details
Showing with 6 additions and 4 deletions.
  1. +1 −0 batch/v1/generated.proto
  2. +1 −0 batch/v1/types.go
  3. +2 −2 go.mod
  4. +2 −2 go.sum
1 change: 1 addition & 0 deletions batch/v1/generated.proto
View file

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

1 change: 1 addition & 0 deletions batch/v1/types.go
View file
Original file line number Diff line number Diff line change
@@ -202,6 +202,7 @@ type PodFailurePolicyRule struct {
// as a list of pod condition patterns. The requirement is satisfied if at
// least one pattern matches an actual pod condition. At most 20 elements are allowed.
// +listType=atomic
// +optional
OnPodConditions []PodFailurePolicyOnPodConditionsPattern `json:"onPodConditions" protobuf:"bytes,3,opt,name=onPodConditions"`
}

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.20
require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.1
k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153
k8s.io/apimachinery v0.27.6
)

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

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153
replace k8s.io/apimachinery => k8s.io/apimachinery v0.27.6
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -91,8 +91,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-20230716201907-f46cb694b153 h1:x2PSNcoDv7r2/kHjMWs1jAWYQjINJElAVG7B0mEOF2E=
k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/apimachinery v0.27.6 h1:mGU8jmBq5o8mWBov+mLjdTBcU+etTE19waies4AQ6NE=
k8s.io/apimachinery v0.27.6/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=