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.25.13
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.25.14
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: 2cac08a7db805571d8a0e8436476ddc5bd2a3e40
    @mimowo @k8s-publishing-bot
    mimowo authored and k8s-publishing-bot committed Aug 28, 2023
    Copy the full SHA
    692d06c View commit details

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

    …04-upstream-release-1.25

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

Kubernetes-commit: 6624d51fa6998837e5ff17fb2defaa1be3f5f9e8
    @k8s-publishing-bot
    k8s-publishing-bot committed Aug 28, 2023
    Copy the full SHA
    6136871 View commit details

Commits on Sep 13, 2023

  1. Update dependencies to v0.25.14 tag

    @k8s-publishing-bot
    k8s-publishing-bot committed Sep 13, 2023
    Copy the full SHA
    06b008b 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
@@ -187,6 +187,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.19
require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.0
k8s.io/apimachinery v0.0.0-20230612170954-99ba49d7333b
k8s.io/apimachinery v0.25.14
)

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

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230612170954-99ba49d7333b
replace k8s.io/apimachinery => k8s.io/apimachinery v0.25.14
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -83,8 +83,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-20230612170954-99ba49d7333b h1:co64EPN9U3r8pUMoJQrS1usYRhkmJTPCYA8iquh5Hh4=
k8s.io/apimachinery v0.0.0-20230612170954-99ba49d7333b/go.mod h1:IFwbcNi3gKkfDhuy0VYu3+BwbxbiIov3p6FR8ge1Epc=
k8s.io/apimachinery v0.25.14 h1:SI5uE46G9GAvEHPGDcbiIaKTGHOX2anWKfBtI7/4ScQ=
k8s.io/apimachinery v0.25.14/go.mod h1:IFwbcNi3gKkfDhuy0VYu3+BwbxbiIov3p6FR8ge1Epc=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=