From 9bac7248dc2cbc3aa6538f080bf4014e903f83e4 Mon Sep 17 00:00:00 2001
From: Mikhail Fedosin <mfedosin@newrelic.com>
Date: Thu, 10 Aug 2023 19:11:48 +0200
Subject: [PATCH] fix incorrect fieldSpecs paths

Several paths for name references are not correct and therefore
kustomize doesn't substitute right values there.

This PR fixes it to make kustomize works correctly.
---
 config/crd/kustomizeconfig.yaml            | 4 ++--
 test/e2e/resources/full-chart-install.yaml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/crd/kustomizeconfig.yaml b/config/crd/kustomizeconfig.yaml
index 6f83d9a94..8e2d8d6b1 100644
--- a/config/crd/kustomizeconfig.yaml
+++ b/config/crd/kustomizeconfig.yaml
@@ -5,12 +5,12 @@ nameReference:
   fieldSpecs:
   - kind: CustomResourceDefinition
     group: apiextensions.k8s.io
-    path: spec/conversion/webhookClientConfig/service/name
+    path: spec/conversion/webhook/clientConfig/service/name
 
 namespace:
 - kind: CustomResourceDefinition
   group: apiextensions.k8s.io
-  path: spec/conversion/webhookClientConfig/service/namespace
+  path: spec/conversion/webhook/clientConfig/service/namespace
   create: false
 
 varReference:
diff --git a/test/e2e/resources/full-chart-install.yaml b/test/e2e/resources/full-chart-install.yaml
index b7247e943..c28343949 100644
--- a/test/e2e/resources/full-chart-install.yaml
+++ b/test/e2e/resources/full-chart-install.yaml
@@ -16,7 +16,7 @@ spec:
       clientConfig:
         caBundle: Cg==
         service:
-          name: webhook-service
+          name: capi-operator-webhook-service
           namespace: 'capi-operator-system'
           path: /convert
       conversionReviewVersions:
@@ -1577,7 +1577,7 @@ spec:
       clientConfig:
         caBundle: Cg==
         service:
-          name: webhook-service
+          name: capi-operator-webhook-service
           namespace: 'capi-operator-system'
           path: /convert
       conversionReviewVersions:
@@ -3140,7 +3140,7 @@ spec:
       clientConfig:
         caBundle: Cg==
         service:
-          name: webhook-service
+          name: capi-operator-webhook-service
           namespace: 'capi-operator-system'
           path: /convert
       conversionReviewVersions:
@@ -4701,7 +4701,7 @@ spec:
       clientConfig:
         caBundle: Cg==
         service:
-          name: webhook-service
+          name: capi-operator-webhook-service
           namespace: 'capi-operator-system'
           path: /convert
       conversionReviewVersions: