starlingx/nginx-ingress-controller-armada-app
Code Issues Proposed changes

Merge "Fix Nginx Controller Helm plugin name collision"

Browse Source
This commit is contained in:
Zuul 2022-07-12 18:30:16 +00:00 committed by Gerrit Code Review
commit 2e8fb28f76
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/constants.py
View File

@ -7,6 +7,6 @@
from sysinv.helm import common from sysinv.helm import common
HELM_NS_NGINX_INGRESS_CONTROLLER = common.HELM_NS_KUBE_SYSTEM 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' HELM_CHART_LEGACY_INGRESS_NGINX = 'nginx-ingress'
CHART_GROUP_INGRESS_NGINX = 'nginx-ingress' CHART_GROUP_INGRESS_NGINX = 'nginx-ingress'

2
python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg
View File

@ -33,7 +33,7 @@ systemconfig.helm_applications =
nginx-ingress-controller = systemconfig.helm_plugins.nginx_ingress_controller nginx-ingress-controller = systemconfig.helm_plugins.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 = systemconfig.armada.manifest_ops =
nginx-ingress-controller = k8sapp_nginx_ingress_controller.operator.manifest_nginx:IngressNginxArmadaManifestOperator nginx-ingress-controller = k8sapp_nginx_ingress_controller.operator.manifest_nginx:IngressNginxArmadaManifestOperator

2
stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/helmrelease.yaml
View File

@ -7,7 +7,7 @@
apiVersion: "helm.toolkit.fluxcd.io/v2beta1" apiVersion: "helm.toolkit.fluxcd.io/v2beta1"
kind: HelmRelease kind: HelmRelease
metadata: metadata:
name: ingress-nginx name: ks-ingress-nginx
labels: labels:
chart_group: ingress-nginx chart_group: ingress-nginx
spec: spec: