gerrit.o-ran-sc Code Review - pti/rtp.git/blob

   1 From f3f34146a74eb4e286bb3f626c2ac7d197f4b640 Mon Sep 17 00:00:00 2001
   2 From: Jackie Huang <jackie.huang@windriver.com>
   3 Date: Wed, 8 Feb 2023 03:01:19 -0500
   4 Subject: [PATCH 07/12] kubernetes: add support for arm64
   5
   6 Add arm64 as the supported arch in the control file.
   7
   8 Test Plan:
   9 PASS: build-pkgs on x86-64 host
  10 PASS: build-image on x86-64 host
  11 PASS: build-pkgs on arm64 host
  12 PASS: build-image on arm64 host
  13 PASS: Deploy AIO-SX on x86-64 target
  14 PASS: Deploy AIO-SX on arm64 target
  15 PASS: Deploy AIO-DX on arm64 targets
  16 PASS: Deploy std (2+2+2) on arm64 targets
  17
  18 Story: 2010739
  19 Task: 47981
  20
  21 Change-Id: I04bcb23bc67f0c885e4c1ca99260d27e7e06e023
  22 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  23 ---
  24  .../kubernetes-1.24.4/debian/deb_folder/control      | 12 ++++++------
  25  .../kubernetes-1.25.3/debian/deb_folder/control      | 12 ++++++------
  26  .../kubernetes-1.26.1/debian/deb_folder/control      | 12 ++++++------
  27  .../kubernetes-1.27.5/debian/deb_folder/control      | 12 ++++++------
  28  .../kubernetes-1.28.4/debian/deb_folder/control      | 12 ++++++------
  29  .../kubernetes-1.29.2/debian/deb_folder/control      | 12 ++++++------
  30  6 files changed, 36 insertions(+), 36 deletions(-)
  31
  32 diff --git a/kubernetes/kubernetes-1.24.4/debian/deb_folder/control b/kubernetes/kubernetes-1.24.4/debian/deb_folder/control
  33 index 4635bf47..79bd790d 100644
  34 --- a/kubernetes/kubernetes-1.24.4/debian/deb_folder/control
  35 +++ b/kubernetes/kubernetes-1.24.4/debian/deb_folder/control
  36 @@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/
  37
  38  Package: kubernetes-1.24.4-client
  39  Provides: kubernetes-utils
  40 -Architecture: amd64
  41 +Architecture: amd64 arm64
  42  Depends: ${misc:Depends}, ${shlibs:Depends}
  43  Recommends: ${misc:Recommends}
  44  Built-Using: ${misc:Built-Using}
  45 @@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool
  46   The Kubernetes command line tool for interacting with the Kubernetes API.
  47
  48  Package: kubernetes-1.24.4-master
  49 -Architecture: amd64
  50 +Architecture: amd64 arm64
  51  Depends: ${misc:Depends}, ${shlibs:Depends},
  52          adduser,
  53          lsb-base,
  54 @@ -44,7 +44,7 @@ Description: Kubernetes services for master host
  55
  56  Package: kubernetes-1.24.4-node
  57  Provides: cadvisor
  58 -Architecture: amd64
  59 +Architecture: amd64 arm64
  60  Depends: ${misc:Depends}, ${shlibs:Depends},
  61          adduser,
  62          conntrack,
  63 @@ -64,7 +64,7 @@ Description: Kubernetes services for node host
  64   issues.
  65
  66  Package: kubernetes-1.24.4-kubeadm
  67 -Architecture: amd64
  68 +Architecture: amd64 arm64
  69  Depends: ${misc:Depends}, containernetworking-plugins
  70  Recommends: ${misc:Recommends}, kubernetes-1.24.4-client
  71  Built-Using: ${misc:Built-Using}
  72 @@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool
  73   The Kubernetes command line tool for bootstrapping a Kubernetes cluster.
  74
  75  Package: kubernetes-1.24.4-misc
  76 -Architecture: amd64
  77 +Architecture: amd64 arm64
  78  Depends: ${misc:Depends}, ${shlibs:Depends}
  79  Recommends: ${misc:Recommends}
  80  Built-Using: ${misc:Built-Using}
  81 @@ -80,7 +80,7 @@ Description: dummy package
  82   Kubernetes dummy package for misc stuff we don't want to install in production.
  83
  84  Package: kubernetes-1.24.4-unit-test
  85 -Architecture: amd64
  86 +Architecture: amd64 arm64
  87  Depends: ${misc:Depends}, ${shlibs:Depends},
  88           hostname,
  89           rsync,
  90 diff --git a/kubernetes/kubernetes-1.25.3/debian/deb_folder/control b/kubernetes/kubernetes-1.25.3/debian/deb_folder/control
  91 index 33e2b16e..b441ac79 100644
  92 --- a/kubernetes/kubernetes-1.25.3/debian/deb_folder/control
  93 +++ b/kubernetes/kubernetes-1.25.3/debian/deb_folder/control
  94 @@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/
  95
  96  Package: kubernetes-1.25.3-client
  97  Provides: kubernetes-utils
  98 -Architecture: amd64
  99 +Architecture: amd64 arm64
 100  Depends: ${misc:Depends}, ${shlibs:Depends}
 101  Recommends: ${misc:Recommends}
 102  Built-Using: ${misc:Built-Using}
 103 @@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool
 104   The Kubernetes command line tool for interacting with the Kubernetes API.
 105
 106  Package: kubernetes-1.25.3-master
 107 -Architecture: amd64
 108 +Architecture: amd64 arm64
 109  Depends: ${misc:Depends}, ${shlibs:Depends},
 110          adduser,
 111          lsb-base,
 112 @@ -44,7 +44,7 @@ Description: Kubernetes services for master host
 113
 114  Package: kubernetes-1.25.3-node
 115  Provides: cadvisor
 116 -Architecture: amd64
 117 +Architecture: amd64 arm64
 118  Depends: ${misc:Depends}, ${shlibs:Depends},
 119          adduser,
 120          conntrack,
 121 @@ -64,7 +64,7 @@ Description: Kubernetes services for node host
 122   issues.
 123
 124  Package: kubernetes-1.25.3-kubeadm
 125 -Architecture: amd64
 126 +Architecture: amd64 arm64
 127  Depends: ${misc:Depends}, containernetworking-plugins
 128  Recommends: ${misc:Recommends}, kubernetes-1.25.3-client
 129  Built-Using: ${misc:Built-Using}
 130 @@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool
 131   The Kubernetes command line tool for bootstrapping a Kubernetes cluster.
 132
 133  Package: kubernetes-1.25.3-misc
 134 -Architecture: amd64
 135 +Architecture: amd64 arm64
 136  Depends: ${misc:Depends}, ${shlibs:Depends}
 137  Recommends: ${misc:Recommends}
 138  Built-Using: ${misc:Built-Using}
 139 @@ -80,7 +80,7 @@ Description: dummy package
 140   Kubernetes dummy package for misc stuff we don't want to install in production.
 141
 142  Package: kubernetes-1.25.3-unit-test
 143 -Architecture: amd64
 144 +Architecture: amd64 arm64
 145  Depends: ${misc:Depends}, ${shlibs:Depends},
 146           hostname,
 147           rsync,
 148 diff --git a/kubernetes/kubernetes-1.26.1/debian/deb_folder/control b/kubernetes/kubernetes-1.26.1/debian/deb_folder/control
 149 index 03a3003c..94948c07 100644
 150 --- a/kubernetes/kubernetes-1.26.1/debian/deb_folder/control
 151 +++ b/kubernetes/kubernetes-1.26.1/debian/deb_folder/control
 152 @@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/
 153
 154  Package: kubernetes-1.26.1-client
 155  Provides: kubernetes-utils
 156 -Architecture: amd64
 157 +Architecture: amd64 arm64
 158  Depends: ${misc:Depends}, ${shlibs:Depends}
 159  Recommends: ${misc:Recommends}
 160  Built-Using: ${misc:Built-Using}
 161 @@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool
 162   The Kubernetes command line tool for interacting with the Kubernetes API.
 163
 164  Package: kubernetes-1.26.1-master
 165 -Architecture: amd64
 166 +Architecture: amd64 arm64
 167  Depends: ${misc:Depends}, ${shlibs:Depends},
 168          adduser,
 169          lsb-base,
 170 @@ -44,7 +44,7 @@ Description: Kubernetes services for master host
 171
 172  Package: kubernetes-1.26.1-node
 173  Provides: cadvisor
 174 -Architecture: amd64
 175 +Architecture: amd64 arm64
 176  Depends: ${misc:Depends}, ${shlibs:Depends},
 177          adduser,
 178          conntrack,
 179 @@ -64,7 +64,7 @@ Description: Kubernetes services for node host
 180   issues.
 181
 182  Package: kubernetes-1.26.1-kubeadm
 183 -Architecture: amd64
 184 +Architecture: amd64 arm64
 185  Depends: ${misc:Depends}, containernetworking-plugins
 186  Recommends: ${misc:Recommends}, kubernetes-1.26.1-client
 187  Built-Using: ${misc:Built-Using}
 188 @@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool
 189   The Kubernetes command line tool for bootstrapping a Kubernetes cluster.
 190
 191  Package: kubernetes-1.26.1-misc
 192 -Architecture: amd64
 193 +Architecture: amd64 arm64
 194  Depends: ${misc:Depends}, ${shlibs:Depends}
 195  Recommends: ${misc:Recommends}
 196  Built-Using: ${misc:Built-Using}
 197 @@ -80,7 +80,7 @@ Description: dummy package
 198   Kubernetes dummy package for misc stuff we don't want to install in production.
 199
 200  Package: kubernetes-1.26.1-unit-test
 201 -Architecture: amd64
 202 +Architecture: amd64 arm64
 203  Depends: ${misc:Depends}, ${shlibs:Depends},
 204           hostname,
 205           rsync,
 206 diff --git a/kubernetes/kubernetes-1.27.5/debian/deb_folder/control b/kubernetes/kubernetes-1.27.5/debian/deb_folder/control
 207 index cb1081e6..55bb901e 100644
 208 --- a/kubernetes/kubernetes-1.27.5/debian/deb_folder/control
 209 +++ b/kubernetes/kubernetes-1.27.5/debian/deb_folder/control
 210 @@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/
 211
 212  Package: kubernetes-1.27.5-client
 213  Provides: kubernetes-utils
 214 -Architecture: amd64
 215 +Architecture: amd64 arm64
 216  Depends: ${misc:Depends}, ${shlibs:Depends}
 217  Recommends: ${misc:Recommends}
 218  Built-Using: ${misc:Built-Using}
 219 @@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool
 220   The Kubernetes command line tool for interacting with the Kubernetes API.
 221
 222  Package: kubernetes-1.27.5-master
 223 -Architecture: amd64
 224 +Architecture: amd64 arm64
 225  Depends: ${misc:Depends}, ${shlibs:Depends},
 226          adduser,
 227          lsb-base,
 228 @@ -44,7 +44,7 @@ Description: Kubernetes services for master host
 229
 230  Package: kubernetes-1.27.5-node
 231  Provides: cadvisor
 232 -Architecture: amd64
 233 +Architecture: amd64 arm64
 234  Depends: ${misc:Depends}, ${shlibs:Depends},
 235          adduser,
 236          conntrack,
 237 @@ -64,7 +64,7 @@ Description: Kubernetes services for node host
 238   issues.
 239
 240  Package: kubernetes-1.27.5-kubeadm
 241 -Architecture: amd64
 242 +Architecture: amd64 arm64
 243  Depends: ${misc:Depends}, containernetworking-plugins
 244  Recommends: ${misc:Recommends}, kubernetes-1.27.5-client
 245  Built-Using: ${misc:Built-Using}
 246 @@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool
 247   The Kubernetes command line tool for bootstrapping a Kubernetes cluster.
 248
 249  Package: kubernetes-1.27.5-misc
 250 -Architecture: amd64
 251 +Architecture: amd64 arm64
 252  Depends: ${misc:Depends}, ${shlibs:Depends}
 253  Recommends: ${misc:Recommends}
 254  Built-Using: ${misc:Built-Using}
 255 @@ -80,7 +80,7 @@ Description: dummy package
 256   Kubernetes dummy package for misc stuff we don't want to install in production.
 257
 258  Package: kubernetes-1.27.5-unit-test
 259 -Architecture: amd64
 260 +Architecture: amd64 arm64
 261  Depends: ${misc:Depends}, ${shlibs:Depends},
 262           hostname,
 263           rsync,
 264 diff --git a/kubernetes/kubernetes-1.28.4/debian/deb_folder/control b/kubernetes/kubernetes-1.28.4/debian/deb_folder/control
 265 index 1dca8da8..4eed9bdb 100644
 266 --- a/kubernetes/kubernetes-1.28.4/debian/deb_folder/control
 267 +++ b/kubernetes/kubernetes-1.28.4/debian/deb_folder/control
 268 @@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/
 269
 270  Package: kubernetes-1.28.4-client
 271  Provides: kubernetes-utils
 272 -Architecture: amd64
 273 +Architecture: amd64 arm64
 274  Depends: ${misc:Depends}, ${shlibs:Depends}
 275  Recommends: ${misc:Recommends}
 276  Built-Using: ${misc:Built-Using}
 277 @@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool
 278   The Kubernetes command line tool for interacting with the Kubernetes API.
 279
 280  Package: kubernetes-1.28.4-master
 281 -Architecture: amd64
 282 +Architecture: amd64 arm64
 283  Depends: ${misc:Depends}, ${shlibs:Depends},
 284          adduser,
 285          lsb-base,
 286 @@ -44,7 +44,7 @@ Description: Kubernetes services for master host
 287
 288  Package: kubernetes-1.28.4-node
 289  Provides: cadvisor
 290 -Architecture: amd64
 291 +Architecture: amd64 arm64
 292  Depends: ${misc:Depends}, ${shlibs:Depends},
 293          adduser,
 294          conntrack,
 295 @@ -64,7 +64,7 @@ Description: Kubernetes services for node host
 296   issues.
 297
 298  Package: kubernetes-1.28.4-kubeadm
 299 -Architecture: amd64
 300 +Architecture: amd64 arm64
 301  Depends: ${misc:Depends}, containernetworking-plugins
 302  Recommends: ${misc:Recommends}, kubernetes-1.28.4-client
 303  Built-Using: ${misc:Built-Using}
 304 @@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool
 305   The Kubernetes command line tool for bootstrapping a Kubernetes cluster.
 306
 307  Package: kubernetes-1.28.4-misc
 308 -Architecture: amd64
 309 +Architecture: amd64 arm64
 310  Depends: ${misc:Depends}, ${shlibs:Depends}
 311  Recommends: ${misc:Recommends}
 312  Built-Using: ${misc:Built-Using}
 313 @@ -80,7 +80,7 @@ Description: dummy package
 314   Kubernetes dummy package for misc stuff we don't want to install in production.
 315
 316  Package: kubernetes-1.28.4-unit-test
 317 -Architecture: amd64
 318 +Architecture: amd64 arm64
 319  Depends: ${misc:Depends}, ${shlibs:Depends},
 320           hostname,
 321           rsync,
 322 diff --git a/kubernetes/kubernetes-1.29.2/debian/deb_folder/control b/kubernetes/kubernetes-1.29.2/debian/deb_folder/control
 323 index ec5491ea..dcc5e6f7 100644
 324 --- a/kubernetes/kubernetes-1.29.2/debian/deb_folder/control
 325 +++ b/kubernetes/kubernetes-1.29.2/debian/deb_folder/control
 326 @@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/
 327
 328  Package: kubernetes-1.29.2-client
 329  Provides: kubernetes-utils
 330 -Architecture: amd64
 331 +Architecture: amd64 arm64
 332  Depends: ${misc:Depends}, ${shlibs:Depends}
 333  Recommends: ${misc:Recommends}
 334  Built-Using: ${misc:Built-Using}
 335 @@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool
 336   The Kubernetes command line tool for interacting with the Kubernetes API.
 337
 338  Package: kubernetes-1.29.2-master
 339 -Architecture: amd64
 340 +Architecture: amd64 arm64
 341  Depends: ${misc:Depends}, ${shlibs:Depends},
 342          adduser,
 343          lsb-base,
 344 @@ -44,7 +44,7 @@ Description: Kubernetes services for master host
 345
 346  Package: kubernetes-1.29.2-node
 347  Provides: cadvisor
 348 -Architecture: amd64
 349 +Architecture: amd64 arm64
 350  Depends: ${misc:Depends}, ${shlibs:Depends},
 351          adduser,
 352          conntrack,
 353 @@ -64,7 +64,7 @@ Description: Kubernetes services for node host
 354   issues.
 355
 356  Package: kubernetes-1.29.2-kubeadm
 357 -Architecture: amd64
 358 +Architecture: amd64 arm64
 359  Depends: ${misc:Depends}, containernetworking-plugins
 360  Recommends: ${misc:Recommends}, kubernetes-1.29.2-client
 361  Built-Using: ${misc:Built-Using}
 362 @@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool
 363   The Kubernetes command line tool for bootstrapping a Kubernetes cluster.
 364
 365  Package: kubernetes-1.29.2-misc
 366 -Architecture: amd64
 367 +Architecture: amd64 arm64
 368  Depends: ${misc:Depends}, ${shlibs:Depends}
 369  Recommends: ${misc:Recommends}
 370  Built-Using: ${misc:Built-Using}
 371 @@ -80,7 +80,7 @@ Description: dummy package
 372   Kubernetes dummy package for misc stuff we don't want to install in production.
 373
 374  Package: kubernetes-1.29.2-unit-test
 375 -Architecture: amd64
 376 +Architecture: amd64 arm64
 377  Depends: ${misc:Depends}, ${shlibs:Depends},
 378           hostname,
 379           rsync,
 380 --
 381 2.30.2
 382