From 125c48357ac63090d98fb2c02b00bfe07473f0d5 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Thu, 16 Nov 2023 20:50:27 +0100 Subject: [PATCH] fix: Removed incorrect nullable ref from kustomizations (#641) ## Description - Removed incorrect nullable ref from kustomizations - Regenerated files --------- Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../flux-configuration/README.md | 136 +++++++++--------- .../flux-configuration/main.bicep | 2 +- .../flux-configuration/main.json | 3 +- 3 files changed, 70 insertions(+), 71 deletions(-) diff --git a/avm/res/kubernetes-configuration/flux-configuration/README.md b/avm/res/kubernetes-configuration/flux-configuration/README.md index 8162c8dd7a..8ca0ad8ee4 100644 --- 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: '' + 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: '' } } @@ -87,6 +87,13 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config "clusterName": { "value": "" }, + "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": "" } @@ -146,21 +146,6 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config params: { // Required parameters clusterName: '' - name: 'kcfcmax001' - namespace: 'flux-system' - sourceKind: 'GitRepository' - // Non-required parameters - bucket: '' - 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: '' + configurationProtectedSettings: '' + gitRepository: { + repositoryRef: { + branch: 'main' + } + sshKnownHosts: '' + syncIntervalInSeconds: 300 + timeoutInSeconds: 180 + url: 'https://github.com/mspnp/aks-baseline' + } location: '' } } @@ -198,6 +198,24 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config "clusterName": { "value": "" }, + "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": "" } @@ -268,6 +268,16 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config params: { // Required parameters 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: '' } } @@ -314,6 +314,18 @@ module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-config "clusterName": { "value": "" }, + "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": "" } @@ -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 index 2f5e1e15d3..d20f80e3e8 100644 --- 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 index dfa1b3da1d..e225cd2962 100644 --- 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." }