diff --git a/deploy/kubernetes/configmap.yaml b/deploy/kubernetes/configmap.yaml index 0f8b435..438624e 100644 --- a/deploy/kubernetes/configmap.yaml +++ b/deploy/kubernetes/configmap.yaml @@ -303,6 +303,7 @@ data: #retries = 10 + # Specify one or a list of thumbprint strings to use in verifying the NSX # Manager server certificate. This option is ignored if "insecure" is set # to True or "ca_file" is defined. @@ -611,16 +612,6 @@ data: # Choices: MATCH_EXTERNAL_ADDRESS MATCH_INTERNAL_ADDRESS BYPASS #natfirewallmatch = MATCH_INTERNAL_ADDRESS - # Deprecated; Boolean; set to True to leverage NSX groups with mixed - # expressions, False to keep them disabled. Applicable only if NCP - # version is less than 4.2.0. Defaults to False. Enforced to True if - # both NCP version is 4.2.0 or higher and NSX version is 4.1.2 or - # higher. With mixed expressions enabled, NCP will create NSX DFW rules - # for K8S network policies with multiselectors such that all pods in - # an arbitrary number of namespaces are subjected to DFW; without - # this feature enabled, the NSX rules for network policies with - # multiselectors can select pods in at most 5 namespaces - #enable_mixed_expression_groups = False diff --git a/deploy/openshift4/configmap.yaml b/deploy/openshift4/configmap.yaml index 531fd45..807dff1 100644 --- a/deploy/openshift4/configmap.yaml +++ b/deploy/openshift4/configmap.yaml @@ -303,6 +303,7 @@ data: #retries = 10 + # Specify one or a list of thumbprint strings to use in verifying the NSX # Manager server certificate. This option is ignored if "insecure" is set # to True or "ca_file" is defined. @@ -605,16 +606,6 @@ data: # Choices: MATCH_EXTERNAL_ADDRESS MATCH_INTERNAL_ADDRESS BYPASS #natfirewallmatch = MATCH_INTERNAL_ADDRESS - # Deprecated; Boolean; set to True to leverage NSX groups with mixed - # expressions, False to keep them disabled. Applicable only if NCP - # version is less than 4.2.0. Defaults to False. Enforced to True if - # both NCP version is 4.2.0 or higher and NSX version is 4.1.2 or - # higher. With mixed expressions enabled, NCP will create NSX DFW rules - # for K8S network policies with multiselectors such that all pods in - # an arbitrary number of namespaces are subjected to DFW; without - # this feature enabled, the NSX rules for network policies with - # multiselectors can select pods in at most 5 namespaces - #enable_mixed_expression_groups = False diff --git a/manifest/kubernetes/rhel/ncp-rhel.yaml b/manifest/kubernetes/rhel/ncp-rhel.yaml index 44780d3..c1927ae 100644 --- a/manifest/kubernetes/rhel/ncp-rhel.yaml +++ b/manifest/kubernetes/rhel/ncp-rhel.yaml @@ -1115,7 +1115,7 @@ spec: - /bin/sh - -c - check_pod_liveness nsx-kube-proxy 5 - initialDelaySeconds: 10 + initialDelaySeconds: 60 timeoutSeconds: 5 periodSeconds: 10 failureThreshold: 5 diff --git a/manifest/kubernetes/ubuntu/ncp-ubuntu.yaml b/manifest/kubernetes/ubuntu/ncp-ubuntu.yaml index f8e5877..846a9ba 100644 --- a/manifest/kubernetes/ubuntu/ncp-ubuntu.yaml +++ b/manifest/kubernetes/ubuntu/ncp-ubuntu.yaml @@ -1115,7 +1115,7 @@ spec: - /bin/sh - -c - check_pod_liveness nsx-kube-proxy 5 - initialDelaySeconds: 10 + initialDelaySeconds: 60 timeoutSeconds: 5 periodSeconds: 10 failureThreshold: 5 diff --git a/manifest/openshift4/coreos/ncp-openshift4.yaml b/manifest/openshift4/coreos/ncp-openshift4.yaml index b4e939f..212e69d 100644 --- a/manifest/openshift4/coreos/ncp-openshift4.yaml +++ b/manifest/openshift4/coreos/ncp-openshift4.yaml @@ -458,6 +458,7 @@ data: + --- # Yaml template for NCP Deployment # Proper kubernetes API and NSX API parameters, and NCP Docker image @@ -1042,7 +1043,7 @@ spec: - /bin/sh - -c - check_pod_liveness nsx-kube-proxy 5 - initialDelaySeconds: 10 + initialDelaySeconds: 60 timeoutSeconds: 5 periodSeconds: 10 failureThreshold: 5