Merge branch '202205' of https://github.com/Azure/sonic-buildimage in…

…to submodule_update_202205
sonic-net · Mar 20, 2023 · 16dacb2 · 16dacb2
2 parents 2786eb6 + 19a89aa
commit 16dacb2
Show file tree

Hide file tree

Showing 115 changed files with 2,267 additions and 728 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -23,6 +23,7 @@
 [submodule "sonic-dbsyncd"]
 	path = src/sonic-dbsyncd
 	url = https://github.com/sonic-net/sonic-dbsyncd
+	branch = 202205
 [submodule "src/sonic-py-swsssdk"]
 	path = src/sonic-py-swsssdk
 	url = https://github.com/sonic-net/sonic-py-swsssdk.git

diff --git a/Makefile.work b/Makefile.work
@@ -357,6 +357,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
                            INCLUDE_KUBERNETES=$(INCLUDE_KUBERNETES) \
                            KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
+                           KUBERNETES_CNI_VERSION=$(KUBERNETES_CNI_VERSION) \
                            K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \
                            INCLUDE_KUBERNETES_MASTER=$(INCLUDE_KUBERNETES_MASTER) \
                            SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \

diff --git a/build_debian.sh b/build_debian.sh
@@ -260,6 +260,7 @@ install_kubernetes () {
     ## Check out the sources list update matches current Debian version
     sudo cp files/image_config/kubernetes/kubernetes.list $FILESYSTEM_ROOT/etc/apt/sources.list.d/
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubernetes-cni=${KUBERNETES_CNI_VERSION}
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubelet=${ver}
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubectl=${ver}
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubeadm=${ver}

diff --git a/device/arista/x86_64-arista_720dt_48s/platform_components.json b/device/arista/x86_64-arista_720dt_48s/platform_components.json
@@ -12,6 +12,18 @@
                 "Scd(addr=0000:00:18.7)": {}
             }
         },
+        "CCS-720DT-48S-2R": {
+            "component": {
+                "Aboot()": {},
+                "Scd(addr=0000:00:18.7)": {}
+            }
+        },
+        "CCS-720DT-48S-2F": {
+            "component": {
+                "Aboot()": {},
+                "Scd(addr=0000:00:18.7)": {}
+            }
+        },
         "CCS-720DT-48S-2R": {
             "component": {
                 "Aboot()": {},

diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/platform_components.json b/device/arista/x86_64-arista_7800r3_48cq2_lc/platform_components.json
@@ -0,0 +1,11 @@
+{
+    "chassis": {
+        "7800R3-48CQ2-LC": {
+            "component": {
+                "Aboot()": {},
+                "Scd(addr=0000:00:18.7)": {},
+                "Scd(addr=0000:07:00.0)": {}
+            }
+        }
+    }
+}
diff --git a/device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_components.json b/device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_components.json
@@ -0,0 +1,11 @@
+{
+    "chassis": {
+        "7800R3-48CQM2-LC": {
+            "component": {
+                "Aboot()": {},
+                "Scd(addr=0000:00:18.7)": {},
+                "Scd(addr=0000:07:00.0)": {}
+            }
+        }
+    }
+}
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -251,17 +251,6 @@ tm_port_header_type_out_202=ETH
 tm_port_header_type_in_203=INJECTED_2_PP
 tm_port_header_type_out_203=ETH
 
-### SAT
-## Enable SAT Interface. 0 - Disable, 1 - Enable (Default) 
-sat_enable=1
-ucode_port_218=SAT:core_0.218
-tm_port_header_type_out_218=CPU
-tm_port_header_type_in_218=INJECTED_2
-ucode_port_219=SAT:core_1.219
-tm_port_header_type_out_219=CPU
-tm_port_header_type_in_219=INJECTED_2
-port_init_speed_sat=400000
-
 ### RCY
 sai_recycle_port_lane_base=200
 ucode_port_49=RCY0:core_0.49

diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -251,17 +251,6 @@ tm_port_header_type_out_202=ETH
 tm_port_header_type_in_203=INJECTED_2_PP
 tm_port_header_type_out_203=ETH
 
-### SAT
-## Enable SAT Interface. 0 - Disable, 1 - Enable (Default) 
-sat_enable=1
-ucode_port_218=SAT:core_0.218
-tm_port_header_type_out_218=CPU
-tm_port_header_type_in_218=INJECTED_2
-ucode_port_219=SAT:core_1.219
-tm_port_header_type_out_219=CPU
-tm_port_header_type_in_219=INJECTED_2
-port_init_speed_sat=400000
-
 ### RCY
 sai_recycle_port_lane_base=200
 ucode_port_49=RCY0:core_0.49

diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -269,17 +269,6 @@ tm_port_header_type_out_202=ETH
 tm_port_header_type_in_203=INJECTED_2_PP
 tm_port_header_type_out_203=ETH
 
-### SAT
-## Enable SAT Interface. 0 - Disable, 1 - Enable (Default) 
-sat_enable=1
-ucode_port_218=SAT:core_0.218
-tm_port_header_type_out_218=CPU
-tm_port_header_type_in_218=INJECTED_2
-ucode_port_219=SAT:core_1.219
-tm_port_header_type_out_219=CPU
-tm_port_header_type_in_219=INJECTED_2
-port_init_speed_sat=400000
-
 ### RCY
 sai_recycle_port_lane_base=0
 ucode_port_221=RCY.21:core_0.221

diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -269,17 +269,6 @@ tm_port_header_type_out_202=ETH
 tm_port_header_type_in_203=INJECTED_2_PP
 tm_port_header_type_out_203=ETH
 
-### SAT
-## Enable SAT Interface. 0 - Disable, 1 - Enable (Default) 
-sat_enable=1
-ucode_port_218=SAT:core_0.218
-tm_port_header_type_out_218=CPU
-tm_port_header_type_in_218=INJECTED_2
-ucode_port_219=SAT:core_1.219
-tm_port_header_type_out_219=CPU
-tm_port_header_type_in_219=INJECTED_2
-port_init_speed_sat=400000
-
 ### RCY
 sai_recycle_port_lane_base=0
 ucode_port_221=RCY.21:core_0.221

diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -251,17 +251,6 @@ tm_port_header_type_out_202=ETH
 tm_port_header_type_in_203=INJECTED_2_PP
 tm_port_header_type_out_203=ETH
 
-### SAT
-## Enable SAT Interface. 0 - Disable, 1 - Enable (Default) 
-sat_enable=1
-ucode_port_218=SAT:core_0.218
-tm_port_header_type_out_218=CPU
-tm_port_header_type_in_218=INJECTED_2
-ucode_port_219=SAT:core_1.219
-tm_port_header_type_out_219=CPU
-tm_port_header_type_in_219=INJECTED_2
-port_init_speed_sat=400000
-
 ### RCY
 sai_recycle_port_lane_base=200
 ucode_port_49=RCY0:core_0.49

diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -251,17 +251,6 @@ tm_port_header_type_out_202=ETH
 tm_port_header_type_in_203=INJECTED_2_PP
 tm_port_header_type_out_203=ETH
 
-### SAT
-## Enable SAT Interface. 0 - Disable, 1 - Enable (Default) 
-sat_enable=1
-ucode_port_218=SAT:core_0.218
-tm_port_header_type_out_218=CPU
-tm_port_header_type_in_218=INJECTED_2
-ucode_port_219=SAT:core_1.219
-tm_port_header_type_out_219=CPU
-tm_port_header_type_in_219=INJECTED_2
-port_init_speed_sat=400000
-
 ### RCY
 sai_recycle_port_lane_base=200
 ucode_port_49=RCY0:core_0.49

diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/platform_components.json b/device/arista/x86_64-arista_7800r3a_36d2_lc/platform_components.json
@@ -0,0 +1,11 @@
+{
+    "chassis": {
+        "7800R3A-36DM2-LC": {
+            "component": {
+                "Aboot()": {},
+                "Scd(addr=0000:00:18.7)": {},
+                "Scd(addr=0000:08:00.0)": {}
+            }
+        }
+    }
+}