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

r/pod: Fix a crash caused by wrong field name (config map volume source) #19

Merged
merged 2 commits into from
Jul 5, 2017
Merged

r/pod: Fix a crash caused by wrong field name (config map volume source) #19

merged 2 commits into from
Jul 5, 2017

Conversation

radeksimko
Copy link
Member

@radeksimko radeksimko commented Jul 4, 2017 •
edited
Loading

Fixes #18

This affects both kubernetes_pod and kubernetes_replication_controller as they share part of the schema and related helper functions (which includes the one we're fixing here).

Test results

$ make testacc TEST=./kubernetes TESTARGS='-run=TestAccKubernetesPod_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./kubernetes -v -run=TestAccKubernetesPod_ -timeout 120m
=== RUN   TestAccKubernetesPod_basic
--- PASS: TestAccKubernetesPod_basic (11.82s)
=== RUN   TestAccKubernetesPod_importBasic
--- PASS: TestAccKubernetesPod_importBasic (5.53s)
=== RUN   TestAccKubernetesPod_with_pod_security_context
--- PASS: TestAccKubernetesPod_with_pod_security_context (4.34s)
=== RUN   TestAccKubernetesPod_with_container_liveness_probe_using_exec
--- PASS: TestAccKubernetesPod_with_container_liveness_probe_using_exec (42.05s)
=== RUN   TestAccKubernetesPod_with_container_liveness_probe_using_http_get
--- PASS: TestAccKubernetesPod_with_container_liveness_probe_using_http_get (6.91s)
=== RUN   TestAccKubernetesPod_with_container_liveness_probe_using_tcp
--- PASS: TestAccKubernetesPod_with_container_liveness_probe_using_tcp (21.81s)
=== RUN   TestAccKubernetesPod_with_container_lifecycle
--- PASS: TestAccKubernetesPod_with_container_lifecycle (7.37s)
=== RUN   TestAccKubernetesPod_with_container_security_context
--- PASS: TestAccKubernetesPod_with_container_security_context (5.84s)
=== RUN   TestAccKubernetesPod_with_volume_mount
--- PASS: TestAccKubernetesPod_with_volume_mount (8.60s)
=== RUN   TestAccKubernetesPod_with_cfg_map_volume_mount
--- PASS: TestAccKubernetesPod_with_cfg_map_volume_mount (15.05s)
=== RUN   TestAccKubernetesPod_with_resource_requirements
--- PASS: TestAccKubernetesPod_with_resource_requirements (6.23s)
=== RUN   TestAccKubernetesPod_with_empty_dir_volume
--- PASS: TestAccKubernetesPod_with_empty_dir_volume (7.47s)
PASS
ok  	github.com/terraform-providers/terraform-provider-kubernetes/kubernetes	143.142s

@radeksimko radeksimko mentioned this pull request Jul 4, 2017
Closed
tombuildsstuff
tombuildsstuff approved these changes Jul 5, 2017
View reviewed changes
Copy link
Contributor

@tombuildsstuff tombuildsstuff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented on a couple of things around how the default_mode field is stored in HCL - but otherwise LGTM :)

kubernetes/resource_kubernetes_pod_test.go
resource.TestCheckResourceAttr("kubernetes_pod.test", "spec.0.container.0.volume_mount.0.sub_path", ""),
resource.TestCheckResourceAttr("kubernetes_pod.test", "spec.0.volume.0.name", "cfg"),
resource.TestCheckResourceAttr("kubernetes_pod.test", "spec.0.volume.0.config_map.0.name", cfgMap),
resource.TestCheckResourceAttr("kubernetes_pod.test", "spec.0.volume.0.config_map.0.default_mode", "511"), // 0777 in decimal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as discussed on Slack, I could see this causing confusion - would it be worth making this a type String instead until we've better options?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed on Slack - I generally agree that this is confusing.

I’m just not sure it’s worth implementing a dirty solution (TypeString) which may require state migration + config change once we implement the right solution.

I’ll take a look into the schema internals and see how hard it would be to implement IntRepresentation into the schema. Then if we do it would be just a matter of adding a single line to the existing schema, which seems much cleaner.

kubernetes/resource_kubernetes_pod_test.go
name = "cfg"
config_map {
name = "${kubernetes_config_map.test.metadata.0.name}"
default_mode = 0777
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might be worth adding some validation to this to the schema too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, I'll add validation.

@radeksimko radeksimko force-pushed the b-config-map-vol-crash-fix branch from 5a04ca3 to 92965c0 Compare July 5, 2017 08:15
@radeksimko radeksimko merged commit 1d71804 into master Jul 5, 2017
@radeksimko radeksimko deleted the b-config-map-vol-crash-fix branch July 5, 2017 08:20
@ghost ghost locked and limited conversation to collaborators Apr 22, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tombuildsstuff tombuildsstuff tombuildsstuff approved these changes

Assignees
No one assigned
Labels
bug crash
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Terraform crash panic: interface conversion: interface {} is nil, not int
2 participants
@radeksimko @tombuildsstuff