From 0b7bcd29ba45f60bbf7b46d9181590c60fb76f8a Mon Sep 17 00:00:00 2001 From: Olaf Klischat Date: Mon, 6 May 2024 10:37:38 +0200 Subject: [PATCH] suppress diff if cluster cniPlugin was defaulted to cilium, which it now may be depending on the DC --- metakube/resource_cluster_schema.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metakube/resource_cluster_schema.go b/metakube/resource_cluster_schema.go index 14c5722..27f02dc 100644 --- a/metakube/resource_cluster_schema.go +++ b/metakube/resource_cluster_schema.go @@ -147,7 +147,7 @@ func metakubeResourceClusterSpecFields() map[string]*schema.Schema { DiffSuppressFunc: func(_, _, _ string, d *schema.ResourceData) bool { configured, ok := d.GetOkConfigured("spec.0.cni_plugin.0.type") newValue := d.Get("spec.0.cni_plugin.0.type") - return (!ok || configured == "") && newValue == "canal" + return (!ok || configured == "") && (newValue == "canal" || newValue == "cilium") }, Description: "Contains the spec of the CNI plugin used by the Cluster", Elem: &schema.Resource{