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

Feature/name k8s node #312

Merged
merged 6 commits into from
Sep 9, 2020
Merged

Feature/name k8s node #312

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db5efab
Add option to name K8s Node in Consul
Mikulas Jun 19, 2019
04e3005
Update node references to include Consul for clarity
adilyse Aug 10, 2020
5e7491d
Make syncer test functions private
adilyse Aug 21, 2020
9ad0b5d
Make Consul node name configurable for sync acl token
adilyse Aug 26, 2020
00bd66e
Add node name validation to the catalog sync process
adilyse Aug 26, 2020
50e2ccf
Code review updates
ishustava Sep 9, 2020
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
2 changes: 1 addition & 1 deletion catalog/to-consul/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ func (t *ServiceResource) generateRegistrations(key string) {
// shallow copied for each instance.
baseNode := consulapi.CatalogRegistration{
SkipNodeUpdate: true,
Node: ConsulSyncNodeName,
Node: t.Syncer.ConsulNode(),
Address: "127.0.0.1",
NodeMeta: map[string]string{
ConsulSourceKey: ConsulSourceValue,
Expand Down
78 changes: 39 additions & 39 deletions catalog/to-consul/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func init() {
func TestServiceResource_createDelete(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)

// Start the controller
Expand Down Expand Up @@ -55,7 +55,7 @@ func TestServiceResource_createDelete(t *testing.T) {
func TestServiceResource_defaultEnable(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)

// Start the controller
Expand All @@ -80,7 +80,7 @@ func TestServiceResource_defaultEnable(t *testing.T) {
func TestServiceResource_defaultEnableDisable(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)

// Start the controller
Expand All @@ -106,7 +106,7 @@ func TestServiceResource_defaultEnableDisable(t *testing.T) {
func TestServiceResource_defaultDisable(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ExplicitEnable = true

Expand All @@ -132,7 +132,7 @@ func TestServiceResource_defaultDisable(t *testing.T) {
func TestServiceResource_defaultDisableEnable(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ExplicitEnable = true

Expand All @@ -159,7 +159,7 @@ func TestServiceResource_defaultDisableEnable(t *testing.T) {
func TestServiceResource_changeSyncToFalse(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ExplicitEnable = true

Expand Down Expand Up @@ -200,7 +200,7 @@ func TestServiceResource_changeSyncToFalse(t *testing.T) {
func TestServiceResource_addK8SNamespace(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.AddK8SNamespaceSuffix = true

Expand Down Expand Up @@ -228,7 +228,7 @@ func TestServiceResource_addK8SNamespace(t *testing.T) {
func TestServiceResource_addK8SNamespaceWithPrefix(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.AddK8SNamespaceSuffix = true
serviceResource.ConsulServicePrefix = "prefix"
Expand Down Expand Up @@ -257,7 +257,7 @@ func TestServiceResource_addK8SNamespaceWithPrefix(t *testing.T) {
func TestServiceResource_addK8SNamespaceWithNameAnnotation(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.AddK8SNamespaceSuffix = true

Expand Down Expand Up @@ -285,7 +285,7 @@ func TestServiceResource_addK8SNamespaceWithNameAnnotation(t *testing.T) {
func TestServiceResource_externalIP(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)

// Start the controller
Expand Down Expand Up @@ -315,7 +315,7 @@ func TestServiceResource_externalIP(t *testing.T) {
func TestServiceResource_externalIPPrefix(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ConsulServicePrefix = "prefix"

Expand Down Expand Up @@ -346,7 +346,7 @@ func TestServiceResource_externalIPPrefix(t *testing.T) {
func TestServiceResource_lb(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)

// Start the controller
Expand All @@ -373,7 +373,7 @@ func TestServiceResource_lb(t *testing.T) {
func TestServiceResource_lbPrefix(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ConsulServicePrefix = "prefix"

Expand Down Expand Up @@ -402,7 +402,7 @@ func TestServiceResource_lbPrefix(t *testing.T) {
func TestServiceResource_lbMultiEndpoint(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)

// Start the controller
Expand Down Expand Up @@ -436,7 +436,7 @@ func TestServiceResource_lbMultiEndpoint(t *testing.T) {
func TestServiceResource_lbAnnotatedName(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)

// Start the controller
Expand All @@ -463,7 +463,7 @@ func TestServiceResource_lbAnnotatedName(t *testing.T) {
func TestServiceResource_lbPort(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)

// Start the controller
Expand Down Expand Up @@ -495,7 +495,7 @@ func TestServiceResource_lbPort(t *testing.T) {
func TestServiceResource_lbAnnotatedPort(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)

// Start the controller
Expand Down Expand Up @@ -528,7 +528,7 @@ func TestServiceResource_lbAnnotatedPort(t *testing.T) {
func TestServiceResource_lbAnnotatedTags(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ConsulK8STag = TestConsulK8STag

Expand Down Expand Up @@ -556,7 +556,7 @@ func TestServiceResource_lbAnnotatedTags(t *testing.T) {
func TestServiceResource_lbAnnotatedMeta(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)

// Start the controller
Expand All @@ -583,7 +583,7 @@ func TestServiceResource_lbAnnotatedMeta(t *testing.T) {
func TestServiceResource_lbRegisterEndpoints(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.LoadBalancerEndpointsSync = true

Expand Down Expand Up @@ -637,7 +637,7 @@ func TestServiceResource_lbRegisterEndpoints(t *testing.T) {
// Test that the proper registrations are generated for a NodePort type.
func TestServiceResource_nodePort(t *testing.T) {
t.Parallel()
syncer := &TestSyncer{}
syncer := newTestSyncer()
client := fake.NewSimpleClientset()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.NodePortSync = ExternalOnly
Expand Down Expand Up @@ -677,7 +677,7 @@ func TestServiceResource_nodePort(t *testing.T) {
func TestServiceResource_nodePortPrefix(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.NodePortSync = ExternalOnly
serviceResource.ConsulServicePrefix = "prefix"
Expand Down Expand Up @@ -718,7 +718,7 @@ func TestServiceResource_nodePortPrefix(t *testing.T) {
func TestServiceResource_nodePort_singleEndpoint(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.NodePortSync = ExternalOnly

Expand Down Expand Up @@ -773,7 +773,7 @@ func TestServiceResource_nodePort_singleEndpoint(t *testing.T) {
func TestServiceResource_nodePortAnnotatedPort(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.NodePortSync = ExternalOnly

Expand Down Expand Up @@ -813,7 +813,7 @@ func TestServiceResource_nodePortAnnotatedPort(t *testing.T) {
func TestServiceResource_nodePortUnnamedPort(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.NodePortSync = ExternalOnly

Expand Down Expand Up @@ -858,7 +858,7 @@ func TestServiceResource_nodePortUnnamedPort(t *testing.T) {
func TestServiceResource_nodePort_internalOnlySync(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.NodePortSync = InternalOnly

Expand Down Expand Up @@ -898,7 +898,7 @@ func TestServiceResource_nodePort_internalOnlySync(t *testing.T) {
func TestServiceResource_nodePort_externalFirstSync(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.NodePortSync = ExternalFirst

Expand Down Expand Up @@ -945,7 +945,7 @@ func TestServiceResource_nodePort_externalFirstSync(t *testing.T) {
func TestServiceResource_clusterIP(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ClusterIPSync = true

Expand Down Expand Up @@ -981,7 +981,7 @@ func TestServiceResource_clusterIP(t *testing.T) {
func TestServiceResource_clusterIPPrefix(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ClusterIPSync = true
serviceResource.ConsulServicePrefix = "prefix"
Expand Down Expand Up @@ -1019,7 +1019,7 @@ func TestServiceResource_clusterIPPrefix(t *testing.T) {
func TestServiceResource_clusterIPAnnotatedPortName(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ClusterIPSync = true

Expand Down Expand Up @@ -1057,7 +1057,7 @@ func TestServiceResource_clusterIPAnnotatedPortName(t *testing.T) {
func TestServiceResource_clusterIPAnnotatedPortNumber(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ClusterIPSync = true

Expand Down Expand Up @@ -1094,7 +1094,7 @@ func TestServiceResource_clusterIPAnnotatedPortNumber(t *testing.T) {
func TestServiceResource_clusterIPUnnamedPorts(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ClusterIPSync = true

Expand Down Expand Up @@ -1135,7 +1135,7 @@ func TestServiceResource_clusterIPUnnamedPorts(t *testing.T) {
func TestServiceResource_clusterIPSyncDisabled(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ClusterIPSync = false

Expand Down Expand Up @@ -1164,7 +1164,7 @@ func TestServiceResource_clusterIPSyncDisabled(t *testing.T) {
func TestServiceResource_clusterIPAllNamespaces(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
testNamespace := "test_namespace"
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ClusterIPSync = true
Expand Down Expand Up @@ -1201,7 +1201,7 @@ func TestServiceResource_clusterIPAllNamespaces(t *testing.T) {
func TestServiceResource_clusterIPTargetPortNamed(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ClusterIPSync = true

Expand Down Expand Up @@ -1282,7 +1282,7 @@ func TestServiceResource_AllowDenyNamespaces(t *testing.T) {
for name, c := range cases {
t.Run(name, func(tt *testing.T) {
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.AllowK8sNamespacesSet = c.AllowList
serviceResource.DenyK8sNamespacesSet = c.DenyList
Expand Down Expand Up @@ -1333,7 +1333,7 @@ func TestServiceResource_singleDestNamespace(t *testing.T) {
for _, consulDestNamespace := range consulDestNamespaces {
t.Run(consulDestNamespace, func(tt *testing.T) {
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.ConsulDestinationNamespace = consulDestNamespace
serviceResource.EnableNamespaces = true
Expand All @@ -1358,7 +1358,7 @@ func TestServiceResource_singleDestNamespace(t *testing.T) {
func TestServiceResource_MirroredNamespace(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.EnableK8SNSMirroring = true
serviceResource.EnableNamespaces = true
Expand Down Expand Up @@ -1393,7 +1393,7 @@ func TestServiceResource_MirroredNamespace(t *testing.T) {
func TestServiceResource_MirroredPrefixNamespace(t *testing.T) {
t.Parallel()
client := fake.NewSimpleClientset()
syncer := &TestSyncer{}
syncer := newTestSyncer()
serviceResource := defaultServiceResource(client, syncer)
serviceResource.EnableK8SNSMirroring = true
serviceResource.EnableNamespaces = true
ishustava marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading