Fix the issue when provider crashes after introducing new fields on the provider level (#1764)

* Fix the issue when provider crashes after introducing new fields on the provider level

Author: arybolovlev

kubernetes/provider.go

@@ -360,7 +360,8 @@ type kubeClientsets struct {
 	dynamicClient       dynamic.Interface
 	discoveryClient     discovery.DiscoveryInterface
 
-	configData *schema.ResourceData
+	IgnoreAnnotations []string
+	IgnoreLabels      []string
 }
 
 func (k kubeClientsets) MainClientset() (*kubernetes.Clientset, error) {
@@ -445,11 +446,22 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, terraformVer
 		}
 	}
 
+	ignoreAnnotations := []string{}
+	ignoreLabels := []string{}
+
+	if v, ok := d.Get("ignore_annotations").([]interface{}); ok {
+		ignoreAnnotations = expandStringSlice(v)
+	}
+	if v, ok := d.Get("ignore_labels").([]interface{}); ok {
+		ignoreLabels = expandStringSlice(v)
+	}
+
 	m := kubeClientsets{
 		config:              cfg,
 		mainClientset:       nil,
 		aggregatorClientset: nil,
-		configData:          d,
+		IgnoreAnnotations:   ignoreAnnotations,
+		IgnoreLabels:        ignoreLabels,
 	}
 	return m, diag.Diagnostics{}
 }

kubernetes/structures.go

@@ -125,25 +125,17 @@ func flattenMetadata(meta metav1.ObjectMeta, d *schema.ResourceData, providerMet
 	if len(metaPrefix) > 0 {
 		prefix = metaPrefix[0]
 	}
-	configAnnotations := d.Get(prefix + "metadata.0.annotations").(map[string]interface{})
-
-	var ignoreAnnotations []string
-	if v, ok := providerMetadata.(kubeClientsets).configData.Get("ignore_annotations").([]interface{}); ok {
-		ignoreAnnotations = expandStringSlice(v)
-	}
 
+	configAnnotations := d.Get(prefix + "metadata.0.annotations").(map[string]interface{})
+	ignoreAnnotations := providerMetadata.(kubeClientsets).IgnoreAnnotations
 	annotations := removeInternalKeys(meta.Annotations, configAnnotations)
 	m["annotations"] = removeKeys(annotations, configAnnotations, ignoreAnnotations)
 	if meta.GenerateName != "" {
 		m["generate_name"] = meta.GenerateName
 	}
-	configLabels := d.Get(prefix + "metadata.0.labels").(map[string]interface{})
-
-	var ignoreLabels []string
-	if v, ok := providerMetadata.(kubeClientsets).configData.Get("ignore_labels").([]interface{}); ok {
-		ignoreLabels = expandStringSlice(v)
-	}
 
+	configLabels := d.Get(prefix + "metadata.0.labels").(map[string]interface{})
+	ignoreLabels := providerMetadata.(kubeClientsets).IgnoreLabels
 	labels := removeInternalKeys(meta.Labels, configLabels)
 	m["labels"] = removeKeys(labels, configLabels, ignoreLabels)
 	m["name"] = meta.Name