Skip to content

Commit ab59d8a

Browse files
csantanaprcsantanapr
authored
change usage of {{metadata.annotations.addons_repo_basepath}} (#23)
Signed-off-by: Carlos Santana <[email protected]>
1 parent df18cff commit ab59d8a

32 files changed

+126
-117
lines changed

‎bootstrap/control-plane/addons/aws/addons-aws-cloudwatch-metrics-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ spec:
5252
releaseName: '{{values.addonChart}}'
5353
ignoreMissingValueFiles: true
5454
valueFiles:
55-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
56-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
55+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
56+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
5858
values: |
5959
clusterName: {{metadata.annotations.aws_cluster_name}}
6060
serviceAccount:

‎bootstrap/control-plane/addons/aws/addons-aws-csi-ebs-resources-appset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ spec:
4747
automated: {}
4848
syncOptions:
4949
- CreateNamespace=true
50-
- ServerSideApply=true # Big CRDs.
50+
- ServerSideApply=true # Big CRDs.

‎bootstrap/control-plane/addons/aws/addons-aws-csi-efs-driver-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ spec:
5252
releaseName: '{{values.addonChart}}'
5353
ignoreMissingValueFiles: true
5454
valueFiles:
55-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
56-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
55+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
56+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
5858
values: |
5959
controller:
6060
serviceAccount:

‎bootstrap/control-plane/addons/aws/addons-aws-csi-fsx-driver-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ spec:
5252
releaseName: '{{values.addonChart}}'
5353
ignoreMissingValueFiles: true
5454
valueFiles:
55-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
56-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
55+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
56+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
5858
values: |
5959
controller:
6060
serviceAccount:

‎bootstrap/control-plane/addons/aws/addons-aws-fluentbit-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ spec:
5252
releaseName: '{{values.addonChart}}'
5353
ignoreMissingValueFiles: true
5454
valueFiles:
55-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
56-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
55+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
56+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
5858
values: |
5959
cloudWatchLogs:
6060
enabled: true

‎bootstrap/control-plane/addons/aws/addons-aws-gateway-api-controller-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ spec:
5656
releaseName: '{{values.addonChartReleaseName}}'
5757
ignoreMissingValueFiles: true
5858
valueFiles:
59-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
60-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChartReleaseName}}/values.yaml
61-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChartReleaseName}}/values.yaml
59+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
60+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChartReleaseName}}/values.yaml
61+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChartReleaseName}}/values.yaml
6262
values: |
6363
awsRegion: {{metadata.annotations.aws_region}}
6464
awsAccountId: '"{{metadata.annotations.aws_account_id}}"' # Issue https://github.com/aws/aws-application-networking-k8s/issues/324

‎bootstrap/control-plane/addons/aws/addons-aws-load-balancer-controller-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ spec:
5252
releaseName: '{{values.addonChart}}'
5353
ignoreMissingValueFiles: true
5454
valueFiles:
55-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
56-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
55+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
56+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
5858
values: |
5959
clusterName: {{metadata.annotations.aws_cluster_name}}
6060
serviceAccount:

‎bootstrap/control-plane/addons/aws/addons-aws-node-termination-handler-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ spec:
5252
releaseName: '{{values.addonChart}}'
5353
ignoreMissingValueFiles: true
5454
valueFiles:
55-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
56-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
55+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
56+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
5858
values: |
5959
awsRegion: {{metadata.annotations.aws_region}}
6060
queueURL: {{metadata.annotations.aws_node_termination_handler_sqs_queue_url}}

‎bootstrap/control-plane/addons/aws/addons-aws-oss-cert-manager-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ spec:
5454
releaseName: '{{values.addonChart}}'
5555
ignoreMissingValueFiles: true
5656
valueFiles:
57-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
58-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
59-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
58+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
59+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
6060
values: |
6161
installCRDs: true
6262
serviceAccount:

‎bootstrap/control-plane/addons/aws/addons-aws-oss-cluster-autoscaler-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ spec:
106106
releaseName: '{{values.addonChart}}'
107107
ignoreMissingValueFiles: true
108108
valueFiles:
109-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
110-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
111-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
109+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
110+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
111+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
112112
values: |
113113
image:
114114
tag: {{values.clusterAutoScalerImageTag}}

‎bootstrap/control-plane/addons/aws/addons-aws-oss-external-dns-appset.yaml

+20-16
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ kind: ApplicationSet
44
metadata:
55
name: addons-aws-external-dns
66
spec:
7+
goTemplate: true
78
syncPolicy:
89
preserveResourcesOnDeletion: true
910
generators:
@@ -38,35 +39,38 @@ spec:
3839
addonChartVersion: 1.13.0
3940
template:
4041
metadata:
41-
name: addon-{{name}}-{{values.addonChart}}
42+
name: 'addon-{{.name}}-{{.values.addonChart}}'
4243
spec:
4344
project: default
4445
sources:
45-
- repoURL: '{{metadata.annotations.addons_repo_url}}'
46-
targetRevision: '{{metadata.annotations.addons_repo_revision}}'
46+
- repoURL: '{{.metadata.annotations.addons_repo_url}}'
47+
targetRevision: '{{.metadata.annotations.addons_repo_revision}}'
4748
ref: values
48-
- chart: '{{values.addonChart}}'
49-
repoURL: '{{values.addonChartRepository}}'
50-
targetRevision: '{{values.addonChartVersion}}'
49+
- chart: '{{.values.addonChart}}'
50+
repoURL: '{{.values.addonChartRepository}}'
51+
targetRevision: '{{.values.addonChartVersion}}'
5152
helm:
52-
releaseName: '{{values.addonChart}}'
53+
releaseName: '{{.values.addonChart}}'
5354
ignoreMissingValueFiles: true
5455
valueFiles:
55-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
56-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
56+
- $values{{.metadata.annotations.addons_repo_basepath}}/charts/addons/{{.values.addonChart}}/values.yaml
57+
- $values{{.metadata.annotations.addons_repo_basepath}}/environments/{{.metadata.labels.environment}}/addons/{{.values.addonChart}}/values.yaml
58+
- $values{{.metadata.annotations.addons_repo_basepath}}/clusters/{{.name}}/addons/{{.values.addonChart}}/values.yaml
5859
values: |
5960
provider: aws
6061
serviceAccount:
61-
name: {{metadata.annotations.external_dns_service_account}}
62+
name: {{.metadata.annotations.external_dns_service_account}}
6263
annotations:
63-
eks.amazonaws.com/role-arn: {{metadata.annotations.external_dns_iam_role_arn}}
64-
domainFilters: {{metadata.annotations.external_dns_domain_filters}}
64+
eks.amazonaws.com/role-arn: {{.metadata.annotations.external_dns_iam_role_arn}}
65+
domainFilters:
66+
- {{default "" .metadata.annotations.eks_cluster_domain}}
67+
txtOwnerId: {{.metadata.annotations.aws_cluster_name}}
68+
policy: {{default "upsert-only" .metadata.annotations.external_dns_policy}}
6569
destination:
66-
namespace: '{{metadata.annotations.external_dns_namespace}}'
67-
name: '{{name}}'
70+
namespace: '{{.metadata.annotations.external_dns_namespace}}'
71+
name: '{{.name}}'
6872
syncPolicy:
6973
automated: {}
7074
syncOptions:
7175
- CreateNamespace=true
72-
- ServerSideApply=true # Big CRDs.
76+
- ServerSideApply=true # Big CRDs.

‎bootstrap/control-plane/addons/aws/addons-aws-oss-external-secrets-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ spec:
5252
releaseName: '{{values.addonChart}}'
5353
ignoreMissingValueFiles: true
5454
valueFiles:
55-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
56-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
55+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
56+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
5858
values: |
5959
serviceAccount:
6060
name: {{metadata.annotations.external_secrets_service_account}}

‎bootstrap/control-plane/addons/aws/addons-aws-oss-karpenter-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ spec:
5454
releaseName: '{{values.addonChart}}'
5555
ignoreMissingValueFiles: true
5656
valueFiles:
57-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
58-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
59-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
58+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
59+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
6060
values: |
6161
settings:
6262
aws:

‎bootstrap/control-plane/addons/aws/addons-aws-oss-privateca-issuer-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ spec:
5252
releaseName: '{{values.addonChart}}'
5353
ignoreMissingValueFiles: true
5454
valueFiles:
55-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
56-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
55+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
56+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
5858
values: |
5959
serviceAccount:
6060
name: {{metadata.annotations.aws_privateca_issuer_service_account}}

‎bootstrap/control-plane/addons/aws/addons-aws-oss-velero-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ spec:
5454
releaseName: '{{values.addonChart}}'
5555
ignoreMissingValueFiles: true
5656
valueFiles:
57-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
58-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
59-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
58+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
59+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
6060
values: |
6161
configuration:
6262
backupStorageLocation:

‎bootstrap/control-plane/addons/aws/addons-aws-secrets-store-csi-driver-provider-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ spec:
5353
releaseName: '{{values.addonChart}}'
5454
ignoreMissingValueFiles: true
5555
valueFiles:
56-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
58-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
56+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
58+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
5959
destination:
6060
namespace: '{{values.addonChartNamespace}}'
6161
name: '{{name}}'

‎bootstrap/control-plane/addons/oss/addons-argo-cd-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ spec:
5353
releaseName: '{{values.addonChart}}'
5454
ignoreMissingValueFiles: true
5555
valueFiles:
56-
- $values{{metadata.annotations.addons_repo_basepath}}/charts/addons/{{values.addonChart}}/values.yaml
57-
- $values{{metadata.annotations.addons_repo_basepath}}/environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
58-
- $values{{metadata.annotations.addons_repo_basepath}}/clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
56+
- $values/{{metadata.annotations.addons_repo_basepath}}charts/addons/{{values.addonChart}}/values.yaml
57+
- $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/values.yaml
58+
- $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/values.yaml
5959
destination:
6060
namespace: '{{values.addonChartRepositoryNamespace}}'
6161
name: '{{name}}'

0 commit comments

Comments
 (0)