Merge branch 'main' into release

particuleio · Jun 3, 2023 · b937885 · b937885
2 parents 2bcfb02 + 5c36558
commit b937885
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/tigera-operator.tf b/tigera-operator.tf
@@ -8,13 +8,15 @@ locals {
       chart_version          = local.helm_dependencies[index(local.helm_dependencies.*.name, "tigera-operator")].version
       namespace              = "tigera-operator"
       create_ns              = true
-      manage_crds            = true
+      manage_crds            = false
       enabled                = false
       default_network_policy = true
     },
     var.tigera-operator
   )
 
+  # Managing CRDs manually should not be needed anymore since https://github.com/projectcalico/calico/pull/7216
+
   tigera-operator_crds = "https://raw.githubusercontent.com/projectcalico/calico/${local.tigera-operator.chart_version}/manifests/operator-crds.yaml"
 
   calico_crds = "https://raw.githubusercontent.com/projectcalico/calico/${local.tigera-operator.chart_version}/manifests/crds.yaml"