Skip to content

Commit

Permalink
add match_fields to nodeAffinity (hashicorp#2296)
Browse files Browse the repository at this point in the history 
* add match_fields

* add changelog-entry

* add match_fields into tests

* replace schema in match_fields with function
  • Loading branch information
@BBBmau
BBBmau authored Sep 27, 2023
1 parent 0777b81 commit 32a58d2
Show file tree
Hide file tree
Showing 3 changed files with 140 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .changelog/2296.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
`kubernetes/schema_affinity_spec.go`: Add `match_fields` to nodeAffinity
```
132 changes: 128 additions & 4 deletions kubernetes/resource_kubernetes_pod_v1_affinity_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestAccKubernetesPodV1_with_node_affinity_with_required_during_scheduling_i
CheckDestroy: testAccCheckKubernetesPodV1Destroy,
Steps: []resource.TestStep{
{
Config: testAccKubernetesPodV1ConfigWithNodeAffinityWithRequiredDuringSchedulingIgnoredDuringExecution(podName, imageName),
Config: testAccKubernetesPodV1ConfigWithNodeAffinityWithRequiredDuringSchedulingIgnoredDuringExecution_MatchExpressions(podName, imageName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckKubernetesPodV1Exists(resourceName, &conf),
resource.TestCheckResourceAttr(resourceName, "spec.0.affinity.#", "1"),
Expand All @@ -42,6 +42,21 @@ func TestAccKubernetesPodV1_with_node_affinity_with_required_during_scheduling_i
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.node_selector_term.0.match_expressions.1.values.0", keyName), "linux"),
),
},
{
Config: testAccKubernetesPodV1ConfigWithNodeAffinityWithRequiredDuringSchedulingIgnoredDuringExecution_MatchFields(podName, imageName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckKubernetesPodV1Exists(resourceName, &conf),
resource.TestCheckResourceAttr(resourceName, "spec.0.affinity.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.affinity.0.node_affinity.#", "1"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.#", keyName), "1"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.node_selector_term.0.match_fields.#", keyName), "1"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.node_selector_term.0.match_fields.0.key", keyName), "metadata.name"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.node_selector_term.0.match_fields.0.%%", keyName), "3"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.node_selector_term.0.match_fields.0.operator", keyName), "NotIn"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.node_selector_term.0.match_fields.0.values.#", keyName), "1"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.node_selector_term.0.match_fields.0.values.0", keyName), "foo"),
),
},
},
})
}
Expand All @@ -59,7 +74,7 @@ func TestAccKubernetesPodV1_with_node_affinity_with_preferred_during_scheduling_
CheckDestroy: testAccCheckKubernetesPodV1Destroy,
Steps: []resource.TestStep{
{
Config: testAccKubernetesPodV1ConfigWithNodeAffinityWithPreferredDuringSchedulingIgnoredDuringExecution(podName, imageName),
Config: testAccKubernetesPodV1ConfigWithNodeAffinityWithPreferredDuringSchedulingIgnoredDuringExecution_MatchExpressions(podName, imageName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckKubernetesPodV1Exists(resourceName, &conf),
resource.TestCheckResourceAttr(resourceName, "spec.0.affinity.#", "1"),
Expand All @@ -80,6 +95,22 @@ func TestAccKubernetesPodV1_with_node_affinity_with_preferred_during_scheduling_
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.weight", keyName), "1"),
),
},
{
Config: testAccKubernetesPodV1ConfigWithNodeAffinityWithPreferredDuringSchedulingIgnoredDuringExecution_MatchFields(podName, imageName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckKubernetesPodV1Exists(resourceName, &conf),
resource.TestCheckResourceAttr(resourceName, "spec.0.affinity.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.affinity.0.node_affinity.#", "1"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.#", keyName), "1"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.preference.0.match_fields.#", keyName), "1"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.preference.0.match_fields.0.key", keyName), "metadata.name"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.preference.0.match_fields.0.%%", keyName), "3"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.preference.0.match_fields.0.operator", keyName), "NotIn"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.preference.0.match_fields.0.values.#", keyName), "1"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.preference.0.match_fields.0.values.0", keyName), "foo"),
resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("%s.0.weight", keyName), "1"),
),
},
},
})
}
Expand Down Expand Up @@ -229,7 +260,7 @@ func TestAccKubernetesPodV1_with_pod_anti_affinity_with_preferred_during_schedul
})
}

func testAccKubernetesPodV1ConfigWithNodeAffinityWithRequiredDuringSchedulingIgnoredDuringExecution(podName, imageName string) string {
func testAccKubernetesPodV1ConfigWithNodeAffinityWithRequiredDuringSchedulingIgnoredDuringExecution_MatchExpressions(podName, imageName string) string {
return fmt.Sprintf(`resource "kubernetes_namespace_v1" "test" {
metadata {
name = %[1]q
Expand Down Expand Up @@ -280,7 +311,53 @@ resource "kubernetes_pod_v1" "test" {
`, podName, imageName)
}

func testAccKubernetesPodV1ConfigWithNodeAffinityWithPreferredDuringSchedulingIgnoredDuringExecution(podName, imageName string) string {
func testAccKubernetesPodV1ConfigWithNodeAffinityWithRequiredDuringSchedulingIgnoredDuringExecution_MatchFields(podName, imageName string) string {
return fmt.Sprintf(`resource "kubernetes_namespace_v1" "test" {
metadata {
name = %[1]q
}
}
resource "kubernetes_pod_v1" "test" {
metadata {
labels = {
app = "pod_label"
}
namespace = kubernetes_namespace_v1.test.metadata.0.name
name = %[1]q
}
spec {
affinity {
node_affinity {
required_during_scheduling_ignored_during_execution {
node_selector_term {
match_fields {
key = "metadata.name"
operator = "NotIn"
values = ["foo"]
}
}
}
}
}
container {
image = %[2]q
name = "containername"
args = ["sleep", "300"]
resources {
limits = {
cpu = "50m"
memory = "64M"
}
}
}
termination_grace_period_seconds = 1
}
}
`, podName, imageName)
}

func testAccKubernetesPodV1ConfigWithNodeAffinityWithPreferredDuringSchedulingIgnoredDuringExecution_MatchExpressions(podName, imageName string) string {
return fmt.Sprintf(`resource "kubernetes_namespace_v1" "test" {
metadata {
name = %[1]q
Expand Down Expand Up @@ -332,6 +409,53 @@ resource "kubernetes_pod_v1" "test" {
`, podName, imageName)
}

func testAccKubernetesPodV1ConfigWithNodeAffinityWithPreferredDuringSchedulingIgnoredDuringExecution_MatchFields(podName, imageName string) string {
return fmt.Sprintf(`resource "kubernetes_namespace_v1" "test" {
metadata {
name = %[1]q
}
}
resource "kubernetes_pod_v1" "test" {
metadata {
labels = {
app = "pod_label"
}
namespace = kubernetes_namespace_v1.test.metadata.0.name
name = %[1]q
}
spec {
affinity {
node_affinity {
preferred_during_scheduling_ignored_during_execution {
weight = 1
preference {
match_fields {
key = "metadata.name"
operator = "NotIn"
values = ["foo"]
}
}
}
}
}
container {
image = %[2]q
name = "containername"
args = ["sleep", "300"]
resources {
limits = {
cpu = "50m"
memory = "50M"
}
}
}
termination_grace_period_seconds = 1
}
}
`, podName, imageName)
}

func testAccKubernetesPodV1ConfigWithPodAffinityWithRequiredDuringSchedulingIgnoredDuringExecution(podName, imageName string) string {
return fmt.Sprintf(`resource "kubernetes_namespace_v1" "test" {
metadata {
Expand Down
9 changes: 9 additions & 0 deletions kubernetes/schema_affinity_spec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,15 @@ func nodeSelectorRequirementsFields() map[string]*schema.Schema {
},
},
},
"match_fields": {
Type: schema.TypeList,
Description: "A list of node selector requirements by node's fields. The requirements are ANDed.",
Optional: true,
ForceNew: true,
Elem: &schema.Resource{
Schema: nodeSelectorRequirementFields(),
},
},
}
}

Expand Down

0 comments on commit 32a58d2

Please sign in to comment.