Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manifest: change computed_field logic to mark all as unknown instead of only on changes #2432

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

manifest: change computed_field logic to mark all as unknown instead of only on changes #2432

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
aedb26d
fix crash when unexpeceted annotation appears
BBBmau Feb 21, 2024
a86a181
cleanup plan code and add computedFields test when setting computedFi…
BBBmau Mar 2, 2024
5fd30f4
add changelog-entry
BBBmau Mar 2, 2024
b495d36
Merge branch 'main' into computed_fields_allUnknown
BBBmau Mar 2, 2024
f6f3f17
fix manifest tests
BBBmau Mar 2, 2024
d6dd7da
remove createNamespace
BBBmau Mar 2, 2024
dd0d50d
add TestKubernetesManifest_ComputedDeploymentFields
BBBmau Mar 12, 2024
d756ffb
add copyright header
BBBmau Mar 12, 2024
ee84da4
Merge branch 'main' into computed_fields_allUnknown
BBBmau Mar 12, 2024
3368fd3
Update manifest/provider/apply.go
BBBmau Apr 3, 2024
bd56585
add findBackfillvalue
BBBmau Apr 3, 2024
6cdde2c
add comment for findBackfillValue
BBBmau Apr 3, 2024
cca6249
Update manifest/test/acceptance/testdata/ComputedFields/computed_depl…
BBBmau Apr 3, 2024
f304b15
Merge branch 'main' into computed_fields_allUnknown
BBBmau Apr 3, 2024
e3b7aaf
err check
BBBmau Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions manifest/provider/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,7 @@ func (s *RawProviderServer) ApplyResourceChange(ctx context.Context, req *tfprot
if !isComputed {
return v, nil
}
if v.IsKnown() {
BBBmau marked this conversation as resolved.
Show resolved Hide resolved
return tftypes.NewValue(v.Type(), tftypes.UnknownValue), nil
}

ppMan, restPath, err := tftypes.WalkAttributePath(plannedStateVal["manifest"], ap)
BBBmau marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
if len(restPath.Steps()) > 0 {
BBBmau marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
1 change: 0 additions & 1 deletion manifest/provider/plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,6 @@ func (s *RawProviderServer) PlanResourceChange(ctx context.Context, req *tfproto
}
nowCfg, restPath, err := tftypes.WalkAttributePath(ppMan, ap)
hasChanged = err == nil && len(restPath.Steps()) == 0 && wasCfg.(tftypes.Value).IsKnown() && !wasCfg.(tftypes.Value).Equal(nowCfg.(tftypes.Value))

if hasChanged {
h, ok := hints[morph.ValueToTypePath(ap).String()]
if ok && h == manifest.PreserveUnknownFieldsLabel {
Expand Down
16 changes: 11 additions & 5 deletions manifest/test/acceptance/computed_attr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestKubernetesManifest_ComputedFields(t *testing.T) {
step1.Close()
k8shelper.AssertNamespacedResourceDoesNotExist(t, "v1", "secrets", namespace, name)
k8shelper.AssertNamespacedResourceDoesNotExist(t, "v1", "services", namespace, name)
k8shelper.AssertNamespacedResourceDoesNotExist(t, "v1", "deployments", namespace, name)
k8shelper.AssertNamespacedResourceDoesNotExist(t, "apps/v1", "deployments", namespace, name)
k8shelper.AssertResourceDoesNotExist(t, "admissionregistration.k8s.io", "mutatingwebhookconfigurations", name)
}()

Expand All @@ -66,13 +66,15 @@ func TestKubernetesManifest_ComputedFields(t *testing.T) {
defer func() {
step2.Destroy(ctx)
step2.Close()
k8shelper.AssertNamespacedResourceDoesNotExist(t, "apps/v1", "deployments", namespace, name)
k8shelper.AssertNamespacedResourceDoesNotExist(t, "v1", "configmaps", namespace, name)
}()

tfconfig = loadTerraformConfig(t, "ComputedFields/computed.tf", tfvars)
step2.SetConfig(ctx, string(tfconfig))
step2.Init(ctx)
step2.Apply(ctx)
k8shelper.AssertNamespacedResourceExists(t, "apps/v1", "deployments", namespace, name)
k8shelper.AssertNamespacedResourceExists(t, "v1", "configmaps", namespace, name)

s2, err := step2.State(ctx)
Expand All @@ -81,9 +83,13 @@ func TestKubernetesManifest_ComputedFields(t *testing.T) {
}
tfstate := tfstatehelper.NewHelper(s2)
tfstate.AssertAttributeValues(t, tfstatehelper.AttributeValues{
"kubernetes_manifest.test.object.metadata.name": name,
"kubernetes_manifest.test.object.metadata.namespace": namespace,
"kubernetes_manifest.test.object.metadata.annotations.tf-k8s-acc": "true",
"kubernetes_manifest.test.object.metadata.annotations.mutated": "true",
"kubernetes_manifest.test.object.metadata.name": name,
"kubernetes_manifest.test.object.metadata.namespace": namespace,
"kubernetes_manifest.test.object.metadata.annotations.tf-k8s-acc": "true",
"kubernetes_manifest.test.object.metadata.annotations.mutated": "true",
"kubernetes_manifest.deployment_resource_diff.object.metadata.name": name,
"kubernetes_manifest.deployment_resource_diff.object.metadata.namespace": namespace,
"kubernetes_manifest.deployment_resource_diff.object.spec.template.spec.containers[0].resources.limits[\"cpu\"]": "250m",
"kubernetes_manifest.deployment_resource_diff.object.spec.template.spec.containers[0].resources.limits[\"memory\"]": "512Mi",
})
}
50 changes: 50 additions & 0 deletions manifest/test/acceptance/testdata/ComputedFields/computed.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,53 @@ resource "kubernetes_manifest" "test" {
}
}
}

resource "kubernetes_manifest" "deployment_resource_diff" {
computed_fields = ["spec.template.spec.containers[0].resources.limits"]
manifest = {
apiVersion = "apps/v1"
kind = "Deployment"

metadata = {
name = var.name
namespace = var.namespace
}

spec = {
replicas = 3

selector = {
matchLabels = {
test = "MyExampleApp"
}
}

template = {
metadata= {
labels = {
test = "MyExampleApp"
}
}


spec = {
containers = [{
image = "nginx:1.21.6"
name = "example"

resources = {
limits = {
cpu = "0.25"
memory = "512Mi"
}
requests = {
cpu = "250m"
memory = "50Mi"
}
}
}]
}
}
}
}
}
Loading