Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

chore: updated values and fixed template #10

Merged
merged 2 commits into from
Apr 11, 2024
Merged

chore: updated values and fixed template #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1f4025
chore: updated values for install-config; fixed template issue for DR…
r2dedios Apr 11, 2024
1d988fd
tests: updated tests expected files
r2dedios Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions charts/hub/rdr/templates/05_dr_policy_create.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{{ $clusterSet := .name }}
{{ $clusters := .clusters }}
{{- range .intervals }}
---
apiVersion: ramendr.openshift.io/v1alpha1
kind: DRPolicy
metadata:
Expand Down
8 changes: 4 additions & 4 deletions charts/hub/rdr/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ regionalDR:
aws:
type: m5.2xlarge
zones:
- eu-central-1a
- ca-central-1a
compute:
- name: worker
replicas: 5
platform:
aws:
type: m5.2xlarge
zones:
- eu-central-1a
- ca-central-1a
networking:
clusterNetwork:
- cidr: 10.128.0.0/14
Expand All @@ -39,7 +39,7 @@ regionalDR:
- 172.30.0.0/16
platform:
aws:
region: eu-central-1
region: ca-central-1
userTags:
project: ValidatedPatterns

Expand All @@ -53,7 +53,7 @@ regionalDR:
apiVersion: v1
metadata:
name: ocp-secondary
baseDomain: your.basedomain.com
baseDomain: example-domain.com
controlPlane:
name: master
replicas: 3
Expand Down
2 changes: 2 additions & 0 deletions tests/hub-rdr-industrial-edge-factory.expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ spec:
- ocp-primary
- ocp-secondary
schedulingInterval: 1m
---
# Source: hub-apps/templates/05_dr_policy_create.yaml
apiVersion: ramendr.openshift.io/v1alpha1
kind: DRPolicy
metadata:
Expand Down
2 changes: 2 additions & 0 deletions tests/hub-rdr-industrial-edge-hub.expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ spec:
- ocp-primary
- ocp-secondary
schedulingInterval: 1m
---
# Source: hub-apps/templates/05_dr_policy_create.yaml
apiVersion: ramendr.openshift.io/v1alpha1
kind: DRPolicy
metadata:
Expand Down
2 changes: 2 additions & 0 deletions tests/hub-rdr-medical-diagnosis-hub.expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ spec:
- ocp-primary
- ocp-secondary
schedulingInterval: 1m
---
# Source: hub-apps/templates/05_dr_policy_create.yaml
apiVersion: ramendr.openshift.io/v1alpha1
kind: DRPolicy
metadata:
Expand Down
10 changes: 6 additions & 4 deletions tests/hub-rdr-naked.expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ metadata:
namespace: ocp-primary
type: Opaque
data:
install-config.yaml: YXBpVmVyc2lvbjogdjEKYmFzZURvbWFpbjogZXhhbXBsZS1kb21haW4uY29tCmNvbXB1dGU6Ci0gbmFtZTogd29ya2VyCiAgcGxhdGZvcm06CiAgICBhd3M6CiAgICAgIHR5cGU6IG01LjJ4bGFyZ2UKICAgICAgem9uZXM6CiAgICAgIC0gZXUtY2VudHJhbC0xYQogIHJlcGxpY2FzOiA1CmNvbnRyb2xQbGFuZToKICBuYW1lOiBtYXN0ZXIKICBwbGF0Zm9ybToKICAgIGF3czoKICAgICAgdHlwZTogbTUuMnhsYXJnZQogICAgICB6b25lczoKICAgICAgLSBldS1jZW50cmFsLTFhCiAgcmVwbGljYXM6IDMKbWV0YWRhdGE6CiAgbmFtZTogb2NwLXByaW1hcnkKbmV0d29ya2luZzoKICBjbHVzdGVyTmV0d29yazoKICAtIGNpZHI6IDEwLjEyOC4wLjAvMTQKICAgIGhvc3RQcmVmaXg6IDIzCiAgbWFjaGluZU5ldHdvcms6CiAgLSBjaWRyOiAxMC4wLjAuMC8xNgogIG5ldHdvcmtUeXBlOiBPcGVuU2hpZnRTRE4KICBzZXJ2aWNlTmV0d29yazoKICAtIDE3Mi4zMC4wLjAvMTYKcGxhdGZvcm06CiAgYXdzOgogICAgcmVnaW9uOiBldS1jZW50cmFsLTEKICAgIHVzZXJUYWdzOgogICAgICBwcm9qZWN0OiBWYWxpZGF0ZWRQYXR0ZXJucwpwdWJsaXNoOiBFeHRlcm5hbApwdWxsU2VjcmV0OiAiIgpzc2hLZXk6ICIi
install-config.yaml: YXBpVmVyc2lvbjogdjEKYmFzZURvbWFpbjogZXhhbXBsZS1kb21haW4uY29tCmNvbXB1dGU6Ci0gbmFtZTogd29ya2VyCiAgcGxhdGZvcm06CiAgICBhd3M6CiAgICAgIHR5cGU6IG01LjJ4bGFyZ2UKICAgICAgem9uZXM6CiAgICAgIC0gY2EtY2VudHJhbC0xYQogIHJlcGxpY2FzOiA1CmNvbnRyb2xQbGFuZToKICBuYW1lOiBtYXN0ZXIKICBwbGF0Zm9ybToKICAgIGF3czoKICAgICAgdHlwZTogbTUuMnhsYXJnZQogICAgICB6b25lczoKICAgICAgLSBjYS1jZW50cmFsLTFhCiAgcmVwbGljYXM6IDMKbWV0YWRhdGE6CiAgbmFtZTogb2NwLXByaW1hcnkKbmV0d29ya2luZzoKICBjbHVzdGVyTmV0d29yazoKICAtIGNpZHI6IDEwLjEyOC4wLjAvMTQKICAgIGhvc3RQcmVmaXg6IDIzCiAgbWFjaGluZU5ldHdvcms6CiAgLSBjaWRyOiAxMC4wLjAuMC8xNgogIG5ldHdvcmtUeXBlOiBPcGVuU2hpZnRTRE4KICBzZXJ2aWNlTmV0d29yazoKICAtIDE3Mi4zMC4wLjAvMTYKcGxhdGZvcm06CiAgYXdzOgogICAgcmVnaW9uOiBjYS1jZW50cmFsLTEKICAgIHVzZXJUYWdzOgogICAgICBwcm9qZWN0OiBWYWxpZGF0ZWRQYXR0ZXJucwpwdWJsaXNoOiBFeHRlcm5hbApwdWxsU2VjcmV0OiAiIgpzc2hLZXk6ICIi
---
# Source: hub-apps/templates/01_cluster_deployments.yaml
apiVersion: v1
Expand All @@ -46,7 +46,7 @@ metadata:
namespace: ocp-secondary
type: Opaque
data:
install-config.yaml: YXBpVmVyc2lvbjogdjEKYmFzZURvbWFpbjogeW91ci5iYXNlZG9tYWluLmNvbQpjb21wdXRlOgotIG5hbWU6IHdvcmtlcgogIHBsYXRmb3JtOgogICAgYXdzOgogICAgICB0eXBlOiBtNS4yeGxhcmdlCiAgICAgIHpvbmVzOgogICAgICAtIGV1LWNlbnRyYWwtMWEKICByZXBsaWNhczogNQpjb250cm9sUGxhbmU6CiAgbmFtZTogbWFzdGVyCiAgcGxhdGZvcm06CiAgICBhd3M6CiAgICAgIHR5cGU6IG01LjJ4bGFyZ2UKICAgICAgem9uZXM6CiAgICAgIC0gZXUtY2VudHJhbC0xYQogIHJlcGxpY2FzOiAzCm1ldGFkYXRhOgogIG5hbWU6IG9jcC1zZWNvbmRhcnkKbmV0d29ya2luZzoKICBjbHVzdGVyTmV0d29yazoKICAtIGNpZHI6IDEwLjEzMi4wLjAvMTQKICAgIGhvc3RQcmVmaXg6IDIzCiAgbWFjaGluZU5ldHdvcms6CiAgLSBjaWRyOiAxMC4xLjAuMC8xNgogIG5ldHdvcmtUeXBlOiBPcGVuU2hpZnRTRE4KICBzZXJ2aWNlTmV0d29yazoKICAtIDE3Mi4zMS4wLjAvMTYKcGxhdGZvcm06CiAgYXdzOgogICAgcmVnaW9uOiBldS1jZW50cmFsLTEKICAgIHVzZXJUYWdzOgogICAgICBwcm9qZWN0OiBWYWxpZGF0ZWRQYXR0ZXJucwpwdWJsaXNoOiBFeHRlcm5hbApwdWxsU2VjcmV0OiAiIgpzc2hLZXk6ICIi
install-config.yaml: YXBpVmVyc2lvbjogdjEKYmFzZURvbWFpbjogZXhhbXBsZS1kb21haW4uY29tCmNvbXB1dGU6Ci0gbmFtZTogd29ya2VyCiAgcGxhdGZvcm06CiAgICBhd3M6CiAgICAgIHR5cGU6IG01LjJ4bGFyZ2UKICAgICAgem9uZXM6CiAgICAgIC0gZXUtY2VudHJhbC0xYQogIHJlcGxpY2FzOiA1CmNvbnRyb2xQbGFuZToKICBuYW1lOiBtYXN0ZXIKICBwbGF0Zm9ybToKICAgIGF3czoKICAgICAgdHlwZTogbTUuMnhsYXJnZQogICAgICB6b25lczoKICAgICAgLSBldS1jZW50cmFsLTFhCiAgcmVwbGljYXM6IDMKbWV0YWRhdGE6CiAgbmFtZTogb2NwLXNlY29uZGFyeQpuZXR3b3JraW5nOgogIGNsdXN0ZXJOZXR3b3JrOgogIC0gY2lkcjogMTAuMTMyLjAuMC8xNAogICAgaG9zdFByZWZpeDogMjMKICBtYWNoaW5lTmV0d29yazoKICAtIGNpZHI6IDEwLjEuMC4wLzE2CiAgbmV0d29ya1R5cGU6IE9wZW5TaGlmdFNETgogIHNlcnZpY2VOZXR3b3JrOgogIC0gMTcyLjMxLjAuMC8xNgpwbGF0Zm9ybToKICBhd3M6CiAgICByZWdpb246IGV1LWNlbnRyYWwtMQogICAgdXNlclRhZ3M6CiAgICAgIHByb2plY3Q6IFZhbGlkYXRlZFBhdHRlcm5zCnB1Ymxpc2g6IEV4dGVybmFsCnB1bGxTZWNyZXQ6ICIiCnNzaEtleTogIiI=
---
# Source: hub-apps/templates/01_console_mco_enable_patch.yaml
kind: ClusterRole
Expand Down Expand Up @@ -144,7 +144,7 @@ spec:
aws:
credentialsSecretRef:
name: ocp-primary-cluster-aws-creds
region: eu-central-1
region: ca-central-1
provisioning:
installConfigSecretRef:
name: ocp-primary-cluster-install-config
Expand All @@ -166,7 +166,7 @@ metadata:
vendor: OpenShift
cluster.open-cluster-management.io/clusterset: resilient
spec:
baseDomain: your.basedomain.com
baseDomain: example-domain.com
clusterName: ocp-secondary
installAttemptsLimit: 1
platform:
Expand Down Expand Up @@ -196,6 +196,8 @@ spec:
- ocp-primary
- ocp-secondary
schedulingInterval: 1m
---
# Source: hub-apps/templates/05_dr_policy_create.yaml
apiVersion: ramendr.openshift.io/v1alpha1
kind: DRPolicy
metadata:
Expand Down
2 changes: 2 additions & 0 deletions tests/hub-rdr-normal.expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ spec:
- ocp-primary
- ocp-secondary
schedulingInterval: 1m
---
# Source: hub-apps/templates/05_dr_policy_create.yaml
apiVersion: ramendr.openshift.io/v1alpha1
kind: DRPolicy
metadata:
Expand Down
Loading