Support Prefixes #140 #89
Conversation
catalog/from-k8s/resource_test.go
Outdated
| require.NoError(err) | ||
|
|
||
| // Wait a bit | ||
| time.Sleep(500 * time.Millisecond) |
There was a problem hiding this comment.
Most times you need to sleep during a test you could instead use Consul's retry.Run like this:
https://github.com/hashicorp/consul-k8s/blob/master/catalog/from-consul/source_test.go#L39
It'll retry until tests pass every 25ms up to 7s. This way you can keep the sleeping time close to the minimum amount needed.
It also helps if for some reason you need to sleep more than 500ms because of issues in CI.
There was a problem hiding this comment.
🎉 This looks great! It will be good to have symmetry in the ability to add prefixes to services that are synced between Consul and Kubernetes.
There are a couple things it would be good to update before merging:
- It looks like there's a new field in syncer.go that isn't used anywhere that should be removed.
- I suggested renaming
serviceNameto be a bit more explicit. This isn't strictly required, but might be nice for folks reading the code in this file. - It would be good to put the prefix tests interspersed in the test file-- specifically having them near the other tests for the same service type.
- A couple of nitpicks :)
Looking forward to merging this!
catalog/from-k8s/resource_test.go
Outdated
| @@ -1770,3 +1770,297 @@ func testService(name string) *apiv1.Service { | |||
| }, | |||
| } | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
The testService function above this is a helper function rather than a test. Usually helper functions are at the bottom of the file, so I'd suggest moving the tests around a bit. Additionally, the standard in this file is to have all of the permutations of loadBalancer, nodePort, etc. tests are grouped together, so it would make more sense to insert these tests near their service type.
|
Shoot, I still need you to update |
Add command line option to enable an additional prefix option. This creates symmetry between sync directions.
|
Everything is 💚 🤞 Thank you for all the help. |
Add
K8sConsulPrefixflag to be used to prepend K8s services in Consul with a prefix