diff --git a/docs/api-reference/admissionregistration.k8s.io/v1alpha1/definitions.html b/docs/api-reference/admissionregistration.k8s.io/v1alpha1/definitions.html index d351ff01d6b..2fbc1a8bc7f 100755 --- a/docs/api-reference/admissionregistration.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/admissionregistration.k8s.io/v1alpha1/definitions.html @@ -1757,7 +1757,7 @@ Examples:
diff --git a/docs/api-reference/admissionregistration.k8s.io/v1alpha1/operations.html b/docs/api-reference/admissionregistration.k8s.io/v1alpha1/operations.html index 8c8bbbf32fe..0cb018c9265 100755 --- a/docs/api-reference/admissionregistration.k8s.io/v1alpha1/operations.html +++ b/docs/api-reference/admissionregistration.k8s.io/v1alpha1/operations.html @@ -2957,7 +2957,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html index 59a04e659a0..5c1bddd7cfc 100755 --- a/docs/api-reference/apps/v1beta1/definitions.html +++ b/docs/api-reference/apps/v1beta1/definitions.html @@ -6807,7 +6807,7 @@ Examples:
diff --git a/docs/api-reference/apps/v1beta1/operations.html b/docs/api-reference/apps/v1beta1/operations.html index a6e64a6a715..42a491d048a 100755 --- a/docs/api-reference/apps/v1beta1/operations.html +++ b/docs/api-reference/apps/v1beta1/operations.html @@ -6634,7 +6634,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/authentication.k8s.io/v1/definitions.html b/docs/api-reference/authentication.k8s.io/v1/definitions.html index 84e2afc7da7..e31e008db4f 100755 --- a/docs/api-reference/authentication.k8s.io/v1/definitions.html +++ b/docs/api-reference/authentication.k8s.io/v1/definitions.html @@ -1264,7 +1264,7 @@ Examples:
diff --git a/docs/api-reference/authentication.k8s.io/v1/operations.html b/docs/api-reference/authentication.k8s.io/v1/operations.html index b623742cc32..f00b76908af 100755 --- a/docs/api-reference/authentication.k8s.io/v1/operations.html +++ b/docs/api-reference/authentication.k8s.io/v1/operations.html @@ -558,7 +558,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html b/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html index f1cbb4c2712..20cf0c87c7f 100755 --- a/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html @@ -1264,7 +1264,7 @@ Examples:
diff --git a/docs/api-reference/authentication.k8s.io/v1beta1/operations.html b/docs/api-reference/authentication.k8s.io/v1beta1/operations.html index 9f17e6af5d2..3fc7e5c23d2 100755 --- a/docs/api-reference/authentication.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/authentication.k8s.io/v1beta1/operations.html @@ -558,7 +558,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/authorization.k8s.io/v1/definitions.html b/docs/api-reference/authorization.k8s.io/v1/definitions.html index dad23294602..618a075ea52 100755 --- a/docs/api-reference/authorization.k8s.io/v1/definitions.html +++ b/docs/api-reference/authorization.k8s.io/v1/definitions.html @@ -1525,7 +1525,7 @@ Examples:
diff --git a/docs/api-reference/authorization.k8s.io/v1/operations.html b/docs/api-reference/authorization.k8s.io/v1/operations.html index 5a6d999a1c3..ac7f8387796 100755 --- a/docs/api-reference/authorization.k8s.io/v1/operations.html +++ b/docs/api-reference/authorization.k8s.io/v1/operations.html @@ -788,7 +788,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html b/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html index 12239574734..95c7d6039e1 100755 --- a/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html @@ -1525,7 +1525,7 @@ Examples:
diff --git a/docs/api-reference/authorization.k8s.io/v1beta1/operations.html b/docs/api-reference/authorization.k8s.io/v1beta1/operations.html index 94570a3f76e..b683a212c94 100755 --- a/docs/api-reference/authorization.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/authorization.k8s.io/v1beta1/operations.html @@ -788,7 +788,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/autoscaling/v1/definitions.html b/docs/api-reference/autoscaling/v1/definitions.html index b502344f579..5a8a9746248 100755 --- a/docs/api-reference/autoscaling/v1/definitions.html +++ b/docs/api-reference/autoscaling/v1/definitions.html @@ -1505,7 +1505,7 @@ Examples:
diff --git a/docs/api-reference/autoscaling/v1/operations.html b/docs/api-reference/autoscaling/v1/operations.html index f2dcf09902e..89b4b8a675a 100755 --- a/docs/api-reference/autoscaling/v1/operations.html +++ b/docs/api-reference/autoscaling/v1/operations.html @@ -2467,7 +2467,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/autoscaling/v2alpha1/definitions.html b/docs/api-reference/autoscaling/v2alpha1/definitions.html index 345db45d20f..70a3f818f37 100755 --- a/docs/api-reference/autoscaling/v2alpha1/definitions.html +++ b/docs/api-reference/autoscaling/v2alpha1/definitions.html @@ -1958,7 +1958,7 @@ Examples:
diff --git a/docs/api-reference/autoscaling/v2alpha1/operations.html b/docs/api-reference/autoscaling/v2alpha1/operations.html index f6b1f3f2262..c277e293c7b 100755 --- a/docs/api-reference/autoscaling/v2alpha1/operations.html +++ b/docs/api-reference/autoscaling/v2alpha1/operations.html @@ -2467,7 +2467,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html index 0d33da76911..a8918dace4f 100755 --- a/docs/api-reference/batch/v1/definitions.html +++ b/docs/api-reference/batch/v1/definitions.html @@ -5788,7 +5788,7 @@ Examples:
diff --git a/docs/api-reference/batch/v1/operations.html b/docs/api-reference/batch/v1/operations.html index 1bc05d12775..4fd020fb213 100755 --- a/docs/api-reference/batch/v1/operations.html +++ b/docs/api-reference/batch/v1/operations.html @@ -2467,7 +2467,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/batch/v2alpha1/definitions.html b/docs/api-reference/batch/v2alpha1/definitions.html index 823975bfc9a..d6efc1b8e3e 100755 --- a/docs/api-reference/batch/v2alpha1/definitions.html +++ b/docs/api-reference/batch/v2alpha1/definitions.html @@ -5884,7 +5884,7 @@ Examples:
diff --git a/docs/api-reference/batch/v2alpha1/operations.html b/docs/api-reference/batch/v2alpha1/operations.html index a1ce457b5a8..686480d8174 100755 --- a/docs/api-reference/batch/v2alpha1/operations.html +++ b/docs/api-reference/batch/v2alpha1/operations.html @@ -4487,7 +4487,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/certificates.k8s.io/v1beta1/definitions.html b/docs/api-reference/certificates.k8s.io/v1beta1/definitions.html index 7f51eb78b68..2a47cb4534f 100755 --- a/docs/api-reference/certificates.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/certificates.k8s.io/v1beta1/definitions.html @@ -1501,7 +1501,7 @@ Examples:
diff --git a/docs/api-reference/certificates.k8s.io/v1beta1/operations.html b/docs/api-reference/certificates.k8s.io/v1beta1/operations.html index 19330a62b9f..5bf3b0b9f60 100755 --- a/docs/api-reference/certificates.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/certificates.k8s.io/v1beta1/operations.html @@ -1940,7 +1940,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index 910ee2e7d68..6e89ba19e49 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -8224,7 +8224,7 @@ Both these may change in the future. Incoming requests are matched against the h diff --git a/docs/api-reference/extensions/v1beta1/operations.html b/docs/api-reference/extensions/v1beta1/operations.html index 76eb2af46d3..d51388f77f6 100755 --- a/docs/api-reference/extensions/v1beta1/operations.html +++ b/docs/api-reference/extensions/v1beta1/operations.html @@ -13942,7 +13942,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/networking.k8s.io/v1/definitions.html b/docs/api-reference/networking.k8s.io/v1/definitions.html index 5b23d173e0c..955ff174bd9 100755 --- a/docs/api-reference/networking.k8s.io/v1/definitions.html +++ b/docs/api-reference/networking.k8s.io/v1/definitions.html @@ -1590,7 +1590,7 @@ Examples:
diff --git a/docs/api-reference/networking.k8s.io/v1/operations.html b/docs/api-reference/networking.k8s.io/v1/operations.html index 83f67df932f..c5070372a00 100755 --- a/docs/api-reference/networking.k8s.io/v1/operations.html +++ b/docs/api-reference/networking.k8s.io/v1/operations.html @@ -2088,7 +2088,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/policy/v1beta1/definitions.html b/docs/api-reference/policy/v1beta1/definitions.html index 185b0156d38..8841ef89a41 100755 --- a/docs/api-reference/policy/v1beta1/definitions.html +++ b/docs/api-reference/policy/v1beta1/definitions.html @@ -1546,7 +1546,7 @@ Examples:
diff --git a/docs/api-reference/policy/v1beta1/operations.html b/docs/api-reference/policy/v1beta1/operations.html index 443176ab151..db44437c6c4 100755 --- a/docs/api-reference/policy/v1beta1/operations.html +++ b/docs/api-reference/policy/v1beta1/operations.html @@ -2467,7 +2467,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html index cec3d3768f0..319f3ae3f99 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html @@ -1860,7 +1860,7 @@ Examples:
diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html index 6dd1b9f2d93..c4d6698061b 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html @@ -6175,7 +6175,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1beta1/definitions.html b/docs/api-reference/rbac.authorization.k8s.io/v1beta1/definitions.html index dc757a2a4a2..31c4fa76915 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1beta1/definitions.html @@ -1860,7 +1860,7 @@ Examples:
diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1beta1/operations.html b/docs/api-reference/rbac.authorization.k8s.io/v1beta1/operations.html index 14a98b97f5f..2d54ce4afc6 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1beta1/operations.html @@ -6175,7 +6175,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html b/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html index f18f9a2285d..85ab797aab5 100755 --- a/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html @@ -4026,7 +4026,7 @@ Examples:
diff --git a/docs/api-reference/settings.k8s.io/v1alpha1/operations.html b/docs/api-reference/settings.k8s.io/v1alpha1/operations.html index ad1e8187cb9..fd25c6039df 100755 --- a/docs/api-reference/settings.k8s.io/v1alpha1/operations.html +++ b/docs/api-reference/settings.k8s.io/v1alpha1/operations.html @@ -2088,7 +2088,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/storage.k8s.io/v1/definitions.html b/docs/api-reference/storage.k8s.io/v1/definitions.html index 7103adfa54c..a230d5d93ae 100755 --- a/docs/api-reference/storage.k8s.io/v1/definitions.html +++ b/docs/api-reference/storage.k8s.io/v1/definitions.html @@ -1343,7 +1343,7 @@ Examples:
diff --git a/docs/api-reference/storage.k8s.io/v1/operations.html b/docs/api-reference/storage.k8s.io/v1/operations.html index 42e0e859c46..2c56521b1dc 100755 --- a/docs/api-reference/storage.k8s.io/v1/operations.html +++ b/docs/api-reference/storage.k8s.io/v1/operations.html @@ -1702,7 +1702,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html index c55516cc883..f45beab60ca 100755 --- a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html @@ -1343,7 +1343,7 @@ Examples:
diff --git a/docs/api-reference/storage.k8s.io/v1beta1/operations.html b/docs/api-reference/storage.k8s.io/v1beta1/operations.html index 963387a4dc7..e636d1ffcef 100755 --- a/docs/api-reference/storage.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/storage.k8s.io/v1beta1/operations.html @@ -1702,7 +1702,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index 2814253ebb2..ee7015002b3 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -10250,7 +10250,7 @@ Examples:
diff --git a/docs/api-reference/v1/operations.html b/docs/api-reference/v1/operations.html index c0bb2debda0..c3ba24f06e4 100755 --- a/docs/api-reference/v1/operations.html +++ b/docs/api-reference/v1/operations.html @@ -35281,7 +35281,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/federation/docs/api-reference/extensions/v1beta1/definitions.html b/federation/docs/api-reference/extensions/v1beta1/definitions.html index cda4f919b2b..bb6bfef75a8 100755 --- a/federation/docs/api-reference/extensions/v1beta1/definitions.html +++ b/federation/docs/api-reference/extensions/v1beta1/definitions.html @@ -7294,7 +7294,7 @@ Both these may change in the future. Incoming requests are matched against the h diff --git a/federation/docs/api-reference/extensions/v1beta1/operations.html b/federation/docs/api-reference/extensions/v1beta1/operations.html index 3bb1260a62f..da93177555b 100755 --- a/federation/docs/api-reference/extensions/v1beta1/operations.html +++ b/federation/docs/api-reference/extensions/v1beta1/operations.html @@ -9412,7 +9412,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/federation/docs/api-reference/federation/v1beta1/definitions.html b/federation/docs/api-reference/federation/v1beta1/definitions.html index b3ef5f44e2e..2d726cbba9d 100755 --- a/federation/docs/api-reference/federation/v1beta1/definitions.html +++ b/federation/docs/api-reference/federation/v1beta1/definitions.html @@ -1573,7 +1573,7 @@ Examples:
diff --git a/federation/docs/api-reference/federation/v1beta1/operations.html b/federation/docs/api-reference/federation/v1beta1/operations.html index 9797794cfd7..96b8e343a75 100755 --- a/federation/docs/api-reference/federation/v1beta1/operations.html +++ b/federation/docs/api-reference/federation/v1beta1/operations.html @@ -1821,7 +1821,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/federation/docs/api-reference/v1/definitions.html b/federation/docs/api-reference/v1/definitions.html index 79f0b083f1b..eb45dffacdb 100755 --- a/federation/docs/api-reference/v1/definitions.html +++ b/federation/docs/api-reference/v1/definitions.html @@ -2338,7 +2338,7 @@ Examples:
diff --git a/federation/docs/api-reference/v1/operations.html b/federation/docs/api-reference/v1/operations.html index 766c3fdbf1b..f2ca3958161 100755 --- a/federation/docs/api-reference/v1/operations.html +++ b/federation/docs/api-reference/v1/operations.html @@ -8968,7 +8968,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/hack/lib/swagger.sh b/hack/lib/swagger.sh index bea1a5f7187..d5c6a6df485 100644 --- a/hack/lib/swagger.sh +++ b/hack/lib/swagger.sh @@ -127,13 +127,25 @@ kube::swagger::gen_api_ref_docs() { find . -type f | cut -sd / -f 2- | LC_ALL=C sort > .generated_html popd > /dev/null + if LANG=C sed --help 2>&1 | grep -q GNU; then + SED="sed" + elif which gsed &>/dev/null; then + SED="gsed" + else + echo "Failed to find GNU sed as sed or gsed. If you are on Mac: brew install gnu-sed." >&2 + exit 1 + fi + while read file; do if [[ -e "${output_dir}/${file}" && -e "${output_tmp}/${file}" ]]; then echo "comparing ${output_dir}/${file} with ${output_tmp}/${file}" + # Remove the timestamp to reduce conflicts in PR(s) + $SED -i 's/^Last updated.*$//' "${output_tmp}/${file}" + # By now, the contents should be normalized and stripped of any # auto-managed content. - if diff -NauprB -I 'Last update' "${output_dir}/${file}" "${output_tmp}/${file}" >/dev/null; then + if diff -NauprB "${output_dir}/${file}" "${output_tmp}/${file}" >/dev/null; then # actual contents same, overwrite generated with original. cp "${output_dir}/${file}" "${output_tmp}/${file}" fi