Skip to content

Commit e815242

Browse files
committed
feat: add support for multiple clusters
Signed-off-by: Chris Butler <chris.butler@redhat.com>
1 parent bac1589 commit e815242

3 files changed

Lines changed: 50 additions & 24 deletions

File tree

rhdp/requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
typer
22
rich
3-
Jinja2
3+
Jinja2
4+
typing_extensions

values-spoke.yaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ clusterGroup:
1717
source: redhat-operators
1818
channel: stable
1919
installPlanApproval: Manual
20-
csv: sandboxed-containers-operator.v1.10.1
20+
csv: sandboxed-containers-operator.v1.11.0
2121
cert-manager:
2222
name: openshift-cert-manager-operator
2323
namespace: cert-manager-operator
@@ -48,8 +48,18 @@ clusterGroup:
4848
name: sandbox
4949
namespace: openshift-sandboxed-containers-operator #upstream config
5050
project: sandbox
51-
chart: sandboxed-containers
52-
chartVersion: 0.0.*
51+
repoURL: https://github.com/butler54/sandboxed-containers-chart.git
52+
targetRevision: remove-ssh
53+
path: ./
54+
overrides:
55+
# - name: global.coco.enableSSHDebug
56+
# value: "true"
57+
- name: global.secretStore.backend
58+
value: vault
59+
- name: secretStore.name
60+
value: vault-backend
61+
- name: secretStore.kind
62+
value: ClusterSecretStore
5363

5464
hello-openshift:
5565
name: hello-openshift
@@ -64,12 +74,7 @@ clusterGroup:
6474
path: charts/coco-supported/kbs-access
6575

6676
imperative:
67-
# NOTE: We *must* use lists and not hashes. As hashes lose ordering once parsed by helm
68-
# The default schedule is every 10 minutes: imperative.schedule
69-
# Total timeout of all jobs is 1h: imperative.activeDeadlineSeconds
70-
# imagePullPolicy is set to always: imperative.imagePullPolicy
71-
# For additional overrides that apply to the jobs, please refer to
72-
# https://validatedpatterns.io/imperative-actions/#additional-job-customizations
77+
image: ghcr.io/butler54/imperative-container:latest
7378
jobs:
7479
- name: install-deps
7580
playbook: ansible/install-deps.yaml

values-trusted-hub.yaml

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ clusterGroup:
2222
source: redhat-operators
2323
channel: stable
2424
installPlanApproval: Manual
25-
csv: trustee-operator.v0.4.1
25+
csv: trustee-operator.v1.0.0
2626
cert-manager:
2727
name: openshift-cert-manager-operator
2828
namespace: cert-manager-operator
@@ -66,31 +66,51 @@ clusterGroup:
6666
name: trustee
6767
namespace: trustee-operator-system #upstream config
6868
project: trustee
69-
chart: trustee
70-
chartVersion: 0.1.*
71-
# Use the override file to specify the list of secrets accessible to trustee from the ESO backend (today by default, Vault).
72-
extraValueFiles:
73-
- '$patternref/overrides/values-trustee.yaml'
69+
repoURL: https://github.com/butler54/trustee-chart.git
70+
targetRevision: merge-certs
71+
path: ./
72+
overrides:
73+
- name: global.coco.secured
74+
value: "true"
75+
- name: kbs.secretResources[0].name
76+
value: kbsres1
77+
- name: kbs.secretResources[0].key
78+
value: secret/data/hub/kbsres1
79+
- name: kbs.secretResources[1].name
80+
value: passphrase
81+
- name: kbs.secretResources[1].key
82+
value: secret/data/hub/passphrase
7483
sandbox-policies:
7584
name: sandbox-policies
7685
namespace: openshift-sandboxed-containers-operator #upstream config
77-
chart: sandboxed-policies
78-
chartVersion: 0.0.*
86+
repoURL: https://github.com/butler54/sandboxed-policies-chart.git
87+
targetRevision: rootvolume
88+
path: ./
89+
overrides:
90+
# - name: global.coco.enableSSHDebug
91+
# value: "true"
92+
- name: global.coco.azure.defaultVMFlavour
93+
value: Standard_DC2as_v5
94+
- name: global.coco.azure.VMFlavours
95+
value: "Standard_DC2as_v5,Standard_DC4as_v5,Standard_DC8as_v5,Standard_DC16as_v5"
96+
- name: global.coco.azure.tags
97+
value: "key1=value1,key2=value2"
98+
- name: global.coco.azure.rootVolumeSize
99+
value: "20"
79100

80101

81102

82103
imperative:
83-
# NOTE: We *must* use lists and not hashes. As hashes lose ordering once parsed by helm
84-
# The default schedule is every 10 minutes: imperative.schedule
85-
# Total timeout of all jobs is 1h: imperative.activeDeadlineSeconds
86-
# imagePullPolicy is set to always: imperative.imagePullPolicy
87-
# For additional overrides that apply to the jobs, please refer to
88-
# https://validatedpatterns.io/imperative-actions/#additional-job-customizations
104+
image: ghcr.io/butler54/imperative-container:latest
89105
jobs:
90106
- name: install-deps
91107
playbook: ansible/install-deps.yaml
92108
verbosity: -vvv
93109
timeout: 3600
110+
- name: configure-azure-dns
111+
playbook: ansible/configure-issuer.yaml
112+
verbosity: -vvv
113+
timeout: 3600
94114
- name: init-data-gzipper
95115
playbook: ansible/init-data-gzipper.yaml
96116
verbosity: -vvv

0 commit comments

Comments
 (0)