Skip to content

Commit

Permalink
Merge pull request #119115 from champtar/automated-cherry-pick-of-#11…
Browse files Browse the repository at this point in the history
…8922-upstream-release-1.25

Automated cherry pick of #118922: kubeadm: backdate generated CAs

Kubernetes-commit: bc9e637fbbed4ec8c3c40f80c1d1a8c5e2e27494
  • Loading branch information
k8s-publishing-bot committed Aug 2, 2023
1 parent a164035 commit d98cb4d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ require (
golang.org/x/term v0.6.0
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
google.golang.org/protobuf v1.28.0
k8s.io/api v0.0.0-20230612171829-7d661598ac70
k8s.io/apimachinery v0.0.0-20230612170954-99ba49d7333b
k8s.io/api v0.0.0-20230711060958-01e0753b4eb3
k8s.io/apimachinery v0.0.0-20230716211106-bff197a59a0b
k8s.io/klog/v2 v2.70.1
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
Expand Down Expand Up @@ -70,6 +70,6 @@ require (
)

replace (
k8s.io/api => k8s.io/api v0.0.0-20230612171829-7d661598ac70
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230612170954-99ba49d7333b
k8s.io/api => k8s.io/api v0.0.0-20230711060958-01e0753b4eb3
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230716211106-bff197a59a0b
)
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -668,10 +668,10 @@ 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-20230612171829-7d661598ac70 h1:vl24VT82zYGAoZkk+hmATp4TPn0IiOu44d3OIXMcqkw=
k8s.io/api v0.0.0-20230612171829-7d661598ac70/go.mod h1:5aIU8C8y3CxOt8lDbZ9HI1lb0Vf+fHhBUptudGC1aj8=
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/api v0.0.0-20230711060958-01e0753b4eb3 h1:SoGEfJET2EViMrxBtG1VQXIuBVIFQPVuZ/PJoxjm2BU=
k8s.io/api v0.0.0-20230711060958-01e0753b4eb3/go.mod h1:5aIU8C8y3CxOt8lDbZ9HI1lb0Vf+fHhBUptudGC1aj8=
k8s.io/apimachinery v0.0.0-20230716211106-bff197a59a0b h1:CMHjuRhddJdWiGL6FtpL5qT/zE4pTmL9b8sYO/T9Il4=
k8s.io/apimachinery v0.0.0-20230716211106-bff197a59a0b/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=
Expand Down

0 comments on commit d98cb4d

Please sign in to comment.