From 1490adbe755ee19364009d88cf1d11819f454494 Mon Sep 17 00:00:00 2001 From: Fabricio Henrique Ramos Date: Wed, 8 Mar 2023 15:08:17 -0300 Subject: [PATCH] Remove armada Depends-On: https://review.opendev.org/c/starlingx/config/+/869094 Test Plan: PASS: App operations still work fine Story: 2010560 Task: 47610 Signed-off-by: Fabricio Henrique Ramos Change-Id: Ibbbaf51a6b58c70aa915976530217301c31fa721 --- .../k8sapp_vault/armada/__init__.py | 19 ---------- .../k8sapp_vault/armada/manifest_vault.py | 37 ------------------- .../k8sapp_vault/tests/test_plugins.py | 3 -- 3 files changed, 59 deletions(-) delete mode 100644 python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/__init__.py delete mode 100644 python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/manifest_vault.py diff --git a/python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/__init__.py b/python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/__init__.py deleted file mode 100644 index 5587e5f..0000000 --- a/python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2020 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -import yaml - - -class quoted_str(str): - pass - - -# force strings to be single-quoted to avoid interpretation as numeric values -def quoted_presenter(dumper, data): - return dumper.represent_scalar(u'tag:yaml.org,2002:str', data, style="'") - - -yaml.add_representer(quoted_str, quoted_presenter) diff --git a/python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/manifest_vault.py b/python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/manifest_vault.py deleted file mode 100644 index 32dcf9a..0000000 --- a/python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/manifest_vault.py +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (c) 2020 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# -# All Rights Reserved. -# - -""" System inventory Armada manifest operator.""" - -from k8sapp_vault.helm.rbd_provisioner import VaultHelm - -from sysinv.common import constants -from sysinv.helm import manifest_base as base - - -class VaultArmadaManifestOperator(base.ArmadaManifestOperator): - - APP = constants.HELM_APP_VAULT - ARMADA_MANIFEST = 'armada-manifest' - - CHART_GROUP_VAULT = 'vault' - CHART_GROUPS_LUT = { - VaultHelm.CHART: CHART_GROUP_VAULT - } - - CHARTS_LUT = { - Vault.CHART: 'vault' - } - - def platform_mode_manifest_updates(self, dbapi, mode): - """ Update the application manifest based on the platform - - :param dbapi: DB api object - :param mode: mode to control how to apply the application manifest - """ - pass diff --git a/python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/tests/test_plugins.py b/python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/tests/test_plugins.py index 9968d73..8896772 100644 --- a/python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/tests/test_plugins.py +++ b/python3-k8sapp-vault/k8sapp_vault/k8sapp_vault/tests/test_plugins.py @@ -6,7 +6,6 @@ from sysinv.common import constants from sysinv.tests.db import base as dbbase -from sysinv.tests.helm.test_helm import HelmOperatorTestSuiteMixin class K8SAppVaultAppMixin(object): @@ -25,7 +24,6 @@ class K8SAppVaultAppMixin(object): class K8sAppVaultControllerTestCase(K8SAppVaultAppMixin, dbbase.BaseIPv6Mixin, dbbase.BaseCephStorageBackendMixin, - HelmOperatorTestSuiteMixin, dbbase.ControllerHostTestCase): pass @@ -37,6 +35,5 @@ class K8sAppVaultControllerTestCase(K8SAppVaultAppMixin, # - vault app class K8SAppVaultAIOTestCase(K8SAppVaultAppMixin, dbbase.BaseCephStorageBackendMixin, - HelmOperatorTestSuiteMixin, dbbase.AIOSimplexHostTestCase): pass