fixup! build: Back to previous order of AWS patches

Makes diff smaller.

Author: jimmidyson

charts/capi-runtime-extensions/defaultclusterclasses/aws-cluster-class.yaml

@@ -21,6 +21,14 @@ spec:
       kind: AWSClusterTemplate
       name: aws-quick-start
   patches:
+    - external:
+        discoverVariablesExtension: awsclusterconfigvars.capi-runtime-extensions
+        generateExtension: awsclusterconfigpatch.capi-runtime-extensions
+      name: cluster-config
+    - external:
+        discoverVariablesExtension: awsworkerconfigvars.capi-runtime-extensions
+        generateExtension: awsworkerconfigpatch.capi-runtime-extensions
+      name: worker-config
     - definitions:
         - jsonPatches:
             - op: add
@@ -35,14 +43,6 @@ spec:
               infrastructureCluster: true
       description: AWSClusterStaticIdentity identityRef to use when creating the cluster
       name: identityRef
-    - external:
-        discoverVariablesExtension: awsclusterconfigvars.capi-runtime-extensions
-        generateExtension: awsclusterconfigpatch.capi-runtime-extensions
-      name: cluster-config
-    - external:
-        discoverVariablesExtension: awsworkerconfigvars.capi-runtime-extensions
-        generateExtension: awsworkerconfigpatch.capi-runtime-extensions
-      name: worker-config
   workers:
     machineDeployments:
       - class: default-worker

hack/examples/bases/aws/kustomization.yaml.tmpl

@@ -82,6 +82,14 @@ patches:
     - op: "add"
       path: "/spec/patches"
       value:
+        - name: "cluster-config"
+          external:
+            generateExtension: "awsclusterconfigpatch.capi-runtime-extensions"
+            discoverVariablesExtension: "awsclusterconfigvars.capi-runtime-extensions"
+        - name: "worker-config"
+          external:
+            generateExtension: "awsworkerconfigpatch.capi-runtime-extensions"
+            discoverVariablesExtension: "awsworkerconfigvars.capi-runtime-extensions"
         - name: identityRef
           definitions:
             - jsonPatches:
@@ -96,14 +104,6 @@ patches:
                 matchResources:
                   infrastructureCluster: true
           description: AWSClusterStaticIdentity identityRef to use when creating the cluster
-        - name: "cluster-config"
-          external:
-            generateExtension: "awsclusterconfigpatch.capi-runtime-extensions"
-            discoverVariablesExtension: "awsclusterconfigvars.capi-runtime-extensions"
-        - name: "worker-config"
-          external:
-            generateExtension: "awsworkerconfigpatch.capi-runtime-extensions"
-            discoverVariablesExtension: "awsworkerconfigvars.capi-runtime-extensions"
     - op: "remove"
       path: "/spec/variables"
 - target: