From c2ae0603537ca21f2befc9a38b71fd4749ce8f67 Mon Sep 17 00:00:00 2001 From: Fabricio Henrique Ramos Date: Wed, 8 Mar 2023 14:39:25 -0300 Subject: [PATCH] Remove armada Depends-On: https://review.opendev.org/c/starlingx/config/+/869094 Story: 2010560 Task: 47607 Signed-off-by: Fabricio Henrique Ramos Change-Id: Ib431ee08f9837d59c30c25aa203bedecbebe4370 --- .../operator/__init__.py | 19 ---------- .../operator/manifest_nginx.py | 36 ------------------- .../k8sapp_nginx_ingress_controller/setup.cfg | 3 -- 3 files changed, 58 deletions(-) delete mode 100644 python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/__init__.py delete mode 100644 python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/manifest_nginx.py diff --git a/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/__init__.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/__init__.py deleted file mode 100644 index facf559..0000000 --- a/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2022 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('tag:yaml.org,2002:str', data, style="'") - - -yaml.add_representer(quoted_str, quoted_presenter) diff --git a/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/manifest_nginx.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/manifest_nginx.py deleted file mode 100644 index 05e2661..0000000 --- a/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/manifest_nginx.py +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (c) 2022 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# -# All Rights Reserved. -# - -""" System inventory Armada manifest operator.""" - -from k8sapp_nginx_ingress_controller.common import constants as app_constants -from k8sapp_nginx_ingress_controller.helm.ingress_nginx import IngressNginxHelm - -from sysinv.common import constants -from sysinv.helm import manifest_base as base - - -class IngressNginxArmadaManifestOperator(base.ArmadaManifestOperator): - APP = constants.HELM_APP_NGINX_IC - ARMADA_MANIFEST = 'operator-manifest' - - CHART_GROUP = app_constants.CHART_GROUP_INGRESS_NGINX - CHART_GROUPS_LUT = { - IngressNginxHelm.CHART: CHART_GROUP - } - - CHARTS_LUT = { - IngressNginxHelm.CHART: app_constants.HELM_CHART_INGRESS_NGINX - } - - 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 - """ diff --git a/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg index 553fa70..61461f9 100644 --- a/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg +++ b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg @@ -33,9 +33,6 @@ systemconfig.helm_applications = systemconfig.helm_plugins.nginx_ingress_controller = 001_ks-ingress-nginx = k8sapp_nginx_ingress_controller.helm.ingress_nginx:IngressNginxHelm -systemconfig.armada.manifest_ops = - nginx-ingress-controller = k8sapp_nginx_ingress_controller.operator.manifest_nginx:IngressNginxArmadaManifestOperator - systemconfig.app_lifecycle = nginx-ingress-controller = k8sapp_nginx_ingress_controller.lifecycle.lifecycle_nginx_ingress_controller:NginxIngressControllerAppLifecycleOperator