fix: Removed incorrect nullable ref from kustomizations (Azure#641)

## Description - Removed incorrect nullable ref from kustomizations - Regenerated files --------- Co-authored-by: Erika Gressi <[email protected]>
segraef · Nov 17, 2023 · 125c483 · 125c483
1 parent 4bd720f
commit 125c483
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 71 deletions.
diff --git a/avm/res/kubernetes-configuration/flux-configuration/README.md b/avm/res/kubernetes-configuration/flux-configuration/README.md
@@ -46,6 +46,11 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
   params: {
     // Required parameters
     clusterName: '<clusterName>'
+    kustomizations: {
+      unified: {
+        path: './cluster-manifests'
+      }
+    }
     name: 'kcfcmin001'
     namespace: 'flux-system'
     sourceKind: 'GitRepository'
@@ -61,11 +66,6 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
       timeoutInSeconds: 180
       url: 'https://github.com/mspnp/aks-baseline'
     }
-    kustomizations: {
-      unified: {
-        path: './cluster-manifests'
-      }
-    }
     location: '<location>'
   }
 }
@@ -87,6 +87,13 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
     "clusterName": {
       "value": "<clusterName>"
     },
+    "kustomizations": {
+      "value": {
+        "unified": {
+          "path": "./cluster-manifests"
+        }
+      }
+    },
     "name": {
       "value": "kcfcmin001"
     },
@@ -114,13 +121,6 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
         "url": "https://github.com/mspnp/aks-baseline"
       }
     },
-    "kustomizations": {
-      "value": {
-        "unified": {
-          "path": "./cluster-manifests"
-        }
-      }
-    },
     "location": {
       "value": "<location>"
     }
@@ -146,21 +146,6 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
   params: {
     // Required parameters
     clusterName: '<clusterName>'
-    name: 'kcfcmax001'
-    namespace: 'flux-system'
-    sourceKind: 'GitRepository'
-    // Non-required parameters
-    bucket: '<bucket>'
-    configurationProtectedSettings: '<configurationProtectedSettings>'
-    gitRepository: {
-      repositoryRef: {
-        branch: 'main'
-      }
-      sshKnownHosts: ''
-      syncIntervalInSeconds: 300
-      timeoutInSeconds: 180
-      url: 'https://github.com/mspnp/aks-baseline'
-    }
     kustomizations: {
       unified: {
         dependsOn: []
@@ -177,6 +162,21 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
         timeoutInSeconds: 300
       }
     }
+    name: 'kcfcmax001'
+    namespace: 'flux-system'
+    sourceKind: 'GitRepository'
+    // Non-required parameters
+    bucket: '<bucket>'
+    configurationProtectedSettings: '<configurationProtectedSettings>'
+    gitRepository: {
+      repositoryRef: {
+        branch: 'main'
+      }
+      sshKnownHosts: ''
+      syncIntervalInSeconds: 300
+      timeoutInSeconds: 180
+      url: 'https://github.com/mspnp/aks-baseline'
+    }
     location: '<location>'
   }
 }
@@ -198,6 +198,24 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
     "clusterName": {
       "value": "<clusterName>"
     },
+    "kustomizations": {
+      "value": {
+        "unified": {
+          "dependsOn": [],
+          "force": false,
+          "path": "./cluster-manifests",
+          "postBuild": {
+            "substitute": {
+              "TEST_VAR1": "foo",
+              "TEST_VAR2": "bar"
+            }
+          },
+          "prune": true,
+          "syncIntervalInSeconds": 300,
+          "timeoutInSeconds": 300
+        }
+      }
+    },
     "name": {
       "value": "kcfcmax001"
     },
@@ -225,24 +243,6 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
         "url": "https://github.com/mspnp/aks-baseline"
       }
     },
-    "kustomizations": {
-      "value": {
-        "unified": {
-          "dependsOn": [],
-          "force": false,
-          "path": "./cluster-manifests",
-          "postBuild": {
-            "substitute": {
-              "TEST_VAR1": "foo",
-              "TEST_VAR2": "bar"
-            }
-          },
-          "prune": true,
-          "syncIntervalInSeconds": 300,
-          "timeoutInSeconds": 300
-        }
-      }
-    },
     "location": {
       "value": "<location>"
     }
@@ -268,6 +268,16 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
   params: {
     // Required parameters
     clusterName: '<clusterName>'
+    kustomizations: {
+      unified: {
+        dependsOn: []
+        force: false
+        path: './cluster-manifests'
+        prune: true
+        syncIntervalInSeconds: 300
+        timeoutInSeconds: 300
+      }
+    }
     name: 'kcfcwaf001'
     namespace: 'flux-system'
     sourceKind: 'GitRepository'
@@ -283,16 +293,6 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
       timeoutInSeconds: 180
       url: 'https://github.com/mspnp/aks-baseline'
     }
-    kustomizations: {
-      unified: {
-        dependsOn: []
-        force: false
-        path: './cluster-manifests'
-        prune: true
-        syncIntervalInSeconds: 300
-        timeoutInSeconds: 300
-      }
-    }
     location: '<location>'
   }
 }
@@ -314,6 +314,18 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
     "clusterName": {
       "value": "<clusterName>"
     },
+    "kustomizations": {
+      "value": {
+        "unified": {
+          "dependsOn": [],
+          "force": false,
+          "path": "./cluster-manifests",
+          "prune": true,
+          "syncIntervalInSeconds": 300,
+          "timeoutInSeconds": 300
+        }
+      }
+    },
     "name": {
       "value": "kcfcwaf001"
     },
@@ -341,18 +353,6 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config
         "url": "https://github.com/mspnp/aks-baseline"
       }
     },
-    "kustomizations": {
-      "value": {
-        "unified": {
-          "dependsOn": [],
-          "force": false,
-          "path": "./cluster-manifests",
-          "prune": true,
-          "syncIntervalInSeconds": 300,
-          "timeoutInSeconds": 300
-        }
-      }
-    },
     "location": {
       "value": "<location>"
     }
@@ -427,7 +427,7 @@ Parameters to reconcile to the GitRepository source kind type. Required if `sour
 ### Parameter: `kustomizations`
 
 Array of kustomizations used to reconcile the artifact pulled by the source type on the cluster.
-- Required: No
+- Required: Yes
 - Type: object
 
 ### Parameter: `location`

diff --git a/avm/res/kubernetes-configuration/flux-configuration/main.bicep b/avm/res/kubernetes-configuration/flux-configuration/main.bicep
@@ -25,7 +25,7 @@ param configurationProtectedSettings object?
 param gitRepository object?
 
 @description('Required. Array of kustomizations used to reconcile the artifact pulled by the source type on the cluster.')
-param kustomizations object?
+param kustomizations object
 
 @description('Required. The namespace to which this configuration is installed to. Maximum of 253 lower case alphanumeric characters, hyphen and period only.')
 param namespace string

diff --git a/avm/res/kubernetes-configuration/flux-configuration/main.json b/avm/res/kubernetes-configuration/flux-configuration/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.23.1.45101",
-      "templateHash": "12231512467754753013"
+      "templateHash": "885928168160399718"
     },
     "name": "Kubernetes Configuration Flux Configurations",
     "description": "This module deploys a Kubernetes Configuration Flux Configuration.",
@@ -62,7 +62,6 @@
     },
     "kustomizations": {
       "type": "object",
-      "nullable": true,
       "metadata": {
         "description": "Required. Array of kustomizations used to reconcile the artifact pulled by the source type on the cluster."
       }