Skip to content

Commit 2a8870e

Browse files
mbaldessarimbaldessari
authored
Merge pull request #483 from mbaldessari/tests
Small cleanups
2 parents e8c9016 + 444016b commit 2a8870e

4 files changed

Lines changed: 32 additions & 42 deletions

File tree

‎acm/templates/policies/application-policies.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ spec:
6161
value: {{ $.Values.global.hubClusterDomain }}
6262
- name: global.localClusterDomain
6363
value: '{{ `{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain }}` }}'
64-
# Requires ACM 2.6 or higher
6564
- name: global.clusterDomain
6665
value: '{{ `{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain | replace "apps." "" }}` }}'
67-
# Requires ACM 2.6 or higher (I could not come up with something less terrible to get maj.min)
6866
- name: global.clusterVersion
6967
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) }}` }}'
7068
- name: global.localClusterName

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,14 @@ 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 (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'
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
228228
value: https://github.com/pattern-clone/mypattern
@@ -236,10 +236,8 @@ 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
244242
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

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,14 @@ 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 (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'
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
219219
value: https://github.com/pattern-clone/mypattern
@@ -227,10 +227,8 @@ 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
235233
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

‎tests/acm-normal.expected.yaml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -609,14 +609,14 @@ spec:
609609
helm:
610610
ignoreMissingValueFiles: true
611611
valueFiles:
612-
- "/values-global.yaml"
613-
- "/values-acm-edge.yaml"
614-
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}.yaml'
615-
- '/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'
616-
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-acm-edge.yaml'
617-
# We cannot use $.Values.global.clusterVersion because that gets resolved to the
618-
# hub's cluster version, whereas we want to include the spoke cluster version
619-
- '/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'
612+
- "/values-global.yaml"
613+
- "/values-acm-edge.yaml"
614+
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}.yaml'
615+
- '/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'
616+
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-acm-edge.yaml'
617+
# We cannot use $.Values.global.clusterVersion because that gets resolved to the
618+
# hub's cluster version, whereas we want to include the spoke cluster version
619+
- '/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'
620620
parameters:
621621
- name: global.repoURL
622622
value: https://github.com/pattern-clone/mypattern
@@ -630,10 +630,8 @@ spec:
630630
value: apps.hub.example.com
631631
- name: global.localClusterDomain
632632
value: '{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain }}'
633-
# Requires ACM 2.6 or higher
634633
- name: global.clusterDomain
635634
value: '{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain | replace "apps." "" }}'
636-
# Requires ACM 2.6 or higher (I could not come up with something less terrible to get maj.min)
637635
- name: global.clusterVersion
638636
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) }}'
639637
- name: global.localClusterName
@@ -707,14 +705,14 @@ spec:
707705
helm:
708706
ignoreMissingValueFiles: true
709707
valueFiles:
710-
- "/values-global.yaml"
711-
- "/values-acm-provision-edge.yaml"
712-
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}.yaml'
713-
- '/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'
714-
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-acm-provision-edge.yaml'
715-
# We cannot use $.Values.global.clusterVersion because that gets resolved to the
716-
# hub's cluster version, whereas we want to include the spoke cluster version
717-
- '/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'
708+
- "/values-global.yaml"
709+
- "/values-acm-provision-edge.yaml"
710+
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}.yaml'
711+
- '/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'
712+
- '/values-{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}-acm-provision-edge.yaml'
713+
# We cannot use $.Values.global.clusterVersion because that gets resolved to the
714+
# hub's cluster version, whereas we want to include the spoke cluster version
715+
- '/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'
718716
parameters:
719717
- name: global.repoURL
720718
value: https://github.com/pattern-clone/mypattern
@@ -728,10 +726,8 @@ spec:
728726
value: apps.hub.example.com
729727
- name: global.localClusterDomain
730728
value: '{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain }}'
731-
# Requires ACM 2.6 or higher
732729
- name: global.clusterDomain
733730
value: '{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain | replace "apps." "" }}'
734-
# Requires ACM 2.6 or higher (I could not come up with something less terrible to get maj.min)
735731
- name: global.clusterVersion
736732
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) }}'
737733
- name: global.localClusterName

0 commit comments

Comments
 (0)