fix(webhook builder): Deepclone the service object on install to prev…

…ent duplicate paths.
buehler · Aug 27, 2021 · 67c52d7 · 67c52d7
1 parent eb4d583
commit 67c52d7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/src/KubeOps/Operator/Commands/Management/Webhooks/Install.cs b/src/KubeOps/Operator/Commands/Management/Webhooks/Install.cs
@@ -90,7 +90,7 @@ public async Task<int> OnExecuteAsync(CommandLineApplication app)
                 new V1Service(
                     V1Service.KubeApiVersion,
                     V1Service.KubeKind,
-                    new V1ObjectMeta(
+                    new(
                         name: _settings.Name,
                         namespaceProperty: @namespace,
                         ownerReferences: deployment != null
@@ -104,7 +104,7 @@ public async Task<int> OnExecuteAsync(CommandLineApplication app)
                             { "operator", _settings.Name },
                             { "usage", "webhook-service" },
                         }),
-                    new V1ServiceSpec
+                    new()
                     {
                         Ports = new List<V1ServicePort>
                         {
@@ -126,17 +126,14 @@ public async Task<int> OnExecuteAsync(CommandLineApplication app)
                 _settings.Name,
                 null,
                 caBundle,
-                new Admissionregistrationv1ServiceReference
+                new()
                 {
                     Name = _settings.Name,
                     NamespaceProperty = @namespace,
                 });
 
             await app.Out.WriteLineAsync("Create validator definition.");
             var validatorConfig = _validatingWebhookConfigurationBuilder.BuildWebhookConfiguration(webhookConfig);
-
-            await _client.Delete<V1ValidatingWebhookConfiguration>(validatorConfig.Name());
-
             if (deployment != null)
             {
                 validatorConfig.Metadata.OwnerReferences = new List<V1OwnerReference>
@@ -145,13 +142,10 @@ public async Task<int> OnExecuteAsync(CommandLineApplication app)
                 };
             }
 
-            await _client.Create(validatorConfig);
+            await _client.Save(validatorConfig);
 
             await app.Out.WriteLineAsync("Create mutator definition.");
             var mutatorConfig = _mutatingWebhookConfigurationBuilder.BuildWebhookConfiguration(webhookConfig);
-
-            await _client.Delete<V1MutatingWebhookConfiguration>(mutatorConfig.Name());
-
             if (deployment != null)
             {
                 mutatorConfig.Metadata.OwnerReferences = new List<V1OwnerReference>
@@ -160,7 +154,9 @@ public async Task<int> OnExecuteAsync(CommandLineApplication app)
                 };
             }
 
-            await _client.Create(mutatorConfig);
+            await _client.Save(mutatorConfig);
+
+            await app.Out.WriteLineAsync("Installed webhook service and admission configurations.");
 
             return ExitCodes.Success;
         }

diff --git a/src/KubeOps/Operator/Webhooks/MutatingWebhookBuilder.cs b/src/KubeOps/Operator/Webhooks/MutatingWebhookBuilder.cs
@@ -5,6 +5,7 @@
 using DotnetKubernetesClient.Entities;
 using k8s.Models;
 using KubeOps.Operator.Builder;
+using KubeOps.Operator.Entities.Extensions;
 using KubeOps.Operator.Util;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -47,7 +48,7 @@ public List<V1MutatingWebhook> BuildWebhooks(WebhookConfig webhookConfig)
                         }
                         else
                         {
-                            clientConfig.Service = webhookConfig.Service;
+                            clientConfig.Service = webhookConfig.Service?.DeepClone();
                             if (clientConfig.Service != null)
                             {
                                 clientConfig.Service.Path = endpoint;

diff --git a/src/KubeOps/Operator/Webhooks/ValidatingWebhookBuilder.cs b/src/KubeOps/Operator/Webhooks/ValidatingWebhookBuilder.cs
@@ -5,6 +5,7 @@
 using DotnetKubernetesClient.Entities;
 using k8s.Models;
 using KubeOps.Operator.Builder;
+using KubeOps.Operator.Entities.Extensions;
 using KubeOps.Operator.Util;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -47,7 +48,7 @@ public List<V1ValidatingWebhook> BuildWebhooks(WebhookConfig webhookConfig)
                         }
                         else
                         {
-                            clientConfig.Service = webhookConfig.Service;
+                            clientConfig.Service = webhookConfig.Service?.DeepClone();
                             if (clientConfig.Service != null)
                             {
                                 clientConfig.Service.Path = endpoint;

diff --git a/src/KubeOps/Operator/Webhooks/ValidatingWebhookConfigurationBuilder.cs b/src/KubeOps/Operator/Webhooks/ValidatingWebhookConfigurationBuilder.cs
@@ -18,7 +18,7 @@ public ValidatingWebhookConfigurationBuilder(ValidatingWebhookBuilder webhookBui
                 Kind = V1ValidatingWebhookConfiguration.KubeKind,
                 ApiVersion =
                     $"{V1ValidatingWebhookConfiguration.KubeGroup}/{V1ValidatingWebhookConfiguration.KubeApiVersion}",
-                Metadata = new V1ObjectMeta
+                Metadata = new()
                 {
                     Name = webhookConfig.OperatorName.TrimWebhookName("validators."),
                 },