Skip to content

Commit

Permalink
Prevent mixing deprecated spec fields with new ones to avoid complex …
Browse files Browse the repository at this point in the history
…use-cases
  • Loading branch information
pdecat committed Nov 12, 2018
1 parent 6c37a48 commit a7e4d62
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion kubernetes/resource_kubernetes_replication_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ func replicationControllerTemplateFieldSpec() map[string]*schema.Schema {
},
}

// Merge deprecated fields
// Merge deprecated fields and mark them conflicting with the ones to avoid complex mixed use-cases
for k, v := range podSpecFields(true, true, true) {
v.ConflictsWith = []string{"spec.0.template.0.spec"}
templateFields[k] = v
}

Expand Down

0 comments on commit a7e4d62

Please sign in to comment.