Skip to content

Commit

Permalink
Rename Ingress FW rule to prepend Cluster name
Browse files Browse the repository at this point in the history
Contrail Security Firewall created for Ingress objects in K8s
should be prepended with name of the cluster for multi-cluster
support.

Change-Id: I5d0d65cd5acb0fe3400c73b3d951d4e2d970ee88
Closes-Bug: #1776253
  • Loading branch information
dineshb-jnpr committed Jun 12, 2018
1 parent 1e9eaec commit 45e5f47
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/container/kube-manager/kube_manager/vnc/vnc_ingress.py
Expand Up @@ -854,6 +854,7 @@ def _sync_ingress_lb(self):
def ingress_timer(self):
self._sync_ingress_lb()

@classmethod
def get_ingress_label_name(self, ns_name, name):
return "-".join([vnc_kube_config.cluster_name(), ns_name, name])

Expand Down Expand Up @@ -952,7 +953,7 @@ def add_ingress_to_service_rule(cls, ns_name, ingress_name, service_name):
if VncSecurityPolicy.ingress_svc_fw_policy_uuid:

ingress_labels = XLabelCache.get_ingress_label(
"-".join([ns_name, ingress_name]))
cls.get_ingress_label_name(ns_name, ingress_name))
service_labels = XLabelCache.get_service_label(service_name)

rule_name = VncIngress._get_ingress_firewall_rule_name(
Expand Down

0 comments on commit 45e5f47

Please sign in to comment.