Skip to content

Commit

Permalink
Merge pull request #12141 from medyagh/kubernetes_update_thing
Browse files Browse the repository at this point in the history
fix extra line in update kubernetes automation
  • Loading branch information
medyagh authored Aug 6, 2021
2 parents 54d16b7 + 100878e commit dcdedb4
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ conntrack:
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
tcpEstablishedTimeout: 0s
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
tcpCloseWaitTimeout: 0s
tcpCloseWaitTimeout: 0s
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ conntrack:
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
tcpEstablishedTimeout: 0s
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
tcpCloseWaitTimeout: 0s
tcpCloseWaitTimeout: 0s
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ conntrack:
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
tcpEstablishedTimeout: 0s
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
tcpCloseWaitTimeout: 0s
tcpCloseWaitTimeout: 0s
2 changes: 1 addition & 1 deletion hack/update/kubernetes_version/templates/v1beta2/crio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ conntrack:
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
tcpEstablishedTimeout: 0s
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
tcpCloseWaitTimeout: 0s
tcpCloseWaitTimeout: 0s
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ conntrack:
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
tcpEstablishedTimeout: 0s
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
tcpCloseWaitTimeout: 0s
tcpCloseWaitTimeout: 0s
2 changes: 1 addition & 1 deletion hack/update/kubernetes_version/templates/v1beta2/dns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ conntrack:
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
tcpEstablishedTimeout: 0s
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
tcpCloseWaitTimeout: 0s
tcpCloseWaitTimeout: 0s
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ conntrack:
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
tcpEstablishedTimeout: 0s
# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
tcpCloseWaitTimeout: 0s
tcpCloseWaitTimeout: 0s

0 comments on commit dcdedb4

Please sign in to comment.