Merge pull request #494 from matttrach/update-1.7.5

feat: update to v1.7.5

Author: matttrach

docs/resources/cluster.md

@@ -492,6 +492,7 @@ The following attributes are exported:
 * `mtu` - (Optional) Network provider MTU. Default `0` (int)
 * `options` - (Optional/Computed) Network provider options (map)
 * `plugin` - (Optional) Network provider plugin. `calico`, `canal` (default), `flannel`, `none` and `weave` are supported. (string)
+* `enable_br_netfilter` - (Optional) Enable/Disable br_netfilter on nodes. Default `true` (bool)
 
 #### `calico_network_provider`
 

go.mod

@@ -40,7 +40,7 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/hashicorp/go-version v1.6.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0
-	github.com/rancher/rke v1.7.0
+	github.com/rancher/rke v1.7.5
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
 	github.com/sirupsen/logrus v1.9.3
 	gopkg.in/yaml.v2 v2.4.0

go.sum

@@ -2374,8 +2374,8 @@ github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813 h1:V/LY8pUHZG9Kc+xED
 github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813/go.mod h1:IxgTBO55lziYhTEETyVKiT8/B5Rg92qYiRmcIIYoPgI=
 github.com/rancher/norman v0.0.0-20241001183610-78a520c160ab h1:ihK6See3y/JilqZlc0CG7NXPN+ue5nY9U7xUZUA8M7I=
 github.com/rancher/norman v0.0.0-20241001183610-78a520c160ab/go.mod h1:qX/OG/4wY27xSAcSdRilUBxBumV6Ey2CWpAeaKnBQDs=
-github.com/rancher/rke v1.7.0 h1:UFQOh/y1TXsWbbeNR3r8mDxGm9WYHyb6+F8u7rIKNL0=
-github.com/rancher/rke v1.7.0/go.mod h1:+x++Mvl0A3jIzNLiu8nkraqZXiHg6VPWv0Xl4iQCg+A=
+github.com/rancher/rke v1.7.5 h1:oA3GlGksu3MVT4bGuCIYac5Bcx7GmjM4mueKr/iOm/A=
+github.com/rancher/rke v1.7.5/go.mod h1:+x++Mvl0A3jIzNLiu8nkraqZXiHg6VPWv0Xl4iQCg+A=
 github.com/rancher/wrangler/v3 v3.0.1-rc.2 h1:sHrZTPNco7SCNw372sv51DMK9a53ra/YboL4sQJjEQM=
 github.com/rancher/wrangler/v3 v3.0.1-rc.2/go.mod h1:eXqcPIuGWblud9Wd1Auh7AWRHd6gs2H24asMMPuUR/s=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=

rke/schema_rke_cluster_network.go

@@ -249,6 +249,12 @@ func rkeClusterNetworkFields() map[string]*schema.Schema {
 			Description:  "Network provider plugin",
 			ValidateFunc: validation.StringInSlice(rkeClusterNetworkPluginList, true),
 		},
+		"enable_br_netfilter": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     true,
+			Description: "Enable/Disable br_netfilter on nodes",
+		},
 	}
 	return s
 }

rke/structure_rke_cluster_network.go

@@ -162,6 +162,10 @@ func flattenRKEClusterNetwork(in rancher.NetworkConfig) []interface{} {
 		obj["aci_network_provider"] = flattenRKEClusterNetworkAci(in.AciNetworkProvider)
 	}
 
+	if in.EnableBrNetfilter != nil {
+		obj["enable_br_netfilter"] = in.EnableBrNetfilter
+	}
+
 	if in.MTU > 0 {
 		obj["mtu"] = in.MTU
 	}
@@ -358,5 +362,9 @@ func expandRKEClusterNetwork(p []interface{}) rancher.NetworkConfig {
 		obj.Plugin = v
 	}
 
+	if v, ok := in["enable_br_netfilter"].(bool); ok {
+		obj.EnableBrNetfilter = &v
+	}
+
 	return obj
 }