diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/constants.py b/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/constants.py index 07ac3c9..1a7b15d 100644 --- a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/constants.py +++ b/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/constants.py @@ -7,6 +7,6 @@ from sysinv.helm import common HELM_NS_NGINX_INGRESS_CONTROLLER = common.HELM_NS_KUBE_SYSTEM -HELM_CHART_INGRESS_NGINX = 'ingress-nginx' +HELM_CHART_INGRESS_NGINX = 'ks-ingress-nginx' HELM_CHART_LEGACY_INGRESS_NGINX = 'nginx-ingress' CHART_GROUP_INGRESS_NGINX = 'nginx-ingress' diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg b/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg index 4eabf26..8d01509 100644 --- a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg +++ b/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg @@ -33,7 +33,7 @@ systemconfig.helm_applications = nginx-ingress-controller = systemconfig.helm_plugins.nginx_ingress_controller systemconfig.helm_plugins.nginx_ingress_controller = - 001_ingress-nginx = k8sapp_nginx_ingress_controller.helm.ingress_nginx:IngressNginxHelm + 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 diff --git a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/helmrelease.yaml b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/helmrelease.yaml index 8970715..490ca66 100644 --- a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/helmrelease.yaml +++ b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/helmrelease.yaml @@ -7,7 +7,7 @@ apiVersion: "helm.toolkit.fluxcd.io/v2beta1" kind: HelmRelease metadata: - name: ingress-nginx + name: ks-ingress-nginx labels: chart_group: ingress-nginx spec: