From 04d51a327fe03673b62168e6e8c71d47629a1bf9 Mon Sep 17 00:00:00 2001 From: Tongyao Si Date: Thu, 18 Apr 2024 08:28:31 +0000 Subject: [PATCH] chore: make generate after merging master branch --- .../testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData | 4 ++-- .../testdata/AKSUbuntu2204+IMDSRestrictionOff/line127.sh | 2 ++ .../testdata/AKSUbuntu2204+IMDSRestrictionOff/line77.sh | 5 ++++- .../CustomData | 4 ++-- .../line127.sh | 2 ++ .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line77.sh | 5 ++++- .../CustomData | 4 ++-- .../line127.sh | 2 ++ .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line77.sh | 5 ++++- 9 files changed, 24 insertions(+), 9 deletions(-) diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index 879b262d79e..97950e63cad 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== + H4sIAAAAAAAA/8STX2/aMBTF3/kUUcbbFruhq/jzFsBT0VioUjJpmqbIid3WWrCR48BWlO8+2RskMJNOa6W+Hh/73nPvz7uO4ziOmwmuMONUEnfk/NaMfsdyGuIVdUeOuxLpT682Jt3dZBEug1mIomnyGUW3s0VYvcWPpaTe0dlNsJxcHxyA0NR9V5cgYstzgclcZFgxwXUpKNYK1qXg3lPYLsbRXN95UGpdjCDUbYI0FynIhKRgyzgR2wJwqswRPIkBW2LA7i4ex+EyTiaLKQqDT6iCOePlD539Jk6CaHJdnT7YOpcyLbkqD89GaI6CW1SVLfNq1jqd3YbKggleuCPn67eGvmac0+NVGt0fXLzXs/JBH/ie7x5Oq8ZlSu7pwXS1d/1xuLLk2ROMaEvS3UVxODmX35z9e86zjOhSL0+HedUaAKZMcJado+Dlk///hn3g9+wLZrxQOM9t1wm9w2WurC8cYcA3jDBcY6+jK2YgOIPGU/tsWd7ZgdhaIpJpzys28r1MqeRU0ZYmao/HBaGeAcrDMnsACktw//iMLves46zwVkxKIYFhUH9sQ3pdHG66OwMjmiYf4zFKxrMwiL4c0IQp41gyWkB7w01y/+67OaITTEGvD/oNb60Orarfs8gDcGlVr6zqwKIOwYVVtVUbgsv6NxxvPFF0tc6xehX8O1XnDVp86PwKAAD//0Sfi7XLBwAA - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" @@ -124,7 +124,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line127.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line127.sh index cbfa6afe707..7605397f84c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line127.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line127.sh @@ -52,6 +52,8 @@ if [ -z "${node_name}" ]; then exit 1 fi +node_name=$(echo "$node_name" | tr '[:upper:]' '[:lower:]') + golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") if [ -z "${golden_timestamp}" ]; then echo "golden timestamp is not set, skip live patching" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line77.sh index 00f8c61bc74..6067fa07049 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line77.sh @@ -40,10 +40,13 @@ "versions": [ "1.27.7", "1.27.9", + "1.27.12", "1.28.3", "1.28.5", + "1.28.8", "1.29.0", - "1.29.2" + "1.29.2", + "1.29.3" ] }, "_template": { diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index 879b262d79e..97950e63cad 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== + H4sIAAAAAAAA/8STX2/aMBTF3/kUUcbbFruhq/jzFsBT0VioUjJpmqbIid3WWrCR48BWlO8+2RskMJNOa6W+Hh/73nPvz7uO4ziOmwmuMONUEnfk/NaMfsdyGuIVdUeOuxLpT682Jt3dZBEug1mIomnyGUW3s0VYvcWPpaTe0dlNsJxcHxyA0NR9V5cgYstzgclcZFgxwXUpKNYK1qXg3lPYLsbRXN95UGpdjCDUbYI0FynIhKRgyzgR2wJwqswRPIkBW2LA7i4ex+EyTiaLKQqDT6iCOePlD539Jk6CaHJdnT7YOpcyLbkqD89GaI6CW1SVLfNq1jqd3YbKggleuCPn67eGvmac0+NVGt0fXLzXs/JBH/ie7x5Oq8ZlSu7pwXS1d/1xuLLk2ROMaEvS3UVxODmX35z9e86zjOhSL0+HedUaAKZMcJado+Dlk///hn3g9+wLZrxQOM9t1wm9w2WurC8cYcA3jDBcY6+jK2YgOIPGU/tsWd7ZgdhaIpJpzys28r1MqeRU0ZYmao/HBaGeAcrDMnsACktw//iMLves46zwVkxKIYFhUH9sQ3pdHG66OwMjmiYf4zFKxrMwiL4c0IQp41gyWkB7w01y/+67OaITTEGvD/oNb60Orarfs8gDcGlVr6zqwKIOwYVVtVUbgsv6NxxvPFF0tc6xehX8O1XnDVp86PwKAAD//0Sfi7XLBwAA - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" @@ -124,7 +124,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line127.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line127.sh index cbfa6afe707..7605397f84c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line127.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line127.sh @@ -52,6 +52,8 @@ if [ -z "${node_name}" ]; then exit 1 fi +node_name=$(echo "$node_name" | tr '[:upper:]' '[:lower:]') + golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") if [ -z "${golden_timestamp}" ]; then echo "golden timestamp is not set, skip live patching" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line77.sh index 00f8c61bc74..6067fa07049 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line77.sh @@ -40,10 +40,13 @@ "versions": [ "1.27.7", "1.27.9", + "1.27.12", "1.28.3", "1.28.5", + "1.28.8", "1.29.0", - "1.29.2" + "1.29.2", + "1.29.3" ] }, "_template": { diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index 879b262d79e..97950e63cad 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== + H4sIAAAAAAAA/8STX2/aMBTF3/kUUcbbFruhq/jzFsBT0VioUjJpmqbIid3WWrCR48BWlO8+2RskMJNOa6W+Hh/73nPvz7uO4ziOmwmuMONUEnfk/NaMfsdyGuIVdUeOuxLpT682Jt3dZBEug1mIomnyGUW3s0VYvcWPpaTe0dlNsJxcHxyA0NR9V5cgYstzgclcZFgxwXUpKNYK1qXg3lPYLsbRXN95UGpdjCDUbYI0FynIhKRgyzgR2wJwqswRPIkBW2LA7i4ex+EyTiaLKQqDT6iCOePlD539Jk6CaHJdnT7YOpcyLbkqD89GaI6CW1SVLfNq1jqd3YbKggleuCPn67eGvmac0+NVGt0fXLzXs/JBH/ie7x5Oq8ZlSu7pwXS1d/1xuLLk2ROMaEvS3UVxODmX35z9e86zjOhSL0+HedUaAKZMcJado+Dlk///hn3g9+wLZrxQOM9t1wm9w2WurC8cYcA3jDBcY6+jK2YgOIPGU/tsWd7ZgdhaIpJpzys28r1MqeRU0ZYmao/HBaGeAcrDMnsACktw//iMLves46zwVkxKIYFhUH9sQ3pdHG66OwMjmiYf4zFKxrMwiL4c0IQp41gyWkB7w01y/+67OaITTEGvD/oNb60Orarfs8gDcGlVr6zqwKIOwYVVtVUbgsv6NxxvPFF0tc6xehX8O1XnDVp86PwKAAD//0Sfi7XLBwAA - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" @@ -124,7 +124,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line127.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line127.sh index cbfa6afe707..7605397f84c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line127.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line127.sh @@ -52,6 +52,8 @@ if [ -z "${node_name}" ]; then exit 1 fi +node_name=$(echo "$node_name" | tr '[:upper:]' '[:lower:]') + golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") if [ -z "${golden_timestamp}" ]; then echo "golden timestamp is not set, skip live patching" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line77.sh index 00f8c61bc74..6067fa07049 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line77.sh @@ -40,10 +40,13 @@ "versions": [ "1.27.7", "1.27.9", + "1.27.12", "1.28.3", "1.28.5", + "1.28.8", "1.29.0", - "1.29.2" + "1.29.2", + "1.29.3" ] }, "_template": {