Skip to content

Commit a3fc678

Browse files
QuentinBissonQuentinBisson
committed
fix
1 parent ff59578 commit a3fc678

File tree

9 files changed

+122
-122
lines changed

9 files changed

+122
-122
lines changed

‎helm/grafana/templates/cnpg/crossplane/_helpers.tpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Crossplane enabled check
33
*/}}
44
{{- define "grafana.crossplane.enabled" -}}
5-
{{- if and .Values.postgresqlCluster.backup.crossplane.enabled .Values.postgresqlCluster.backup.crossplane.clusterName -}}
5+
{{- if and .Values.postgresqlCluster.crossplane.enabled .Values.postgresqlCluster.crossplane.clusterName -}}
66
true
77
{{- else -}}
88
false
@@ -13,7 +13,7 @@ false
1313
Crossplane is AWS/CAPA
1414
*/}}
1515
{{- define "grafana.crossplane.isAWS" -}}
16-
{{- if eq .Values.postgresqlCluster.backup.crossplane.provider "aws" -}}
16+
{{- if eq .Values.postgresqlCluster.crossplane.provider "aws" -}}
1717
true
1818
{{- else -}}
1919
false
@@ -25,9 +25,9 @@ Merge tags from cluster CR with user-provided tags
2525
Returns tags as a map: {foo: "bar"}
2626
*/}}
2727
{{- define "grafana.crossplane.tags" -}}
28-
{{- $clusterName := .Values.postgresqlCluster.backup.crossplane.clusterName -}}
29-
{{- $clusterNamespace := .Values.postgresqlCluster.backup.crossplane.clusterNamespace -}}
30-
{{- $provider := .Values.postgresqlCluster.backup.crossplane.provider -}}
28+
{{- $clusterName := .Values.postgresqlCluster.crossplane.clusterName -}}
29+
{{- $clusterNamespace := .Values.postgresqlCluster.crossplane.clusterNamespace -}}
30+
{{- $provider := .Values.postgresqlCluster.crossplane.provider -}}
3131
{{- $tags := dict -}}
3232
{{- if eq $provider "aws" -}}
3333
{{- $awsCluster := lookup "infrastructure.cluster.x-k8s.io/v1beta2" "AWSCluster" $clusterNamespace $clusterName -}}
@@ -44,7 +44,7 @@ Returns tags as a map: {foo: "bar"}
4444
"managed-by" "crossplane"
4545
-}}
4646
{{- $tags = merge $tags $defaultTags -}}
47-
{{- $userTags := .Values.postgresqlCluster.backup.crossplane.tags | default list -}}
47+
{{- $userTags := .Values.postgresqlCluster.crossplane.tags | default list -}}
4848
{{- range $tag := $userTags -}}
4949
{{- $_ := set $tags (index $tag "key") (index $tag "value") -}}
5050
{{- end -}}

‎helm/grafana/templates/cnpg/crossplane/aws/_helpers.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Get AWS Account ID from AWSCluster identity
33
Supports both AWSClusterRoleIdentity and AWSClusterControllerIdentity
44
*/}}
55
{{- define "grafana.crossplane.aws.accountId" -}}
6-
{{- $clusterName := .Values.postgresqlCluster.backup.crossplane.clusterName -}}
7-
{{- $clusterNamespace := .Values.postgresqlCluster.backup.crossplane.clusterNamespace -}}
6+
{{- $clusterName := .Values.postgresqlCluster.crossplane.clusterName -}}
7+
{{- $clusterNamespace := .Values.postgresqlCluster.crossplane.clusterNamespace -}}
88
{{- $accountId := "" -}}
99
{{- $awsCluster := lookup "infrastructure.cluster.x-k8s.io/v1beta2" "AWSCluster" $clusterNamespace $clusterName -}}
1010
{{- if $awsCluster -}}
@@ -37,8 +37,8 @@ Get OIDC Provider URL from cluster
3737
First tries annotation aws.giantswarm.io/irsa-trust-domains, then falls back to identity
3838
*/}}
3939
{{- define "grafana.crossplane.aws.oidcProvider" -}}
40-
{{- $clusterName := .Values.postgresqlCluster.backup.crossplane.clusterName -}}
41-
{{- $clusterNamespace := .Values.postgresqlCluster.backup.crossplane.clusterNamespace -}}
40+
{{- $clusterName := .Values.postgresqlCluster.crossplane.clusterName -}}
41+
{{- $clusterNamespace := .Values.postgresqlCluster.crossplane.clusterNamespace -}}
4242
{{- $oidcProvider := "" -}}
4343
{{- $awsCluster := lookup "infrastructure.cluster.x-k8s.io/v1beta2" "AWSCluster" $clusterNamespace $clusterName -}}
4444
{{- if $awsCluster -}}

‎helm/grafana/templates/cnpg/crossplane/aws/bucket-lifecycle.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{{- if and .Values.postgresqlCluster.enabled .Values.postgresqlCluster.backup.enabled .Values.postgresqlCluster.backup.crossplane.enabled (include "grafana.crossplane.isAWS" .) .Values.postgresqlCluster.backup.crossplane.aws.enabled }}
2-
{{- $bucketName := .Values.postgresqlCluster.backup.crossplane.aws.bucket.name }}
1+
{{- if and .Values.postgresqlCluster.enabled .Values.postgresqlCluster.backup.enabled .Values.postgresqlCluster.crossplane.enabled (include "grafana.crossplane.isAWS" .) .Values.postgresqlCluster.crossplane.aws.enabled }}
2+
{{- $bucketName := .Values.postgresqlCluster.crossplane.aws.bucket.name }}
33
---
44
apiVersion: s3.aws.upbound.io/v1beta1
55
kind: BucketLifecycleConfiguration
@@ -13,20 +13,20 @@ metadata:
1313
app.kubernetes.io/component: storage
1414
spec:
1515
managementPolicies:
16-
{{- if .Values.postgresqlCluster.backup.crossplane.observeOnly }}
16+
{{- if .Values.postgresqlCluster.crossplane.observeOnly }}
1717
- Observe
1818
{{- else }}
1919
- "*"
2020
{{- end }}
2121
forProvider:
2222
bucketRef:
2323
name: {{ $bucketName }}
24-
region: {{ .Values.postgresqlCluster.backup.crossplane.region }}
24+
region: {{ .Values.postgresqlCluster.crossplane.region }}
2525
rule:
2626
- id: Expiration
2727
status: Enabled
2828
expiration:
29-
- days: {{ .Values.postgresqlCluster.backup.crossplane.aws.bucket.lifecycleDays }}
29+
- days: {{ .Values.postgresqlCluster.crossplane.aws.bucket.lifecycleDays }}
3030
providerConfigRef:
31-
name: {{ .Values.postgresqlCluster.backup.crossplane.providerConfigRef }}
31+
name: {{ .Values.postgresqlCluster.crossplane.providerConfigRef }}
3232
{{- end }}

‎helm/grafana/templates/cnpg/crossplane/aws/bucket-policy.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{{- if and .Values.postgresqlCluster.enabled .Values.postgresqlCluster.backup.enabled .Values.postgresqlCluster.backup.crossplane.enabled (include "grafana.crossplane.isAWS" .) .Values.postgresqlCluster.backup.crossplane.aws.enabled }}
2-
{{- $bucketName := .Values.postgresqlCluster.backup.crossplane.aws.bucket.name }}
3-
{{- $isChinaRegion := hasPrefix "cn-" .Values.postgresqlCluster.backup.crossplane.region }}
1+
{{- if and .Values.postgresqlCluster.enabled .Values.postgresqlCluster.backup.enabled .Values.postgresqlCluster.crossplane.enabled (include "grafana.crossplane.isAWS" .) .Values.postgresqlCluster.crossplane.aws.enabled }}
2+
{{- $bucketName := .Values.postgresqlCluster.crossplane.aws.bucket.name }}
3+
{{- $isChinaRegion := hasPrefix "cn-" .Values.postgresqlCluster.crossplane.region }}
44
---
55
apiVersion: s3.aws.upbound.io/v1beta1
66
kind: BucketPolicy
@@ -14,7 +14,7 @@ metadata:
1414
crossplane.io/external-name: {{ $bucketName }}
1515
spec:
1616
managementPolicies:
17-
{{- if .Values.postgresqlCluster.backup.crossplane.observeOnly }}
17+
{{- if .Values.postgresqlCluster.crossplane.observeOnly }}
1818
- Observe
1919
{{- else }}
2020
- "*"
@@ -43,7 +43,7 @@ spec:
4343
}
4444
]
4545
}
46-
region: {{ .Values.postgresqlCluster.backup.crossplane.region }}
46+
region: {{ .Values.postgresqlCluster.crossplane.region }}
4747
providerConfigRef:
48-
name: {{ .Values.postgresqlCluster.backup.crossplane.providerConfigRef }}
48+
name: {{ .Values.postgresqlCluster.crossplane.providerConfigRef }}
4949
{{- end }}

‎helm/grafana/templates/cnpg/crossplane/aws/bucket-public-access-block.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{{- if and .Values.postgresqlCluster.enabled .Values.postgresqlCluster.backup.enabled .Values.postgresqlCluster.backup.crossplane.enabled (include "grafana.crossplane.isAWS" .) .Values.postgresqlCluster.backup.crossplane.aws.enabled }}
2-
{{- $bucketName := .Values.postgresqlCluster.backup.crossplane.aws.bucket.name }}
1+
{{- if and .Values.postgresqlCluster.enabled .Values.postgresqlCluster.backup.enabled .Values.postgresqlCluster.crossplane.enabled (include "grafana.crossplane.isAWS" .) .Values.postgresqlCluster.crossplane.aws.enabled }}
2+
{{- $bucketName := .Values.postgresqlCluster.crossplane.aws.bucket.name }}
33
---
44
apiVersion: s3.aws.upbound.io/v1beta1
55
kind: BucketPublicAccessBlock
@@ -13,19 +13,19 @@ metadata:
1313
app.kubernetes.io/component: storage
1414
spec:
1515
managementPolicies:
16-
{{- if .Values.postgresqlCluster.backup.crossplane.observeOnly }}
16+
{{- if .Values.postgresqlCluster.crossplane.observeOnly }}
1717
- Observe
1818
{{- else }}
1919
- "*"
2020
{{- end }}
2121
forProvider:
2222
bucketRef:
2323
name: {{ $bucketName }}
24-
region: {{ .Values.postgresqlCluster.backup.crossplane.region }}
24+
region: {{ .Values.postgresqlCluster.crossplane.region }}
2525
blockPublicAcls: true
2626
blockPublicPolicy: true
2727
ignorePublicAcls: true
2828
restrictPublicBuckets: true
2929
providerConfigRef:
30-
name: {{ .Values.postgresqlCluster.backup.crossplane.providerConfigRef }}
30+
name: {{ .Values.postgresqlCluster.crossplane.providerConfigRef }}
3131
{{- end }}

‎helm/grafana/templates/cnpg/crossplane/aws/bucket.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{{- if and .Values.postgresqlCluster.enabled .Values.postgresqlCluster.backup.enabled .Values.postgresqlCluster.backup.crossplane.enabled (include "grafana.crossplane.isAWS" .) .Values.postgresqlCluster.backup.crossplane.aws.enabled }}
1+
{{- if and .Values.postgresqlCluster.enabled .Values.postgresqlCluster.backup.enabled .Values.postgresqlCluster.crossplane.enabled (include "grafana.crossplane.isAWS" .) .Values.postgresqlCluster.crossplane.aws.enabled }}
22
{{- $tags := include "grafana.crossplane.tags" . | fromYaml }}
3-
{{- $bucketName := .Values.postgresqlCluster.backup.crossplane.aws.bucket.name }}
3+
{{- $bucketName := .Values.postgresqlCluster.crossplane.aws.bucket.name }}
44
---
55
apiVersion: s3.aws.upbound.io/v1beta2
66
kind: Bucket
@@ -14,21 +14,21 @@ metadata:
1414
crossplane.io/external-name: {{ $bucketName }}
1515
spec:
1616
managementPolicies:
17-
{{- if .Values.postgresqlCluster.backup.crossplane.observeOnly }}
17+
{{- if .Values.postgresqlCluster.crossplane.observeOnly }}
1818
- Observe
1919
{{- else }}
2020
- "*"
2121
{{- end }}
2222
forProvider:
2323
forceDestroy: false
2424
objectLockEnabled: false
25-
region: {{ .Values.postgresqlCluster.backup.crossplane.region }}
25+
region: {{ .Values.postgresqlCluster.crossplane.region }}
2626
{{- if $tags }}
2727
tags:
2828
{{- range $key, $value := $tags }}
2929
{{ $key }}: {{ $value | quote }}
3030
{{- end }}
3131
{{- end }}
3232
providerConfigRef:
33-
name: {{ .Values.postgresqlCluster.backup.crossplane.providerConfigRef }}
33+
name: {{ .Values.postgresqlCluster.crossplane.providerConfigRef }}
3434
{{- end }}

‎helm/grafana/templates/cnpg/crossplane/aws/iam.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
{{- if and .Values.postgresqlCluster.enabled .Values.postgresqlCluster.backup.enabled .Values.postgresqlCluster.backup.crossplane.enabled (include "grafana.crossplane.isAWS" .) .Values.postgresqlCluster.backup.crossplane.aws.enabled .Values.postgresqlCluster.backup.crossplane.aws.iam.enabled }}
2-
{{- $bucketName := .Values.postgresqlCluster.backup.crossplane.aws.bucket.name }}
1+
{{- if and .Values.postgresqlCluster.enabled .Values.postgresqlCluster.backup.enabled .Values.postgresqlCluster.crossplane.enabled (include "grafana.crossplane.isAWS" .) .Values.postgresqlCluster.crossplane.aws.enabled .Values.postgresqlCluster.crossplane.aws.iam.enabled }}
2+
{{- $bucketName := .Values.postgresqlCluster.crossplane.aws.bucket.name }}
33
{{- $namespace := .Release.Namespace }}
44
{{- $tags := include "grafana.crossplane.tags" . | fromYaml }}
55
{{- $oidcProvider := include "grafana.crossplane.aws.oidcProvider" . }}
6-
{{- $isChinaRegion := hasPrefix "cn-" .Values.postgresqlCluster.backup.crossplane.region }}
6+
{{- $isChinaRegion := hasPrefix "cn-" .Values.postgresqlCluster.crossplane.region }}
77
{{- $serviceAccountName := .Values.postgresqlCluster.name }}
88
---
99
apiVersion: iam.aws.upbound.io/v1beta1
@@ -18,7 +18,7 @@ metadata:
1818
crossplane.io/external-name: {{ $bucketName }}
1919
spec:
2020
managementPolicies:
21-
{{- if .Values.postgresqlCluster.backup.crossplane.observeOnly }}
21+
{{- if .Values.postgresqlCluster.crossplane.observeOnly }}
2222
- Observe
2323
{{- else }}
2424
- "*"
@@ -106,5 +106,5 @@ spec:
106106
{{- end }}
107107
{{- end }}
108108
providerConfigRef:
109-
name: {{ .Values.postgresqlCluster.backup.crossplane.providerConfigRef }}
109+
name: {{ .Values.postgresqlCluster.crossplane.providerConfigRef }}
110110
{{- end }}

‎helm/grafana/values.schema.json‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,70 +1037,70 @@
10371037
},
10381038
"schedule": {
10391039
"type": "string"
1040+
}
1041+
}
1042+
},
1043+
"crossplane": {
1044+
"type": "object",
1045+
"properties": {
1046+
"enabled": {
1047+
"type": "boolean"
1048+
},
1049+
"provider": {
1050+
"type": "string"
1051+
},
1052+
"region": {
1053+
"type": "string"
1054+
},
1055+
"clusterName": {
1056+
"type": "string"
1057+
},
1058+
"clusterNamespace": {
1059+
"type": "string"
1060+
},
1061+
"providerConfigRef": {
1062+
"type": "string"
1063+
},
1064+
"observeOnly": {
1065+
"type": "boolean"
1066+
},
1067+
"tags": {
1068+
"type": "array",
1069+
"items": {
1070+
"type": "object",
1071+
"properties": {
1072+
"key": {
1073+
"type": "string"
1074+
},
1075+
"value": {
1076+
"type": "string"
1077+
}
1078+
},
1079+
"required": ["key", "value"]
1080+
}
10401081
},
1041-
"crossplane": {
1082+
"aws": {
10421083
"type": "object",
10431084
"properties": {
10441085
"enabled": {
10451086
"type": "boolean"
10461087
},
1047-
"provider": {
1048-
"type": "string"
1049-
},
1050-
"region": {
1051-
"type": "string"
1052-
},
1053-
"clusterName": {
1054-
"type": "string"
1055-
},
1056-
"clusterNamespace": {
1057-
"type": "string"
1058-
},
1059-
"providerConfigRef": {
1060-
"type": "string"
1061-
},
1062-
"observeOnly": {
1063-
"type": "boolean"
1064-
},
1065-
"tags": {
1066-
"type": "array",
1067-
"items": {
1068-
"type": "object",
1069-
"properties": {
1070-
"key": {
1071-
"type": "string"
1072-
},
1073-
"value": {
1074-
"type": "string"
1075-
}
1088+
"bucket": {
1089+
"type": "object",
1090+
"properties": {
1091+
"name": {
1092+
"type": "string"
10761093
},
1077-
"required": ["key", "value"]
1094+
"lifecycleDays": {
1095+
"type": "integer"
1096+
}
10781097
}
10791098
},
1080-
"aws": {
1099+
"iam": {
10811100
"type": "object",
10821101
"properties": {
10831102
"enabled": {
10841103
"type": "boolean"
1085-
},
1086-
"bucket": {
1087-
"type": "object",
1088-
"properties": {
1089-
"name": {
1090-
"type": "string"
1091-
},
1092-
"lifecycleDays": {
1093-
"type": "integer"
1094-
}
1095-
}
1096-
},
1097-
"iam": {
1098-
"type": "object",
1099-
"properties": {
1100-
"enabled": {
1101-
"type": "boolean"
1102-
}
1103-
}
11041104
}
11051105
}
11061106
}

0 commit comments

Comments
 (0)