Skip to content

Commit 50e034d

Browse files
day0heroday0hero
committed
make test
1 parent 01f7720 commit 50e034d

6 files changed

Lines changed: 194 additions & 252 deletions

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

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: aws-ap-acm-provision-edge-install-config
77
data:
88
# Base64 encoding of install-config yaml
9-
install-config.yaml: CgphcGlWZXJzaW9uOiB2MQptZXRhZGF0YToKICBuYW1lOiAnYXdzLWFwJyAKYmFzZURvbWFpbjogYmx1ZXByaW50cy5yaGVjb2VuZy5jb20KY29udHJvbFBsYW5lOgogIGFyY2hpdGVjdHVyZTogYW1kNjQKICBoeXBlcnRocmVhZGluZzogRW5hYmxlZAogIG5hbWU6IGNvbnRyb2xQbGFuZQogIHJlcGxpY2FzOiAzCiAgcGxhdGZvcm06CiAgICBhd3M6CiAgICAgIHR5cGU6IG01LnhsYXJnZQpjb21wdXRlOgotIGh5cGVydGhyZWFkaW5nOiBFbmFibGVkCiAgYXJjaGl0ZWN0dXJlOiBhbWQ2NAogIG5hbWU6ICd3b3JrZXInCiAgcmVwbGljYXM6IDMKICBwbGF0Zm9ybToKICAgIGF3czoKICAgICAgdHlwZTogbTUueGxhcmdlCm5ldHdvcmtpbmc6CiAgY2x1c3Rlck5ldHdvcms6CiAgLSBjaWRyOiAxMC4xMjguMC4wLzE0CiAgICBob3N0UHJlZml4OiAyMwogIG1hY2hpbmVOZXR3b3JrOgogIC0gY2lkcjogMTAuMC4wLjAvMTYKICBuZXR3b3JrVHlwZTogT3BlblNoaWZ0U0ROCiAgc2VydmljZU5ldHdvcms6CiAgLSAxNzIuMzAuMC4wLzE2CnBsYXRmb3JtOiB7CiAgImF3cyI6IHsKICAgICJyZWdpb24iOiAiYXAtc291dGhlYXN0LTIiCiAgfQp9CnB1bGxTZWNyZXQ6ICIiICMgc2tpcCwgaGl2ZSB3aWxsIGluamVjdCBiYXNlZCBvbiBpdCdzIHNlY3JldHMKc3NoS2V5OiAiIiAgICAgIyBza2lwLCBoaXZlIHdpbGwgaW5qZWN0IGJhc2VkIG9uIGl0J3Mgc2VjcmV0cw==
9+
install-config.yaml: CgphcGlWZXJzaW9uOiB2MQptZXRhZGF0YToKICBuYW1lOiAnYXdzLWFwJyAKYmFzZURvbWFpbjogYmx1ZXByaW50cy5yaGVjb2VuZy5jb20KY29udHJvbFBsYW5lOgogIGFyY2hpdGVjdHVyZTogYW1kNjQKICBoeXBlcnRocmVhZGluZzogRW5hYmxlZAogIG5hbWU6IGNvbnRyb2xQbGFuZQogIHJlcGxpY2FzOiAxCiAgcGxhdGZvcm06CiAgICBhd3M6CiAgICAgIHR5cGU6IG01LnhsYXJnZQpjb21wdXRlOgotIGh5cGVydGhyZWFkaW5nOiBFbmFibGVkCiAgYXJjaGl0ZWN0dXJlOiBhbWQ2NAogIG5hbWU6ICd3b3JrZXInCiAgcmVwbGljYXM6IDAKbmV0d29ya2luZzoKICBjbHVzdGVyTmV0d29yazoKICAtIGNpZHI6IDEwLjEyOC4wLjAvMTQKICAgIGhvc3RQcmVmaXg6IDIzCiAgbWFjaGluZU5ldHdvcms6CiAgLSBjaWRyOiAxMC4wLjAuMC8xNgogIG5ldHdvcmtUeXBlOiBPVk5LdWJlcm5ldGVzCiAgc2VydmljZU5ldHdvcms6CiAgLSAxNzIuMzAuMC4wLzE2CnBsYXRmb3JtOgogIGF3czoKICAgIHJlZ2lvbjogYXAtc291dGhlYXN0LTIKcHVsbFNlY3JldDogIiIgIyBza2lwLCBoaXZlIHdpbGwgaW5qZWN0IGJhc2VkIG9uIGl0J3Mgc2VjcmV0cwpzc2hLZXk6ICIiICAgICAjIHNraXAsIGhpdmUgd2lsbCBpbmplY3QgYmFzZWQgb24gaXQncyBzZWNyZXRz
1010
type: Opaque
1111
---
1212
# Source: acm/templates/provision/secrets-common.yaml
@@ -16,7 +16,7 @@ metadata:
1616
name: azure-us-acm-provision-edge-install-config
1717
data:
1818
# Base64 encoding of install-config yaml
19-
install-config.yaml: CgphcGlWZXJzaW9uOiB2MQptZXRhZGF0YToKICBuYW1lOiAnYXp1cmUtdXMnIApiYXNlRG9tYWluOiBibHVlcHJpbnRzLnJoZWNvZW5nLmNvbQpjb250cm9sUGxhbmU6CiAgYXJjaGl0ZWN0dXJlOiBhbWQ2NAogIGh5cGVydGhyZWFkaW5nOiBFbmFibGVkCiAgbmFtZTogY29udHJvbFBsYW5lCiAgcmVwbGljYXM6IDMKICBwbGF0Zm9ybToKICAgIGF6dXJlOgogICAgICB0eXBlOiBTdGFuZGFyZF9EOHNfdjMKY29tcHV0ZToKLSBoeXBlcnRocmVhZGluZzogRW5hYmxlZAogIGFyY2hpdGVjdHVyZTogYW1kNjQKICBuYW1lOiAnd29ya2VyJwogIHJlcGxpY2FzOiAzCiAgcGxhdGZvcm06CiAgICBhenVyZToKICAgICAgdHlwZTogU3RhbmRhcmRfRDhzX3YzCm5ldHdvcmtpbmc6CiAgY2x1c3Rlck5ldHdvcms6CiAgLSBjaWRyOiAxMC4xMjguMC4wLzE0CiAgICBob3N0UHJlZml4OiAyMwogIG1hY2hpbmVOZXR3b3JrOgogIC0gY2lkcjogMTAuMC4wLjAvMTYKICBuZXR3b3JrVHlwZTogT3BlblNoaWZ0U0ROCiAgc2VydmljZU5ldHdvcms6CiAgLSAxNzIuMzAuMC4wLzE2CnBsYXRmb3JtOiB7CiAgImF6dXJlIjogewogICAgImJhc2VEb21haW5SZXNvdXJjZUdyb3VwTmFtZSI6ICJkb2pvLWRucy16b25lcyIsCiAgICAicmVnaW9uIjogImVhc3R1cyIKICB9Cn0KcHVsbFNlY3JldDogIiIgIyBza2lwLCBoaXZlIHdpbGwgaW5qZWN0IGJhc2VkIG9uIGl0J3Mgc2VjcmV0cwpzc2hLZXk6ICIiICAgICAjIHNraXAsIGhpdmUgd2lsbCBpbmplY3QgYmFzZWQgb24gaXQncyBzZWNyZXRz
19+
install-config.yaml: CgphcGlWZXJzaW9uOiB2MQptZXRhZGF0YToKICBuYW1lOiAnYXp1cmUtdXMnIApiYXNlRG9tYWluOiBibHVlcHJpbnRzLnJoZWNvZW5nLmNvbQpjb250cm9sUGxhbmU6CiAgYXJjaGl0ZWN0dXJlOiBhbWQ2NAogIGh5cGVydGhyZWFkaW5nOiBFbmFibGVkCiAgbmFtZTogY29udHJvbFBsYW5lCiAgcmVwbGljYXM6IDMKICBwbGF0Zm9ybToKICAgIGF6dXJlOgogICAgICB0eXBlOiBTdGFuZGFyZF9EOHNfdjMKY29tcHV0ZToKLSBoeXBlcnRocmVhZGluZzogRW5hYmxlZAogIGFyY2hpdGVjdHVyZTogYW1kNjQKICBuYW1lOiAnd29ya2VyJwogIHJlcGxpY2FzOiAzCiAgcGxhdGZvcm06CiAgICBhenVyZToKICAgICAgdHlwZTogU3RhbmRhcmRfRDhzX3YzCm5ldHdvcmtpbmc6CiAgY2x1c3Rlck5ldHdvcms6CiAgLSBjaWRyOiAxMC4xMjguMC4wLzE0CiAgICBob3N0UHJlZml4OiAyMwogIG1hY2hpbmVOZXR3b3JrOgogIC0gY2lkcjogMTAuMC4wLjAvMTYKICBuZXR3b3JrVHlwZTogT1ZOS3ViZXJuZXRlcwogIHNlcnZpY2VOZXR3b3JrOgogIC0gMTcyLjMwLjAuMC8xNgpwbGF0Zm9ybToKICBhenVyZToKICAgIGJhc2VEb21haW5SZXNvdXJjZUdyb3VwTmFtZTogZG9qby1kbnMtem9uZXMKICAgIHJlZ2lvbjogZWFzdHVzCnB1bGxTZWNyZXQ6ICIiICMgc2tpcCwgaGl2ZSB3aWxsIGluamVjdCBiYXNlZCBvbiBpdCdzIHNlY3JldHMKc3NoS2V5OiAiIiAgICAgIyBza2lwLCBoaXZlIHdpbGwgaW5qZWN0IGJhc2VkIG9uIGl0J3Mgc2VjcmV0cw==
2020
type: Opaque
2121
---
2222
# Source: acm/templates/policies/acm-hub-ca-policy.yaml
@@ -25,21 +25,6 @@ type: Opaque
2525
# Source: acm/templates/provision/clusterpool.yaml
2626
apiVersion: hive.openshift.io/v1
2727
kind: ClusterClaim
28-
metadata:
29-
name: 'one-acm-provision-edge'
30-
annotations:
31-
argocd.argoproj.io/sync-wave: "20"
32-
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
33-
cluster.open-cluster-management.io/createmanagedcluster: "true"
34-
labels:
35-
clusterClaimName: one-acm-provision-edge
36-
clusterGroup: region
37-
spec:
38-
clusterPoolName: aws-ap
39-
---
40-
# Source: acm/templates/provision/clusterpool.yaml
41-
apiVersion: hive.openshift.io/v1
42-
kind: ClusterClaim
4328
metadata:
4429
name: 'two-acm-provision-edge'
4530
annotations:
@@ -50,7 +35,7 @@ metadata:
5035
clusterClaimName: two-acm-provision-edge
5136
clusterGroup: region
5237
spec:
53-
clusterPoolName: azure-us
38+
clusterPoolName: azure-us-acm-provision-edge
5439
---
5540
# Source: acm/templates/provision/clusterpool.yaml
5641
apiVersion: hive.openshift.io/v1
@@ -65,7 +50,7 @@ metadata:
6550
clusterClaimName: three-acm-provision-edge
6651
clusterGroup: region
6752
spec:
68-
clusterPoolName: azure-us
53+
clusterPoolName: azure-us-acm-provision-edge
6954
---
7055
# Source: acm/templates/provision/clusterpool.yaml
7156
apiVersion: hive.openshift.io/v1
@@ -82,12 +67,12 @@ metadata:
8267
cluster.open-cluster-management.io/clusterset: aws-ap
8368
spec:
8469
size: 3
85-
runningCount: 1
70+
runningCount: 0
8671
baseDomain: blueprints.rhecoeng.com
8772
installConfigSecretTemplateRef:
8873
name: aws-ap-acm-provision-edge-install-config
8974
imageSetRef:
90-
name: img4.10.18-x86-64-appsub
75+
name: img4.10.18-multi-appsub
9176
pullSecretRef:
9277
name: aws-ap-acm-provision-edge-pull-secret
9378
skipMachinePools: true # Disable MachinePool as using custom install-config
@@ -117,7 +102,7 @@ spec:
117102
installConfigSecretTemplateRef:
118103
name: azure-us-acm-provision-edge-install-config
119104
imageSetRef:
120-
name: img4.10.18-x86-64-appsub
105+
name: img4.10.18-multi-appsub
121106
pullSecretRef:
122107
name: azure-us-acm-provision-edge-pull-secret
123108
skipMachinePools: true # Disable MachinePool as using custom install-config

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

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: pattern-clustergroup/templates/core/namespaces.yaml
2+
# Source: clustergroup/templates/core/namespaces.yaml
33
apiVersion: v1
44
kind: Namespace
55
metadata:
@@ -8,7 +8,7 @@ metadata:
88
name: manuela-stormshift-line-dashboard
99
spec:
1010
---
11-
# Source: pattern-clustergroup/templates/core/namespaces.yaml
11+
# Source: clustergroup/templates/core/namespaces.yaml
1212
apiVersion: v1
1313
kind: Namespace
1414
metadata:
@@ -17,7 +17,7 @@ metadata:
1717
name: manuela-stormshift-machine-sensor
1818
spec:
1919
---
20-
# Source: pattern-clustergroup/templates/core/namespaces.yaml
20+
# Source: clustergroup/templates/core/namespaces.yaml
2121
apiVersion: v1
2222
kind: Namespace
2323
metadata:
@@ -26,7 +26,7 @@ metadata:
2626
name: manuela-stormshift-messaging
2727
spec:
2828
---
29-
# Source: pattern-clustergroup/templates/core/namespaces.yaml
29+
# Source: clustergroup/templates/core/namespaces.yaml
3030
apiVersion: v1
3131
kind: Namespace
3232
metadata:
@@ -35,7 +35,7 @@ metadata:
3535
name: manuela-factory-ml-workspace
3636
spec:
3737
---
38-
# Source: pattern-clustergroup/templates/imperative/namespace.yaml
38+
# Source: clustergroup/templates/imperative/namespace.yaml
3939
apiVersion: v1
4040
kind: Namespace
4141
metadata:
@@ -44,7 +44,7 @@ metadata:
4444
argocd.argoproj.io/managed-by: mypattern-factory
4545
name: imperative
4646
---
47-
# Source: pattern-clustergroup/templates/plumbing/gitops-namespace.yaml
47+
# Source: clustergroup/templates/plumbing/gitops-namespace.yaml
4848
apiVersion: v1
4949
kind: Namespace
5050
metadata:
@@ -57,14 +57,14 @@ metadata:
5757
name: mypattern-factory
5858
spec: {}
5959
---
60-
# Source: pattern-clustergroup/templates/imperative/serviceaccount.yaml
60+
# Source: clustergroup/templates/imperative/serviceaccount.yaml
6161
apiVersion: v1
6262
kind: ServiceAccount
6363
metadata:
6464
name: imperative-sa
6565
namespace: imperative
6666
---
67-
# Source: pattern-clustergroup/templates/imperative/configmap.yaml
67+
# Source: clustergroup/templates/imperative/configmap.yaml
6868
apiVersion: v1
6969
kind: ConfigMap
7070
metadata:
@@ -176,7 +176,7 @@ data:
176176
kind: ClusterSecretStore
177177
name: vault-backend
178178
---
179-
# Source: pattern-clustergroup/templates/imperative/clusterrole.yaml
179+
# Source: clustergroup/templates/imperative/clusterrole.yaml
180180
apiVersion: rbac.authorization.k8s.io/v1
181181
kind: ClusterRole
182182
metadata:
@@ -191,7 +191,7 @@ rules:
191191
- list
192192
- watch
193193
---
194-
# Source: pattern-clustergroup/templates/imperative/rbac.yaml
194+
# Source: clustergroup/templates/imperative/rbac.yaml
195195
apiVersion: rbac.authorization.k8s.io/v1
196196
kind: ClusterRoleBinding
197197
metadata:
@@ -205,7 +205,7 @@ subjects:
205205
name: imperative-sa
206206
namespace: imperative
207207
---
208-
# Source: pattern-clustergroup/templates/plumbing/argocd-super-role.yaml
208+
# Source: clustergroup/templates/plumbing/argocd-super-role.yaml
209209
# WARNING: ONLY USE THIS FOR MANAGING CLUSTERS NOT FOR REGULAR USERS
210210
apiVersion: rbac.authorization.k8s.io/v1
211211
kind: ClusterRoleBinding
@@ -224,7 +224,7 @@ subjects:
224224
name: openshift-gitops-argocd-server
225225
namespace: openshift-gitops
226226
---
227-
# Source: pattern-clustergroup/templates/plumbing/argocd-super-role.yaml
227+
# Source: clustergroup/templates/plumbing/argocd-super-role.yaml
228228
# WARNING: ONLY USE THIS FOR MANAGING CLUSTERS NOT FOR REGULAR USERS
229229
apiVersion: rbac.authorization.k8s.io/v1
230230
kind: ClusterRoleBinding
@@ -249,7 +249,7 @@ subjects:
249249
name: factory-gitops-argocd-dex-server
250250
namespace: mypattern-factory
251251
---
252-
# Source: pattern-clustergroup/templates/imperative/role.yaml
252+
# Source: clustergroup/templates/imperative/role.yaml
253253
apiVersion: rbac.authorization.k8s.io/v1
254254
kind: Role
255255
metadata:
@@ -263,7 +263,7 @@ rules:
263263
verbs:
264264
- '*'
265265
---
266-
# Source: pattern-clustergroup/templates/imperative/rbac.yaml
266+
# Source: clustergroup/templates/imperative/rbac.yaml
267267
apiVersion: rbac.authorization.k8s.io/v1
268268
kind: RoleBinding
269269
metadata:
@@ -278,7 +278,7 @@ subjects:
278278
name: imperative-sa
279279
namespace: imperative
280280
---
281-
# Source: pattern-clustergroup/templates/imperative/job.yaml
281+
# Source: clustergroup/templates/imperative/job.yaml
282282
apiVersion: batch/v1
283283
kind: CronJob
284284
metadata:
@@ -352,10 +352,10 @@ spec:
352352
name: helm-values-configmap-factory
353353
restartPolicy: Never
354354
---
355-
# Source: pattern-clustergroup/templates/core/subscriptions.yaml
355+
# Source: clustergroup/templates/core/subscriptions.yaml
356356
---
357357
---
358-
# Source: pattern-clustergroup/templates/plumbing/projects.yaml
358+
# Source: clustergroup/templates/plumbing/projects.yaml
359359
apiVersion: argoproj.io/v1alpha1
360360
kind: AppProject
361361
metadata:
@@ -376,7 +376,7 @@ spec:
376376
- '*'
377377
status: {}
378378
---
379-
# Source: pattern-clustergroup/templates/plumbing/applications.yaml
379+
# Source: clustergroup/templates/plumbing/applications.yaml
380380
apiVersion: argoproj.io/v1alpha1
381381
kind: Application
382382
metadata:
@@ -400,9 +400,8 @@ spec:
400400
automated: {}
401401
retry:
402402
limit: 20
403-
# selfHeal: true
404403
---
405-
# Source: pattern-clustergroup/templates/plumbing/applications.yaml
404+
# Source: clustergroup/templates/plumbing/applications.yaml
406405
apiVersion: argoproj.io/v1alpha1
407406
kind: Application
408407
metadata:
@@ -424,7 +423,6 @@ spec:
424423
valueFiles:
425424
- "/values-global.yaml"
426425
- "/values-factory.yaml"
427-
# Watch the progress of https://issues.redhat.com/browse/GITOPS-891 and update accordingly
428426
parameters:
429427
- name: global.repoURL
430428
value: $ARGOCD_APP_SOURCE_REPO_URL
@@ -448,9 +446,8 @@ spec:
448446
automated: {}
449447
retry:
450448
limit: 20
451-
# selfHeal: true
452449
---
453-
# Source: pattern-clustergroup/templates/plumbing/argocd.yaml
450+
# Source: clustergroup/templates/plumbing/argocd.yaml
454451
apiVersion: argoproj.io/v1alpha1
455452
kind: ArgoCD
456453
metadata:
@@ -587,7 +584,7 @@ spec:
587584
ca: {}
588585
status:
589586
---
590-
# Source: pattern-clustergroup/templates/plumbing/argocd.yaml
587+
# Source: clustergroup/templates/plumbing/argocd.yaml
591588
apiVersion: console.openshift.io/v1
592589
kind: ConsoleLink
593590
metadata:
@@ -601,7 +598,7 @@ spec:
601598
location: ApplicationMenu
602599
text: 'Factory ArgoCD'
603600
---
604-
# Source: pattern-clustergroup/templates/core/operatorgroup.yaml
601+
# Source: clustergroup/templates/core/operatorgroup.yaml
605602
apiVersion: operators.coreos.com/v1
606603
kind: OperatorGroup
607604
metadata:
@@ -611,7 +608,7 @@ spec:
611608
targetNamespaces:
612609
- manuela-stormshift-line-dashboard
613610
---
614-
# Source: pattern-clustergroup/templates/core/operatorgroup.yaml
611+
# Source: clustergroup/templates/core/operatorgroup.yaml
615612
apiVersion: operators.coreos.com/v1
616613
kind: OperatorGroup
617614
metadata:
@@ -621,7 +618,7 @@ spec:
621618
targetNamespaces:
622619
- manuela-stormshift-machine-sensor
623620
---
624-
# Source: pattern-clustergroup/templates/core/operatorgroup.yaml
621+
# Source: clustergroup/templates/core/operatorgroup.yaml
625622
apiVersion: operators.coreos.com/v1
626623
kind: OperatorGroup
627624
metadata:
@@ -631,7 +628,7 @@ spec:
631628
targetNamespaces:
632629
- manuela-stormshift-messaging
633630
---
634-
# Source: pattern-clustergroup/templates/core/subscriptions.yaml
631+
# Source: clustergroup/templates/core/subscriptions.yaml
635632
apiVersion: operators.coreos.com/v1alpha1
636633
kind: Subscription
637634
metadata:
@@ -644,7 +641,7 @@ spec:
644641
channel: stable
645642
installPlanApproval: Automatic
646643
---
647-
# Source: pattern-clustergroup/templates/core/subscriptions.yaml
644+
# Source: clustergroup/templates/core/subscriptions.yaml
648645
apiVersion: operators.coreos.com/v1alpha1
649646
kind: Subscription
650647
metadata:
@@ -657,7 +654,7 @@ spec:
657654
channel: stable
658655
installPlanApproval: Automatic
659656
---
660-
# Source: pattern-clustergroup/templates/core/subscriptions.yaml
657+
# Source: clustergroup/templates/core/subscriptions.yaml
661658
apiVersion: operators.coreos.com/v1alpha1
662659
kind: Subscription
663660
metadata:
@@ -670,7 +667,7 @@ spec:
670667
channel: stable
671668
installPlanApproval: Automatic
672669
---
673-
# Source: pattern-clustergroup/templates/core/subscriptions.yaml
670+
# Source: clustergroup/templates/core/subscriptions.yaml
674671
apiVersion: operators.coreos.com/v1alpha1
675672
kind: Subscription
676673
metadata:
@@ -683,7 +680,7 @@ spec:
683680
channel: 7.x
684681
installPlanApproval: Automatic
685682
---
686-
# Source: pattern-clustergroup/templates/core/subscriptions.yaml
683+
# Source: clustergroup/templates/core/subscriptions.yaml
687684
apiVersion: operators.coreos.com/v1alpha1
688685
kind: Subscription
689686
metadata:

0 commit comments

Comments
 (0)