From 314f1c4da8d0611d9a00b03f340a4e92964eb0bb Mon Sep 17 00:00:00 2001 From: Deng Yun Date: Wed, 12 Oct 2022 17:37:58 +0800 Subject: [PATCH] Sync NCP 4.0.1 manifests/configmap yamls Sync manifests/configmap yamls from NCP 4.0.1 nsx-jetfire-401 branch to operator master branch --- deploy/kubernetes/configmap.yaml | 4 +++- deploy/openshift4/configmap.yaml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/deploy/kubernetes/configmap.yaml b/deploy/kubernetes/configmap.yaml index ced6d60..176a5a4 100644 --- a/deploy/kubernetes/configmap.yaml +++ b/deploy/kubernetes/configmap.yaml @@ -294,6 +294,7 @@ data: #use_ncp_portmap = False + [nsx_v3] # Set NSX API adaptor to NSX Policy API adaptor. If unset, NSX adaptor will @@ -514,7 +515,8 @@ data: # If this value is not empty, NCP will append it to nameserver list #dns_servers = [] - # Set this to True to enable NCP to report errors through NSXError CRD. + # Set this to True to enable NCP to report errors through NSXError CRD + # (only effective in NSX MP API mode). #enable_nsx_err_crd = False # Maximum number of virtual servers allowed to create in cluster for diff --git a/deploy/openshift4/configmap.yaml b/deploy/openshift4/configmap.yaml index df459d5..b5493ca 100644 --- a/deploy/openshift4/configmap.yaml +++ b/deploy/openshift4/configmap.yaml @@ -296,6 +296,7 @@ data: #use_ncp_portmap = False + [nsx_v3] # Set NSX API adaptor to NSX Policy API adaptor. If unset, NSX adaptor will @@ -510,7 +511,8 @@ data: # If this value is not empty, NCP will append it to nameserver list #dns_servers = [] - # Set this to True to enable NCP to report errors through NSXError CRD. + # Set this to True to enable NCP to report errors through NSXError CRD + # (only effective in NSX MP API mode). #enable_nsx_err_crd = False # Maximum number of virtual servers allowed to create in cluster for