Skip to content

Commit 216683f

Browse files
mbaldessarimbaldessari
committed
Update tests after common rebase
1 parent 05d660c commit 216683f

25 files changed

Lines changed: 21290 additions & 4959 deletions

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ metadata:
2222
namespace: open-cluster-management
2323
annotations:
2424
argocd.argoproj.io/sync-wave: "-1"
25+
installer.open-cluster-management.io/mce-subscription-spec: '{"source": "redhat-operators" }'
2526
spec: {}
2627
---
2728
# Source: acm/templates/policies/ocp-gitops-policy.yaml
@@ -89,6 +90,15 @@ spec:
8990
include:
9091
- default
9192
object-templates:
93+
- complianceType: mustonlyhave
94+
objectDefinition:
95+
kind: ConfigMap
96+
apiVersion: v1
97+
metadata:
98+
name: trusted-ca-bundle
99+
namespace: openshift-gitops
100+
labels:
101+
config.openshift.io/inject-trusted-cabundle: 'true'
92102
- complianceType: mustonlyhave
93103
objectDefinition:
94104
# This is an auto-generated file. DO NOT EDIT
@@ -100,7 +110,7 @@ spec:
100110
labels:
101111
operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
102112
spec:
103-
channel: gitops-1.8
113+
channel: gitops-1.12
104114
installPlanApproval: Automatic
105115
name: openshift-gitops-operator
106116
source: redhat-operators

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

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -215,19 +215,19 @@ spec:
215215
helm:
216216
ignoreMissingValueFiles: true
217217
valueFiles:
218-
- "/values-global.yaml"
219-
- "/values-factory.yaml"
220-
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}.yaml'
221-
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-{{ printf "%d.%d" ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Major) ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Minor) }}.yaml'
222-
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-factory.yaml'
223-
# We cannot use $.Values.global.clusterVersion because that gets resolved to the
224-
# hub's cluster version, whereas we want to include the spoke cluster version
225-
- '/values-{{ printf "%d.%d" ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Major) ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Minor) }}-factory.yaml'
218+
- "/values-global.yaml"
219+
- "/values-factory.yaml"
220+
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}.yaml'
221+
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}.yaml'
222+
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-factory.yaml'
223+
# We cannot use $.Values.global.clusterVersion because that gets resolved to the
224+
# hub's cluster version, whereas we want to include the spoke cluster version
225+
- '/values-{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}.yaml'
226226
parameters:
227227
- name: global.repoURL
228-
value: $ARGOCD_APP_SOURCE_REPO_URL
228+
value: https://github.com/pattern-clone/mypattern
229229
- name: global.targetRevision
230-
value: $ARGOCD_APP_SOURCE_TARGET_REVISION
230+
value: main
231231
- name: global.namespace
232232
value: $ARGOCD_APP_NAMESPACE
233233
- name: global.pattern
@@ -236,18 +236,18 @@ spec:
236236
value: apps.hub.example.com
237237
- name: global.localClusterDomain
238238
value: '{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain }}'
239-
# Requires ACM 2.6 or higher
240239
- name: global.clusterDomain
241240
value: '{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain | replace "apps." "" }}'
242-
# Requires ACM 2.6 or higher (I could not come up with something less terrible to get maj.min)
243241
- name: global.clusterVersion
244-
value: '{{ printf "%d.%d" ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Major) ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Minor) }}'
242+
value: '{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}'
245243
- name: global.localClusterName
246244
value: '{{ (split "." (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain)._1 }}'
247245
- name: global.clusterPlatform
248246
value: aws
249247
- name: clusterGroup.name
250248
value: factory
249+
- name: global.experimentalCapabilities
250+
value:
251251
- name: clusterGroup.isHubCluster
252252
value: "false"
253253
destination:
@@ -296,6 +296,15 @@ spec:
296296
include:
297297
- default
298298
object-templates:
299+
- complianceType: mustonlyhave
300+
objectDefinition:
301+
kind: ConfigMap
302+
apiVersion: v1
303+
metadata:
304+
name: trusted-ca-bundle
305+
namespace: openshift-gitops
306+
labels:
307+
config.openshift.io/inject-trusted-cabundle: 'true'
299308
- complianceType: mustonlyhave
300309
objectDefinition:
301310
# This is an auto-generated file. DO NOT EDIT
@@ -307,7 +316,7 @@ spec:
307316
labels:
308317
operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
309318
spec:
310-
channel: gitops-1.8
319+
channel: gitops-1.12
311320
installPlanApproval: Automatic
312321
name: openshift-gitops-operator
313322
source: redhat-operators

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

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -206,19 +206,19 @@ spec:
206206
helm:
207207
ignoreMissingValueFiles: true
208208
valueFiles:
209-
- "/values-global.yaml"
210-
- "/values-region-one.yaml"
211-
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}.yaml'
212-
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-{{ printf "%d.%d" ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Major) ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Minor) }}.yaml'
213-
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-region-one.yaml'
214-
# We cannot use $.Values.global.clusterVersion because that gets resolved to the
215-
# hub's cluster version, whereas we want to include the spoke cluster version
216-
- '/values-{{ printf "%d.%d" ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Major) ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Minor) }}-region-one.yaml'
209+
- "/values-global.yaml"
210+
- "/values-region-one.yaml"
211+
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}.yaml'
212+
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}.yaml'
213+
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-region-one.yaml'
214+
# We cannot use $.Values.global.clusterVersion because that gets resolved to the
215+
# hub's cluster version, whereas we want to include the spoke cluster version
216+
- '/values-{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}.yaml'
217217
parameters:
218218
- name: global.repoURL
219-
value: $ARGOCD_APP_SOURCE_REPO_URL
219+
value: https://github.com/pattern-clone/mypattern
220220
- name: global.targetRevision
221-
value: $ARGOCD_APP_SOURCE_TARGET_REVISION
221+
value: main
222222
- name: global.namespace
223223
value: $ARGOCD_APP_NAMESPACE
224224
- name: global.pattern
@@ -227,18 +227,18 @@ spec:
227227
value: apps.hub.example.com
228228
- name: global.localClusterDomain
229229
value: '{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain }}'
230-
# Requires ACM 2.6 or higher
231230
- name: global.clusterDomain
232231
value: '{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain | replace "apps." "" }}'
233-
# Requires ACM 2.6 or higher (I could not come up with something less terrible to get maj.min)
234232
- name: global.clusterVersion
235-
value: '{{ printf "%d.%d" ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Major) ((semver (lookup "operator.openshift.io/v1" "OpenShiftControllerManager" "" "cluster").status.version).Minor) }}'
233+
value: '{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}'
236234
- name: global.localClusterName
237235
value: '{{ (split "." (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain)._1 }}'
238236
- name: global.clusterPlatform
239237
value: aws
240238
- name: clusterGroup.name
241239
value: region-one
240+
- name: global.experimentalCapabilities
241+
value:
242242
- name: clusterGroup.isHubCluster
243243
value: "false"
244244
destination:
@@ -287,6 +287,15 @@ spec:
287287
include:
288288
- default
289289
object-templates:
290+
- complianceType: mustonlyhave
291+
objectDefinition:
292+
kind: ConfigMap
293+
apiVersion: v1
294+
metadata:
295+
name: trusted-ca-bundle
296+
namespace: openshift-gitops
297+
labels:
298+
config.openshift.io/inject-trusted-cabundle: 'true'
290299
- complianceType: mustonlyhave
291300
objectDefinition:
292301
# This is an auto-generated file. DO NOT EDIT
@@ -298,7 +307,7 @@ spec:
298307
labels:
299308
operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
300309
spec:
301-
channel: gitops-1.8
310+
channel: gitops-1.12
302311
installPlanApproval: Automatic
303312
name: openshift-gitops-operator
304313
source: redhat-operators

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,15 @@ spec:
9090
include:
9191
- default
9292
object-templates:
93+
- complianceType: mustonlyhave
94+
objectDefinition:
95+
kind: ConfigMap
96+
apiVersion: v1
97+
metadata:
98+
name: trusted-ca-bundle
99+
namespace: openshift-gitops
100+
labels:
101+
config.openshift.io/inject-trusted-cabundle: 'true'
93102
- complianceType: mustonlyhave
94103
objectDefinition:
95104
# This is an auto-generated file. DO NOT EDIT
@@ -101,7 +110,7 @@ spec:
101110
labels:
102111
operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
103112
spec:
104-
channel: gitops-1.8
113+
channel: gitops-1.12
105114
installPlanApproval: Automatic
106115
name: openshift-gitops-operator
107116
source: redhat-operators

0 commit comments

Comments
 (0)