Remove no longer needed patch

This was fixed upstream: kubernetes/kubernetes#114585
nagare-media · Jan 22, 2023 · 0b2dc6f · 0b2dc6f
1 parent 3a058c6
commit 0b2dc6f
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 77 deletions.
diff --git a/config/crd/bases/engine.nagare.media_clusterfunctions.yaml b/config/crd/bases/engine.nagare.media_clusterfunctions.yaml
@@ -2282,7 +2282,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -3789,7 +3791,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -5337,7 +5341,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -7322,7 +7328,9 @@ spec:
                                                         - name
                                                         type: object
                                                       type: array
-                                                      x-kubernetes-list-type: set
+                                                      x-kubernetes-list-map-keys:
+                                                      - name
+                                                      x-kubernetes-list-type: map
                                                     limits:
                                                       additionalProperties:
                                                         anyOf:

diff --git a/config/crd/bases/engine.nagare.media_clustertasktemplates.yaml b/config/crd/bases/engine.nagare.media_clustertasktemplates.yaml
@@ -2428,7 +2428,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -3935,7 +3937,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -5483,7 +5487,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -7468,7 +7474,9 @@ spec:
                                                         - name
                                                         type: object
                                                       type: array
-                                                      x-kubernetes-list-type: set
+                                                      x-kubernetes-list-map-keys:
+                                                      - name
+                                                      x-kubernetes-list-type: map
                                                     limits:
                                                       additionalProperties:
                                                         anyOf:

diff --git a/config/crd/bases/engine.nagare.media_functions.yaml b/config/crd/bases/engine.nagare.media_functions.yaml
@@ -2282,7 +2282,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -3789,7 +3791,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -5337,7 +5341,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -7322,7 +7328,9 @@ spec:
                                                         - name
                                                         type: object
                                                       type: array
-                                                      x-kubernetes-list-type: set
+                                                      x-kubernetes-list-map-keys:
+                                                      - name
+                                                      x-kubernetes-list-type: map
                                                     limits:
                                                       additionalProperties:
                                                         anyOf:

diff --git a/config/crd/bases/engine.nagare.media_tasks.yaml b/config/crd/bases/engine.nagare.media_tasks.yaml
@@ -2488,7 +2488,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -3995,7 +3997,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -5543,7 +5547,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -7528,7 +7534,9 @@ spec:
                                                         - name
                                                         type: object
                                                       type: array
-                                                      x-kubernetes-list-type: set
+                                                      x-kubernetes-list-map-keys:
+                                                      - name
+                                                      x-kubernetes-list-type: map
                                                     limits:
                                                       additionalProperties:
                                                         anyOf:

diff --git a/config/crd/bases/engine.nagare.media_tasktemplates.yaml b/config/crd/bases/engine.nagare.media_tasktemplates.yaml
@@ -2427,7 +2427,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -3934,7 +3936,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -5482,7 +5486,9 @@ spec:
                                             - name
                                             type: object
                                           type: array
-                                          x-kubernetes-list-type: set
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -7467,7 +7473,9 @@ spec:
                                                         - name
                                                         type: object
                                                       type: array
-                                                      x-kubernetes-list-type: set
+                                                      x-kubernetes-list-map-keys:
+                                                      - name
+                                                      x-kubernetes-list-type: map
                                                     limits:
                                                       additionalProperties:
                                                         anyOf:

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -41,39 +41,6 @@ patchesStrategicMerge:
 - patches/cainjection_in_workflows.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
-patchesJson6902:
-# patches here fix missing x-kubernetes-map-type
-- target:
-    group: apiextensions.k8s.io
-    version: v1
-    kind: CustomResourceDefinition
-    name: clustertasktemplates.engine.nagare.media
-  path: patches/maptype_tasks.yaml
-- target:
-    group: apiextensions.k8s.io
-    version: v1
-    kind: CustomResourceDefinition
-    name: tasks.engine.nagare.media
-  path: patches/maptype_tasks.yaml
-- target:
-    group: apiextensions.k8s.io
-    version: v1
-    kind: CustomResourceDefinition
-    name: tasktemplates.engine.nagare.media
-  path: patches/maptype_tasks.yaml
-- target:
-    group: apiextensions.k8s.io
-    version: v1
-    kind: CustomResourceDefinition
-    name: clusterfunctions.engine.nagare.media
-  path: patches/maptype_functions.yaml
-- target:
-    group: apiextensions.k8s.io
-    version: v1
-    kind: CustomResourceDefinition
-    name: functions.engine.nagare.media
-  path: patches/maptype_functions.yaml
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml
diff --git a/config/crd/patches/maptype_functions.yaml b/config/crd/patches/maptype_functions.yaml
diff --git a/config/crd/patches/maptype_tasks.yaml b/config/crd/patches/maptype_tasks.yaml