From 8eb49165e264702f94267907620db435657d64b5 Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Wed, 7 Jul 2021 14:12:01 -0700 Subject: [PATCH] Force wait_for_security_policy_sync to False With this change, the operator will set this flag to False for both Kubernetes and Openshift deployment. Also - set Operator version to 3.1.2.1 --- VERSION | 2 +- pkg/controller/configmap/config.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index ef538c2..2d3c115 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.2 +3.1.2.1 diff --git a/pkg/controller/configmap/config.go b/pkg/controller/configmap/config.go index 95dcd1c..4adefc2 100644 --- a/pkg/controller/configmap/config.go +++ b/pkg/controller/configmap/config.go @@ -58,6 +58,7 @@ func (adaptor *ConfigMapK8s) FillDefaults(configmap *corev1.ConfigMap, spec *con appendErrorIfNotNil(&errs, fillDefault(cfg, "coe", "enable_snat", "True", false)) appendErrorIfNotNil(&errs, fillDefault(cfg, "ha", "enable", "True", false)) appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_node_agent", "mtu", strconv.Itoa(operatortypes.DefaultMTU), false)) + appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_v3", "wait_for_security_policy_sync", "False", true)) // Write config back to ConfigMap data (*data)[operatortypes.ConfigMapDataKey], err = iniWriteToString(cfg) appendErrorIfNotNil(&errs, err) @@ -80,7 +81,7 @@ func (adaptor *ConfigMapOc) FillDefaults(configmap *corev1.ConfigMap, spec *conf appendErrorIfNotNil(&errs, fillDefault(cfg, "coe", "adaptor", "openshift4", true)) appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_v3", "policy_nsxapi", "True", true)) appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_v3", "single_tier_topology", "True", true)) - appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_v3", "wait_for_security_policy_sync", "True", false)) + appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_v3", "wait_for_security_policy_sync", "False", true)) appendErrorIfNotNil(&errs, fillDefault(cfg, "coe", "enable_snat", "True", false)) appendErrorIfNotNil(&errs, fillDefault(cfg, "ha", "enable", "True", false)) appendErrorIfNotNil(&errs, fillDefault(cfg, "k8s", "process_oc_network", "False", true))