Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Removed incorrect nullable ref from kustomizations #641

Merged
merged 33 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
20ac8b7
Added skeleton
AlexanderSehr Nov 7, 2023
4939b4d
Implemented first new tests
AlexanderSehr Nov 7, 2023
4e1d86f
Changed to warning
AlexanderSehr Nov 8, 2023
94fff0b
Expanded test verbosity & added additional tets
AlexanderSehr Nov 8, 2023
c18ce6b
Finalized further tests
AlexanderSehr Nov 8, 2023
a343694
Update to latest
AlexanderSehr Nov 8, 2023
3a6f0a2
Update to latest
AlexanderSehr Nov 8, 2023
4ab6a5b
Added module name + small fix
AlexanderSehr Nov 8, 2023
9bb64bd
Fixed kvlt
AlexanderSehr Nov 8, 2023
68e2bd2
Small caching fix
AlexanderSehr Nov 8, 2023
1a013c2
Small fix and enabled passthru of warnings to GH
AlexanderSehr Nov 8, 2023
1c2fc8a
More updates
AlexanderSehr Nov 8, 2023
d9c6dd5
Update to latest
AlexanderSehr Nov 8, 2023
dd0c343
Updated test names
AlexanderSehr Nov 8, 2023
2ebd458
JSON rollback
AlexanderSehr Nov 8, 2023
f6caf7e
Updated regex
AlexanderSehr Nov 8, 2023
f56f66a
Removed assertion
AlexanderSehr Nov 8, 2023
282b640
Update to latest
AlexanderSehr Nov 8, 2023
c025f52
Update avm/utilities/pipelines/staticValidation/compliance/module.tes…
AlexanderSehr Nov 9, 2023
405901a
Update avm/utilities/pipelines/staticValidation/compliance/module.tes…
AlexanderSehr Nov 9, 2023
904c82f
Merge branch 'main' into users/alsehr/testFileCompliance
AlexanderSehr Nov 9, 2023
ef24d1f
Rollback of unrelated changes
AlexanderSehr Nov 9, 2023
9393aa1
Merge branch 'Azure:main' into main
AlexanderSehr Nov 9, 2023
cb39086
Merge branch 'Azure:main' into main
AlexanderSehr Nov 9, 2023
89eac40
Merge branch 'Azure:main' into main
AlexanderSehr Nov 10, 2023
712a673
Merge branch 'Azure:main' into main
AlexanderSehr Nov 13, 2023
55e095f
Resolved conflict
AlexanderSehr Nov 14, 2023
3121335
Update to latest
AlexanderSehr Nov 14, 2023
e9d736c
Merge branch 'Azure:main' into main
AlexanderSehr Nov 15, 2023
abfa1b9
Merge branch 'Azure:main' into main
AlexanderSehr Nov 15, 2023
c6707f6
Merge branch 'Azure:main' into main
AlexanderSehr Nov 16, 2023
5ee24a8
Removed incorrect nullable ref
AlexanderSehr Nov 16, 2023
66fe556
Merge branch 'main' into users/alsehr/fluxFixOptional
AlexanderSehr Nov 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 68 additions & 68 deletions avm/res/kubernetes-configuration/flux-configuration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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>'
}
}
Expand All @@ -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"
},
Expand Down Expand Up @@ -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>"
}
Expand All @@ -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: []
Expand All @@ -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>'
}
}
Expand All @@ -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"
},
Expand Down Expand Up @@ -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>"
}
Expand All @@ -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'
Expand All @@ -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>'
}
}
Expand All @@ -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"
},
Expand Down Expand Up @@ -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>"
}
Expand Down Expand Up @@ -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`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down Expand Up @@ -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."
}
Expand Down