Fix FortiOS mirror not resolving host secrets in the same namespace.

winromulus · winromulus · commit 3950809dd67a · 2020-04-26T03:05:12.000+03:00
diff --git a/src/ES.Kubernetes.Reflector.Secrets/FortiMirror.cs b/src/ES.Kubernetes.Reflector.Secrets/FortiMirror.cs
@@ -127,7 +127,10 @@ private async Task OnEvent(WatcherEvent<V1Secret> e)
                 string fortiPassword;
                 try
                 {
-                    var hostSecret = await _apiClient.ReadNamespacedSecretAsync(hostSecretId.Name, hostSecretId.Namespace);
+                    var hostSecret = await _apiClient.ReadNamespacedSecretAsync(hostSecretId.Name,
+                        string.IsNullOrWhiteSpace(hostSecretId.Namespace)
+                            ? e.Item.Metadata.NamespaceProperty
+                            : hostSecretId.Namespace);
                     if (hostSecret.Data is null || !hostSecret.Data.Keys.Any())
                     {
                         _logger.LogWarning("Cannot reflect {secretId} to {hostSecretId}. " +

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,10 @@ private async Task OnEvent(WatcherEvent<V1Secret> e)`
`127`	`127`	`string fortiPassword;`
`128`	`128`	`try`
`129`	`129`	`{`
`130`		`- var hostSecret = await _apiClient.ReadNamespacedSecretAsync(hostSecretId.Name, hostSecretId.Namespace);`
	`130`	`+ var hostSecret = await _apiClient.ReadNamespacedSecretAsync(hostSecretId.Name,`
	`131`	`+ string.IsNullOrWhiteSpace(hostSecretId.Namespace)`
	`132`	`+ ? e.Item.Metadata.NamespaceProperty`
	`133`	`+ : hostSecretId.Namespace);`
`131`	`134`	`if (hostSecret.Data is null \|\| !hostSecret.Data.Keys.Any())`
`132`	`135`	`{`
`133`	`136`	`_logger.LogWarning("Cannot reflect {secretId} to {hostSecretId}. " +`