From ef348ccf56401d94461b249b32d7d83dcd9f7626 Mon Sep 17 00:00:00 2001 From: Joshua Kraitberg Date: Tue, 18 Apr 2023 11:44:39 -0400 Subject: [PATCH] Add label 'app.starlingx.io/component=platform' The oran-o2 platform application must mark its namespace and/or pods with the "app.starlingx.io/component=platform" label in order to ensure that Kubernetes knows to run it on the platform cores. Since the upstream chart does not support this yet, an interim build method must be used to test until the reference in the application is updated to the new version of the chart, ETA June 2023. To build using a commit that support this until then: diff --git a/stx-oran-o2-helm/debian/meta_data.yaml b/stx-oran-o2-helm/debian/meta_data.yaml index 6ba9683..01de152 100644 Change-Id: Ic7116f356968087adaa574765453b3cbfdf80a7a --- a/stx-oran-o2-helm/debian/meta_data.yaml +++ b/stx-oran-o2-helm/debian/meta_data.yaml @@ -5,8 +5,8 @@ src_path: stx-oran-o2-helm dl_files: oran-o2-2.0.0_g39e022d7.tar.gz: topdir: pti-o2-2.0.0 - url: https://github.com/o-ran-sc/pti-o2/archive/39e022d709689d2fc02d892707971ae852fc55ea.tar.gz - md5sum: b9dc448c4dbea0e5ad5f5702319eb24f + url: https://github.com/o-ran-sc/pti-o2/archive/34244dc4e31185ce2bb20c2a611b75edee39b2c1.tar.gz + md5sum: fd1b2521c864a9f2926bec6942ebf899 revision: dist: $STX_DIST GITREVCOUNT: Then run: stx build -c "downloader" stx shell -c "build-pkgs -c -p stx-oran-o2-helm,python3-k8sapp-oran-o2" TEST PLAN PASS: Upload and apply oran-o2 application PASS: Verify oran-o2 pods have correct labels Story: 2010648 Task: 47660 Signed-off-by: Joshua Kraitberg Change-Id: I2b14002e5c482fb6ccd0a9296f0b57f6b547e247 --- .../fluxcd-manifests/oran-o2/oran-o2-static-overrides.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stx-oran-o2-helm/stx-oran-o2-helm/fluxcd-manifests/oran-o2/oran-o2-static-overrides.yaml b/stx-oran-o2-helm/stx-oran-o2-helm/fluxcd-manifests/oran-o2/oran-o2-static-overrides.yaml index a2a90a7..bfa0d50 100644 --- a/stx-oran-o2-helm/stx-oran-o2-helm/fluxcd-manifests/oran-o2/oran-o2-static-overrides.yaml +++ b/stx-oran-o2-helm/stx-oran-o2-helm/fluxcd-manifests/oran-o2/oran-o2-static-overrides.yaml @@ -1,9 +1,13 @@ # -# Copyright (c) 2022 Wind River Systems, Inc. +# Copyright (c) 2022-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # +# Ensure pods run on platform cores +podLabels: + app.starlingx.io/component: platform + # ImagePullSecrets for operator ServiceAccount, list of secrets in the same # namespace used to pull operator image. Must be set for any cluster configured # with private docker registry.