Skip to content

Commit 28d9b49

Browse files
mbaldessarimbaldessari
committed
Update tests after common rebase
1 parent 86de14c commit 28d9b49

23 files changed

Lines changed: 813 additions & 324 deletions

‎tests/common-acm-industrial-edge-hub.expected.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ spec:
167167
type: Opaque
168168
metadata:
169169
name: hub-ca
170-
namespace: imperative
170+
namespace: golang-external-secrets
171171
data:
172172
hub-kube-root-ca.crt: '{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}'
173173
hub-openshift-service-ca.crt: '{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}'
@@ -214,6 +214,8 @@ spec:
214214
path: common/clustergroup
215215
helm:
216216
ignoreMissingValueFiles: true
217+
values: |
218+
extraParametersNested:
217219
valueFiles:
218220
- "/values-global.yaml"
219221
- "/values-factory.yaml"

‎tests/common-acm-medical-diagnosis-hub.expected.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ spec:
158158
type: Opaque
159159
metadata:
160160
name: hub-ca
161-
namespace: imperative
161+
namespace: golang-external-secrets
162162
data:
163163
hub-kube-root-ca.crt: '{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}'
164164
hub-openshift-service-ca.crt: '{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}'
@@ -205,6 +205,8 @@ spec:
205205
path: common/clustergroup
206206
helm:
207207
ignoreMissingValueFiles: true
208+
values: |
209+
extraParametersNested:
208210
valueFiles:
209211
- "/values-global.yaml"
210212
- "/values-region-one.yaml"

‎tests/common-acm-normal.expected.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ spec:
561561
type: Opaque
562562
metadata:
563563
name: hub-ca
564-
namespace: imperative
564+
namespace: golang-external-secrets
565565
data:
566566
hub-kube-root-ca.crt: '{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}'
567567
hub-openshift-service-ca.crt: '{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}'
@@ -608,6 +608,8 @@ spec:
608608
path: common/clustergroup
609609
helm:
610610
ignoreMissingValueFiles: true
611+
values: |
612+
extraParametersNested:
611613
valueFiles:
612614
- "/values-global.yaml"
613615
- "/values-acm-edge.yaml"
@@ -704,6 +706,8 @@ spec:
704706
path: common/clustergroup
705707
helm:
706708
ignoreMissingValueFiles: true
709+
values: |
710+
extraParametersNested:
707711
valueFiles:
708712
- "/values-global.yaml"
709713
- "/values-acm-provision-edge.yaml"

‎tests/common-clustergroup-industrial-edge-factory.expected.yaml‎

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ metadata:
6464
name: imperative-sa
6565
namespace: imperative
6666
---
67+
# Source: clustergroup/templates/imperative/serviceaccount.yaml
68+
apiVersion: v1
69+
kind: ServiceAccount
70+
metadata:
71+
name: imperative-admin-sa
72+
namespace: imperative
73+
---
6774
# Source: clustergroup/templates/imperative/configmap.yaml
6875
apiVersion: v1
6976
kind: ConfigMap
@@ -116,6 +123,9 @@ data:
116123
initContainers: []
117124
imperative:
118125
activeDeadlineSeconds: 3600
126+
adminClusterRoleName: imperative-admin-cluster-role
127+
adminServiceAccountCreate: true
128+
adminServiceAccountName: imperative-admin-sa
119129
clusterRoleName: imperative-cluster-role
120130
clusterRoleYaml: ""
121131
cronJobName: imperative-cronjob
@@ -279,11 +289,24 @@ rules:
279289
- list
280290
- watch
281291
---
292+
# Source: clustergroup/templates/imperative/clusterrole.yaml
293+
apiVersion: rbac.authorization.k8s.io/v1
294+
kind: ClusterRole
295+
metadata:
296+
name: imperative-admin-cluster-role
297+
rules:
298+
- apiGroups:
299+
- '*'
300+
resources:
301+
- '*'
302+
verbs:
303+
- '*'
304+
---
282305
# Source: clustergroup/templates/imperative/rbac.yaml
283306
apiVersion: rbac.authorization.k8s.io/v1
284307
kind: ClusterRoleBinding
285308
metadata:
286-
name: imperative-cluster-admin-rolebinding
309+
name: imperative-cluster-rolebinding
287310
roleRef:
288311
apiGroup: rbac.authorization.k8s.io
289312
kind: ClusterRole
@@ -293,12 +316,30 @@ subjects:
293316
name: imperative-sa
294317
namespace: imperative
295318
---
319+
# Source: clustergroup/templates/imperative/rbac.yaml
320+
apiVersion: rbac.authorization.k8s.io/v1
321+
kind: ClusterRoleBinding
322+
metadata:
323+
name: imperative-admin-clusterrolebinding
324+
roleRef:
325+
apiGroup: rbac.authorization.k8s.io
326+
kind: ClusterRole
327+
name: imperative-admin-cluster-role
328+
subjects:
329+
- kind: ServiceAccount
330+
name: imperative-admin-sa
331+
namespace: imperative
332+
---
296333
# Source: clustergroup/templates/plumbing/argocd-super-role.yaml
297334
# WARNING: ONLY USE THIS FOR MANAGING CLUSTERS NOT FOR REGULAR USERS
298335
apiVersion: rbac.authorization.k8s.io/v1
299336
kind: ClusterRoleBinding
300337
metadata:
301338
name: openshift-gitops-cluster-admin-rolebinding
339+
# We need to have this before anything else or the sync might get stuck forever
340+
# due to permission issues
341+
annotations:
342+
argocd.argoproj.io/sync-wave: "-100"
302343
roleRef:
303344
apiGroup: rbac.authorization.k8s.io
304345
kind: ClusterRole
@@ -318,6 +359,10 @@ apiVersion: rbac.authorization.k8s.io/v1
318359
kind: ClusterRoleBinding
319360
metadata:
320361
name: mypattern-factory-cluster-admin-rolebinding
362+
# We need to have this before anything else or the sync might get stuck forever
363+
# due to permission issues
364+
annotations:
365+
argocd.argoproj.io/sync-wave: "-100"
321366
roleRef:
322367
apiGroup: rbac.authorization.k8s.io
323368
kind: ClusterRole
@@ -355,7 +400,7 @@ rules:
355400
apiVersion: rbac.authorization.k8s.io/v1
356401
kind: RoleBinding
357402
metadata:
358-
name: imperative-admin-rolebinding
403+
name: imperative-rolebinding
359404
namespace: imperative
360405
roleRef:
361406
apiGroup: rbac.authorization.k8s.io
@@ -537,6 +582,8 @@ spec:
537582
path: charts/datacenter/opendatahub
538583
helm:
539584
ignoreMissingValueFiles: true
585+
values: |
586+
extraParametersNested:
540587
valueFiles:
541588
- "/values-global.yaml"
542589
- "/values-factory.yaml"

‎tests/common-clustergroup-industrial-edge-hub.expected.yaml‎

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,13 @@ metadata:
109109
name: imperative-sa
110110
namespace: imperative
111111
---
112+
# Source: clustergroup/templates/imperative/serviceaccount.yaml
113+
apiVersion: v1
114+
kind: ServiceAccount
115+
metadata:
116+
name: imperative-admin-sa
117+
namespace: imperative
118+
---
112119
# Source: clustergroup/templates/imperative/configmap.yaml
113120
apiVersion: v1
114121
kind: ConfigMap
@@ -237,6 +244,9 @@ data:
237244
initContainers: []
238245
imperative:
239246
activeDeadlineSeconds: 3600
247+
adminClusterRoleName: imperative-admin-cluster-role
248+
adminServiceAccountCreate: true
249+
adminServiceAccountName: imperative-admin-sa
240250
clusterRoleName: imperative-cluster-role
241251
clusterRoleYaml: ""
242252
cronJobName: imperative-cronjob
@@ -440,11 +450,24 @@ rules:
440450
- list
441451
- watch
442452
---
453+
# Source: clustergroup/templates/imperative/clusterrole.yaml
454+
apiVersion: rbac.authorization.k8s.io/v1
455+
kind: ClusterRole
456+
metadata:
457+
name: imperative-admin-cluster-role
458+
rules:
459+
- apiGroups:
460+
- '*'
461+
resources:
462+
- '*'
463+
verbs:
464+
- '*'
465+
---
443466
# Source: clustergroup/templates/imperative/rbac.yaml
444467
apiVersion: rbac.authorization.k8s.io/v1
445468
kind: ClusterRoleBinding
446469
metadata:
447-
name: imperative-cluster-admin-rolebinding
470+
name: imperative-cluster-rolebinding
448471
roleRef:
449472
apiGroup: rbac.authorization.k8s.io
450473
kind: ClusterRole
@@ -454,12 +477,30 @@ subjects:
454477
name: imperative-sa
455478
namespace: imperative
456479
---
480+
# Source: clustergroup/templates/imperative/rbac.yaml
481+
apiVersion: rbac.authorization.k8s.io/v1
482+
kind: ClusterRoleBinding
483+
metadata:
484+
name: imperative-admin-clusterrolebinding
485+
roleRef:
486+
apiGroup: rbac.authorization.k8s.io
487+
kind: ClusterRole
488+
name: imperative-admin-cluster-role
489+
subjects:
490+
- kind: ServiceAccount
491+
name: imperative-admin-sa
492+
namespace: imperative
493+
---
457494
# Source: clustergroup/templates/plumbing/argocd-super-role.yaml
458495
# WARNING: ONLY USE THIS FOR MANAGING CLUSTERS NOT FOR REGULAR USERS
459496
apiVersion: rbac.authorization.k8s.io/v1
460497
kind: ClusterRoleBinding
461498
metadata:
462499
name: openshift-gitops-cluster-admin-rolebinding
500+
# We need to have this before anything else or the sync might get stuck forever
501+
# due to permission issues
502+
annotations:
503+
argocd.argoproj.io/sync-wave: "-100"
463504
roleRef:
464505
apiGroup: rbac.authorization.k8s.io
465506
kind: ClusterRole
@@ -479,6 +520,10 @@ apiVersion: rbac.authorization.k8s.io/v1
479520
kind: ClusterRoleBinding
480521
metadata:
481522
name: mypattern-datacenter-cluster-admin-rolebinding
523+
# We need to have this before anything else or the sync might get stuck forever
524+
# due to permission issues
525+
annotations:
526+
argocd.argoproj.io/sync-wave: "-100"
482527
roleRef:
483528
apiGroup: rbac.authorization.k8s.io
484529
kind: ClusterRole
@@ -516,7 +561,7 @@ rules:
516561
apiVersion: rbac.authorization.k8s.io/v1
517562
kind: RoleBinding
518563
metadata:
519-
name: imperative-admin-rolebinding
564+
name: imperative-rolebinding
520565
namespace: imperative
521566
roleRef:
522567
apiGroup: rbac.authorization.k8s.io
@@ -835,6 +880,8 @@ spec:
835880
path: common/acm
836881
helm:
837882
ignoreMissingValueFiles: true
883+
values: |
884+
extraParametersNested:
838885
valueFiles:
839886
- "/values-global.yaml"
840887
- "/values-datacenter.yaml"
@@ -900,6 +947,8 @@ spec:
900947
path: charts/datacenter/opendatahub
901948
helm:
902949
ignoreMissingValueFiles: true
950+
values: |
951+
extraParametersNested:
903952
valueFiles:
904953
- "/values-global.yaml"
905954
- "/values-datacenter.yaml"
@@ -956,6 +1005,8 @@ spec:
9561005
path: charts/datacenter/pipelines
9571006
helm:
9581007
ignoreMissingValueFiles: true
1008+
values: |
1009+
extraParametersNested:
9591010
valueFiles:
9601011
- "/values-global.yaml"
9611012
- "/values-datacenter.yaml"
@@ -1012,6 +1063,8 @@ spec:
10121063
path: charts/datacenter/manuela-data-lake
10131064
helm:
10141065
ignoreMissingValueFiles: true
1066+
values: |
1067+
extraParametersNested:
10151068
valueFiles:
10161069
- "/values-global.yaml"
10171070
- "/values-datacenter.yaml"
@@ -1098,6 +1151,8 @@ spec:
10981151
path: charts/datacenter/external-secrets
10991152
helm:
11001153
ignoreMissingValueFiles: true
1154+
values: |
1155+
extraParametersNested:
11011156
valueFiles:
11021157
- "/values-global.yaml"
11031158
- "/values-datacenter.yaml"
@@ -1154,6 +1209,8 @@ spec:
11541209
path: common/golang-external-secrets
11551210
helm:
11561211
ignoreMissingValueFiles: true
1212+
values: |
1213+
extraParametersNested:
11571214
valueFiles:
11581215
- "/values-global.yaml"
11591216
- "/values-datacenter.yaml"
@@ -1237,6 +1294,8 @@ spec:
12371294
chart: vault
12381295
helm:
12391296
ignoreMissingValueFiles: true
1297+
values: |
1298+
extraParametersNested:
12401299
valueFiles:
12411300
- "/values-global.yaml"
12421301
- "/values-datacenter.yaml"

0 commit comments

Comments
 (0)