Skip to content

Commit 2112e11

Browse files
author
Gabriel Saratura
committed
Add disabling cnpg
1 parent 704dd77 commit 2112e11

File tree

44 files changed

+135
-20950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+135
-20950
lines changed

‎class/appcat.yml‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
parameters:
22
=_config:
3+
cnpg_helmchart:
4+
"True":
5+
input_type: helm
6+
input_paths:
7+
- ${_base_directory}/dependencies/cnpg/helmchart/cnpg-${appcat:charts:cnpg:version}
8+
helm_values: ${appcat:cnpg:helmValues}
9+
helm_params:
10+
name: ${_instance}
11+
namespace: ${appcat:cnpg:namespace}
12+
output_path: appcat/cnpg/helmchart
13+
"False":
14+
input_paths: []
15+
input_type: jsonnet
16+
output_path: ""
17+
18+
cnpg_barman_helmchart:
19+
"True":
20+
input_type: helm
21+
input_paths:
22+
- ${_base_directory}/dependencies/cnpg/helmchart/plugin-barman-cloud-${appcat:charts:cnpgBarmanPlugin:version}
23+
helm_values: ${appcat:cnpg:barmanPluginHelmValues}
24+
helm_params:
25+
name: plugin-barman-cloud
26+
namespace: ${appcat:cnpg:namespace}
27+
output_path: appcat/cnpg/helmchart
28+
"False":
29+
input_paths: []
30+
input_type: jsonnet
31+
output_path: ""
32+
333
garage_operator:
434
"True":
535
input_type: helm
@@ -170,23 +200,9 @@ parameters:
170200
input_type: jsonnet
171201
output_path: appcat/garage_operator/
172202

173-
- input_type: helm
174-
input_paths:
175-
- ${_base_directory}/dependencies/cnpg/helmchart/cnpg-${appcat:charts:cnpg:version}
176-
helm_values: ${appcat:cnpg:helmValues}
177-
helm_params:
178-
name: ${_instance}
179-
namespace: ${appcat:cnpg:namespace}
180-
output_path: appcat/cnpg/helmchart
203+
- ${_config:cnpg_helmchart:${appcat:cnpg:enabled}}
181204

182-
- input_type: helm
183-
input_paths:
184-
- ${_base_directory}/dependencies/cnpg/helmchart/plugin-barman-cloud-${appcat:charts:cnpgBarmanPlugin:version}
185-
helm_values: ${appcat:cnpg:barmanPluginHelmValues}
186-
helm_params:
187-
name: plugin-barman-cloud
188-
namespace: ${appcat:cnpg:namespace}
189-
output_path: appcat/cnpg/helmchart
205+
- ${_config:cnpg_barman_helmchart:${appcat:cnpg:enabled}}
190206

191207
- input_paths:
192208
- ${_base_directory}/component/cnpg.jsonnet
@@ -205,15 +221,23 @@ parameters:
205221
- type: jsonnet
206222
filter: postprocess/add_argo_annotations.jsonnet
207223
path: ${_instance}/cnpg/helmchart/cloudnative-pg/templates
224+
enabled: ${appcat:cnpg:enabled}
225+
- type: jsonnet
226+
filter: postprocess/add_argo_annotations.jsonnet
227+
path: ${_instance}/cnpg/helmchart/cloudnative-pg/templates/crds
228+
enabled: ${appcat:cnpg:enabled}
208229
- type: jsonnet
209230
filter: postprocess/patch_operator_deployment.jsonnet
210231
path: ${_instance}/cnpg/helmchart/cloudnative-pg/templates
232+
enabled: ${appcat:cnpg:enabled}
211233
- type: jsonnet
212234
filter: postprocess/cnpg.jsonnet
213235
path: ${_instance}/cnpg/helmchart/cloudnative-pg/templates
236+
enabled: ${appcat:cnpg:enabled}
214237
- type: jsonnet
215238
filter: postprocess/cnpg-barman-plugin.jsonnet
216239
path: ${_instance}/cnpg/helmchart/plugin-barman-cloud/templates
240+
enabled: ${appcat:cnpg:enabled}
217241
- type: jsonnet
218242
filter: postprocess/add_argo_annotations.jsonnet
219243
path: ${_instance}
@@ -245,9 +269,15 @@ parameters:
245269
- type: jsonnet
246270
filter: postprocess/add_argo_annotations.jsonnet
247271
path: ${_instance}/cnpg/helmchart/plugin-barman-cloud/templates
272+
enabled: ${appcat:cnpg:enabled}
273+
- type: jsonnet
274+
filter: postprocess/add_argo_annotations.jsonnet
275+
path: ${_instance}/cnpg/helmchart/plugin-barman-cloud/templates/crds
276+
enabled: ${appcat:cnpg:enabled}
248277
- type: jsonnet
249278
filter: postprocess/add_argo_annotations.jsonnet
250279
path: ${_instance}/cnpg/helmchart/plugin-barman-cloud/templates/additional-rbac
280+
enabled: ${appcat:cnpg:enabled}
251281
- type: jsonnet
252282
filter: postprocess/patch_pull_policy.jsonnet
253283
path: ${_instance}

‎class/defaults.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ parameters:
237237
managementPolicy: Basic
238238

239239
cnpg:
240+
enabled: true
240241
namespace: syn-cnpg-system
241242
namespaceLabels: {}
242243
namespaceAnnotations: ${appcat:namespaceAnnotations}

‎component/cnpg.jsonnet‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,15 @@ local netpol = std.prune(kube._Object('networking.k8s.io/v1', 'NetworkPolicy', '
266266
},
267267
});
268268

269-
{
270-
'00_namespace': namespace {
271-
metadata+: {
272-
labels+: params.namespaceLabels,
273-
annotations+: params.namespaceAnnotations,
269+
if params.enabled then
270+
{
271+
'00_namespace': namespace {
272+
metadata+: {
273+
labels+: params.namespaceLabels,
274+
annotations+: params.namespaceAnnotations,
275+
},
274276
},
275-
},
276-
'10_cnpg_prometheusrule': prometheusrule,
277-
'11_networkpolicy': netpol,
278-
}
277+
'10_cnpg_prometheusrule': prometheusrule,
278+
'11_networkpolicy': netpol,
279+
}
280+
else {}

‎postprocess/add_argo_annotations.jsonnet‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ local annotationMap = {
2626
Secret: {
2727
'argocd.argoproj.io/sync-wave': '-100',
2828
},
29+
CustomResourceDefinition: {
30+
'argocd.argoproj.io/sync-options': 'Prune=false',
31+
},
2932
ObjectBucket: {
3033
'argocd.argoproj.io/sync-options': 'Prune=false,SkipDryRunOnMissingResource=true',
3134
},

‎tests/golden/control-plane/appcat/appcat/cnpg/helmchart/cloudnative-pg/templates/crds/crds.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5+
argocd.argoproj.io/sync-options: Prune=false
56
controller-gen.kubebuilder.io/version: v0.20.0
67
helm.sh/resource-policy: keep
78
name: backups.postgresql.cnpg.io
@@ -466,6 +467,7 @@ apiVersion: apiextensions.k8s.io/v1
466467
kind: CustomResourceDefinition
467468
metadata:
468469
annotations:
470+
argocd.argoproj.io/sync-options: Prune=false
469471
controller-gen.kubebuilder.io/version: v0.20.0
470472
helm.sh/resource-policy: keep
471473
name: clusterimagecatalogs.postgresql.cnpg.io
@@ -549,6 +551,7 @@ apiVersion: apiextensions.k8s.io/v1
549551
kind: CustomResourceDefinition
550552
metadata:
551553
annotations:
554+
argocd.argoproj.io/sync-options: Prune=false
552555
controller-gen.kubebuilder.io/version: v0.20.0
553556
helm.sh/resource-policy: keep
554557
name: clusters.postgresql.cnpg.io
@@ -7812,6 +7815,7 @@ apiVersion: apiextensions.k8s.io/v1
78127815
kind: CustomResourceDefinition
78137816
metadata:
78147817
annotations:
7818+
argocd.argoproj.io/sync-options: Prune=false
78157819
controller-gen.kubebuilder.io/version: v0.20.0
78167820
helm.sh/resource-policy: keep
78177821
name: databases.postgresql.cnpg.io
@@ -8410,6 +8414,7 @@ apiVersion: apiextensions.k8s.io/v1
84108414
kind: CustomResourceDefinition
84118415
metadata:
84128416
annotations:
8417+
argocd.argoproj.io/sync-options: Prune=false
84138418
controller-gen.kubebuilder.io/version: v0.20.0
84148419
helm.sh/resource-policy: keep
84158420
name: failoverquorums.postgresql.cnpg.io
@@ -8488,6 +8493,7 @@ apiVersion: apiextensions.k8s.io/v1
84888493
kind: CustomResourceDefinition
84898494
metadata:
84908495
annotations:
8496+
argocd.argoproj.io/sync-options: Prune=false
84918497
controller-gen.kubebuilder.io/version: v0.20.0
84928498
helm.sh/resource-policy: keep
84938499
name: imagecatalogs.postgresql.cnpg.io
@@ -8570,6 +8576,7 @@ apiVersion: apiextensions.k8s.io/v1
85708576
kind: CustomResourceDefinition
85718577
metadata:
85728578
annotations:
8579+
argocd.argoproj.io/sync-options: Prune=false
85738580
controller-gen.kubebuilder.io/version: v0.20.0
85748581
helm.sh/resource-policy: keep
85758582
name: poolers.postgresql.cnpg.io
@@ -17958,6 +17965,7 @@ apiVersion: apiextensions.k8s.io/v1
1795817965
kind: CustomResourceDefinition
1795917966
metadata:
1796017967
annotations:
17968+
argocd.argoproj.io/sync-options: Prune=false
1796117969
controller-gen.kubebuilder.io/version: v0.20.0
1796217970
helm.sh/resource-policy: keep
1796317971
name: publications.postgresql.cnpg.io
@@ -18154,6 +18162,7 @@ apiVersion: apiextensions.k8s.io/v1
1815418162
kind: CustomResourceDefinition
1815518163
metadata:
1815618164
annotations:
18165+
argocd.argoproj.io/sync-options: Prune=false
1815718166
controller-gen.kubebuilder.io/version: v0.20.0
1815818167
helm.sh/resource-policy: keep
1815918168
name: scheduledbackups.postgresql.cnpg.io
@@ -18346,6 +18355,7 @@ apiVersion: apiextensions.k8s.io/v1
1834618355
kind: CustomResourceDefinition
1834718356
metadata:
1834818357
annotations:
18358+
argocd.argoproj.io/sync-options: Prune=false
1834918359
controller-gen.kubebuilder.io/version: v0.20.0
1835018360
helm.sh/resource-policy: keep
1835118361
name: subscriptions.postgresql.cnpg.io

‎tests/golden/control-plane/appcat/appcat/cnpg/helmchart/plugin-barman-cloud/templates/crds/crds.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5+
argocd.argoproj.io/sync-options: Prune=false
56
controller-gen.kubebuilder.io/version: v0.19.0
67
helm.sh/resource-policy: keep
78
name: objectstores.barmancloud.cnpg.io

‎tests/golden/control-plane/appcat/appcat/controllers/appcat/10_billingservice_crd.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5+
argocd.argoproj.io/sync-options: Prune=false
56
controller-gen.kubebuilder.io/version: v0.16.5
67
name: billingservices.vshn.appcat.vshn.io
78
spec:

‎tests/golden/defaults/appcat/appcat/cnpg/helmchart/cloudnative-pg/templates/crds/crds.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5+
argocd.argoproj.io/sync-options: Prune=false
56
controller-gen.kubebuilder.io/version: v0.20.0
67
helm.sh/resource-policy: keep
78
name: backups.postgresql.cnpg.io
@@ -466,6 +467,7 @@ apiVersion: apiextensions.k8s.io/v1
466467
kind: CustomResourceDefinition
467468
metadata:
468469
annotations:
470+
argocd.argoproj.io/sync-options: Prune=false
469471
controller-gen.kubebuilder.io/version: v0.20.0
470472
helm.sh/resource-policy: keep
471473
name: clusterimagecatalogs.postgresql.cnpg.io
@@ -549,6 +551,7 @@ apiVersion: apiextensions.k8s.io/v1
549551
kind: CustomResourceDefinition
550552
metadata:
551553
annotations:
554+
argocd.argoproj.io/sync-options: Prune=false
552555
controller-gen.kubebuilder.io/version: v0.20.0
553556
helm.sh/resource-policy: keep
554557
name: clusters.postgresql.cnpg.io
@@ -7812,6 +7815,7 @@ apiVersion: apiextensions.k8s.io/v1
78127815
kind: CustomResourceDefinition
78137816
metadata:
78147817
annotations:
7818+
argocd.argoproj.io/sync-options: Prune=false
78157819
controller-gen.kubebuilder.io/version: v0.20.0
78167820
helm.sh/resource-policy: keep
78177821
name: databases.postgresql.cnpg.io
@@ -8410,6 +8414,7 @@ apiVersion: apiextensions.k8s.io/v1
84108414
kind: CustomResourceDefinition
84118415
metadata:
84128416
annotations:
8417+
argocd.argoproj.io/sync-options: Prune=false
84138418
controller-gen.kubebuilder.io/version: v0.20.0
84148419
helm.sh/resource-policy: keep
84158420
name: failoverquorums.postgresql.cnpg.io
@@ -8488,6 +8493,7 @@ apiVersion: apiextensions.k8s.io/v1
84888493
kind: CustomResourceDefinition
84898494
metadata:
84908495
annotations:
8496+
argocd.argoproj.io/sync-options: Prune=false
84918497
controller-gen.kubebuilder.io/version: v0.20.0
84928498
helm.sh/resource-policy: keep
84938499
name: imagecatalogs.postgresql.cnpg.io
@@ -8570,6 +8576,7 @@ apiVersion: apiextensions.k8s.io/v1
85708576
kind: CustomResourceDefinition
85718577
metadata:
85728578
annotations:
8579+
argocd.argoproj.io/sync-options: Prune=false
85738580
controller-gen.kubebuilder.io/version: v0.20.0
85748581
helm.sh/resource-policy: keep
85758582
name: poolers.postgresql.cnpg.io
@@ -17958,6 +17965,7 @@ apiVersion: apiextensions.k8s.io/v1
1795817965
kind: CustomResourceDefinition
1795917966
metadata:
1796017967
annotations:
17968+
argocd.argoproj.io/sync-options: Prune=false
1796117969
controller-gen.kubebuilder.io/version: v0.20.0
1796217970
helm.sh/resource-policy: keep
1796317971
name: publications.postgresql.cnpg.io
@@ -18154,6 +18162,7 @@ apiVersion: apiextensions.k8s.io/v1
1815418162
kind: CustomResourceDefinition
1815518163
metadata:
1815618164
annotations:
18165+
argocd.argoproj.io/sync-options: Prune=false
1815718166
controller-gen.kubebuilder.io/version: v0.20.0
1815818167
helm.sh/resource-policy: keep
1815918168
name: scheduledbackups.postgresql.cnpg.io
@@ -18346,6 +18355,7 @@ apiVersion: apiextensions.k8s.io/v1
1834618355
kind: CustomResourceDefinition
1834718356
metadata:
1834818357
annotations:
18358+
argocd.argoproj.io/sync-options: Prune=false
1834918359
controller-gen.kubebuilder.io/version: v0.20.0
1835018360
helm.sh/resource-policy: keep
1835118361
name: subscriptions.postgresql.cnpg.io

‎tests/golden/defaults/appcat/appcat/cnpg/helmchart/plugin-barman-cloud/templates/crds/crds.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5+
argocd.argoproj.io/sync-options: Prune=false
56
controller-gen.kubebuilder.io/version: v0.19.0
67
helm.sh/resource-policy: keep
78
name: objectstores.barmancloud.cnpg.io

0 commit comments

Comments
 (0)