fix: k8s registry auth

GZTimeWalker · Sep 10, 2022 · ff49b53 · ff49b53
1 parent cb72bea
commit ff49b53
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/GZCTF/Services/K8sService.cs b/GZCTF/Services/K8sService.cs
@@ -47,7 +47,14 @@ public K8sService(IOptions<RegistryConfig> _registry, ILogger<K8sService> logger
             var padding = Codec.StrMD5($"{_registry.Value.UserName}@{_registry.Value.Password}@{_registry.Value.ServerAddress}");
             SecretName = $"{_registry.Value.UserName}-{padding}";
 
-            var dockerjson = Codec.Base64.EncodeToBytes($"{{\"{_registry.Value.ServerAddress}\":{{\"username\":\"{_registry.Value.UserName}\",\"password\":\"{_registry.Value.Password}\"}}}}");
+            var auth = Codec.Base64.Encode($"{_registry.Value.UserName}:{_registry.Value.Password}");
+            var dockerjson = Codec.Base64.EncodeToBytes(
+                $"{{\"auths\":" +
+                    $"{{\"{_registry.Value.ServerAddress}\":" +
+                        $"{{\"auth\":\"{auth}\"," +
+                        $"\"username\":\"{_registry.Value.UserName}\"," +
+                        $"\"password\":\"{_registry.Value.Password}\"" +
+                $"}}}}}}");
             var secret = new V1Secret()
             {
                 Metadata = new V1ObjectMeta()
@@ -63,11 +70,11 @@ public K8sService(IOptions<RegistryConfig> _registry, ILogger<K8sService> logger
 
             try
             {
-                kubernetesClient.CoreV1.ReplaceNamespacedSecretAsync(secret, SecretName, Namespace);
+                kubernetesClient.CoreV1.ReplaceNamespacedSecret(secret, SecretName, Namespace);
             }
-            catch (Exception)
+            catch(Exception)
             {
-                kubernetesClient.CoreV1.CreateNamespacedSecretAsync(secret, Namespace);
+                kubernetesClient.CoreV1.CreateNamespacedSecret(secret, Namespace);
             }
         }