Skip to content

Commit c1ed34e

Browse files
butler54beraldolealclaude
committed
feat: update values files to use released charts
Update global, simple, spoke, and trusted-hub values files to align with released chart versions and configuration. Co-authored-by: Beraldo Leal <bleal@redhat.com> Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent dba88ee commit c1ed34e

4 files changed

Lines changed: 45 additions & 42 deletions

File tree

values-global.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ global:
1111
# This defines whether or not to use upstream resources for CoCo.
1212
# Defines whether or not the hub cluster can be used for confidential containers
1313
coco:
14+
securityPolicyFlavour: "insecure" # insecure, signed or reject is expected.
15+
secured: true # true or false. If true, the cluster will be secured. If false, the cluster will be insecure.
16+
# Enable SSH key injection into podvm for debugging. Do not enable in production.
17+
# Also requires: COCO_ENABLE_SSH_DEBUG=true ./scripts/gen-secrets.sh
18+
# and uncommenting the sshKey block in values-secret.yaml.template.
19+
enableSSHDebug: false
1420
azure:
1521
defaultVMFlavour: "Standard_DC2as_v5"
1622
VMFlavours: "Standard_DC2as_v5,Standard_DC4as_v5,Standard_DC8as_v5,Standard_DC16as_v5"
@@ -24,6 +30,7 @@ main:
2430
clusterGroupChartVersion: 0.9.*
2531

2632
# Common secret store configuration used across multiple charts
33+
# Warning do not rely on this. it does not consistently apply.
2734
secretStore:
2835
name: vault-backend
2936
kind: ClusterSecretStore

values-simple.yaml

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
clusterGroup:
44
name: simple
55
isHubCluster: true
6+
# Override health check for Subscriptions to treat UpgradePending as healthy
7+
# Only applies to pinned CSV subscriptions (sandbox and trustee)
68
namespaces:
79
- open-cluster-management
810
- vault
@@ -12,7 +14,6 @@ clusterGroup:
1214
- hello-openshift
1315
- cert-manager-operator
1416
- cert-manager
15-
- letsencrypt
1617
- kbs-access
1718
- encrypted-storage
1819
subscriptions:
@@ -26,14 +27,14 @@ clusterGroup:
2627
source: redhat-operators
2728
channel: stable
2829
installPlanApproval: Manual
29-
csv: sandboxed-containers-operator.v1.10.1
30+
csv: sandboxed-containers-operator.v1.11.0
3031
trustee:
3132
name: trustee-operator
3233
namespace: trustee-operator-system
3334
source: redhat-operators
3435
channel: stable
3536
installPlanApproval: Manual
36-
csv: trustee-operator.v0.4.1
37+
csv: trustee-operator.v1.0.0
3738
cert-manager:
3839
name: openshift-cert-manager-operator
3940
namespace: cert-manager-operator
@@ -72,39 +73,28 @@ clusterGroup:
7273
project: golang-external-secrets
7374
chart: golang-external-secrets
7475
chartVersion: 0.1.*
75-
7676
trustee:
7777
name: trustee
7878
namespace: trustee-operator-system #upstream config
7979
project: trustee
8080
chart: trustee
81-
chartVersion: 0.1.*
82-
# Use the override file to specify the list of secrets accessible to trustee from the ESO backend (today by default, Vault).
83-
extraValueFiles:
84-
- '$patternref/overrides/values-trustee.yaml'
81+
chartVersion: 0.2.*
8582
sandbox:
8683
name: sandbox
8784
namespace: openshift-sandboxed-containers-operator #upstream config
8885
project: sandbox
8986
chart: sandboxed-containers
90-
chartVersion: 0.0.*
87+
chartVersion: 0.2.*
9188
sandbox-policies:
9289
name: sandbox-policies
9390
namespace: openshift-sandboxed-containers-operator #upstream config
9491
chart: sandboxed-policies
95-
chartVersion: 0.0.*
96-
97-
# Letsencrypt is not required anymore for trustee.
98-
# It's only here if you need it for your needs.
99-
letsencrypt:
100-
name: letsencrypt
101-
namespace: letsencrypt
102-
project: hub
103-
path: charts/all/letsencrypt
104-
# Default to 'safe' for ARO
92+
chartVersion: 0.1.*
10593
overrides:
106-
- name: letsencrypt.enabled
107-
value: false
94+
- name: global.coco.azure.tags
95+
value: "key1=value1,key2=value2"
96+
- name: global.coco.azure.rootVolumeSize
97+
value: "20"
10898
hello-openshift:
10999
name: hello-openshift
110100
namespace: hello-openshift
@@ -117,14 +107,14 @@ clusterGroup:
117107
project: workloads
118108
path: charts/coco-supported/kbs-access
119109

120-
121110
imperative:
122111
# NOTE: We *must* use lists and not hashes. As hashes lose ordering once parsed by helm
123112
# The default schedule is every 10 minutes: imperative.schedule
124113
# Total timeout of all jobs is 1h: imperative.activeDeadlineSeconds
125114
# imagePullPolicy is set to always: imperative.imagePullPolicy
126115
# For additional overrides that apply to the jobs, please refer to
127116
# https://validatedpatterns.io/imperative-actions/#additional-job-customizations
117+
image: ghcr.io/butler54/imperative-container:latest
128118
jobs:
129119
- name: install-deps
130120
playbook: ansible/install-deps.yaml

values-spoke.yaml

Lines changed: 10 additions & 8 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
@@ -49,7 +49,14 @@ clusterGroup:
4949
namespace: openshift-sandboxed-containers-operator #upstream config
5050
project: sandbox
5151
chart: sandboxed-containers
52-
chartVersion: 0.0.*
52+
chartVersion: 0.2.*
53+
overrides:
54+
- name: global.secretStore.backend
55+
value: vault
56+
- name: secretStore.name
57+
value: vault-backend
58+
- name: secretStore.kind
59+
value: ClusterSecretStore
5360

5461
hello-openshift:
5562
name: hello-openshift
@@ -64,12 +71,7 @@ clusterGroup:
6471
path: charts/coco-supported/kbs-access
6572

6673
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
74+
image: ghcr.io/butler54/imperative-container:latest
7375
jobs:
7476
- name: install-deps
7577
playbook: ansible/install-deps.yaml

values-trusted-hub.yaml

Lines changed: 16 additions & 12 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
@@ -67,30 +67,34 @@ clusterGroup:
6767
namespace: trustee-operator-system #upstream config
6868
project: trustee
6969
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'
70+
chartVersion: 0.2.*
71+
overrides:
72+
- name: global.coco.secured
73+
value: "true"
7474
sandbox-policies:
7575
name: sandbox-policies
7676
namespace: openshift-sandboxed-containers-operator #upstream config
7777
chart: sandboxed-policies
78-
chartVersion: 0.0.*
78+
chartVersion: 0.1.*
79+
overrides:
80+
- name: global.coco.azure.tags
81+
value: "key1=value1,key2=value2"
82+
- name: global.coco.azure.rootVolumeSize
83+
value: "20"
7984

8085

8186

8287
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
88+
image: ghcr.io/butler54/imperative-container:latest
8989
jobs:
9090
- name: install-deps
9191
playbook: ansible/install-deps.yaml
9292
verbosity: -vvv
9393
timeout: 3600
94+
- name: configure-azure-dns
95+
playbook: ansible/configure-issuer.yaml
96+
verbosity: -vvv
97+
timeout: 3600
9498
- name: init-data-gzipper
9599
playbook: ansible/init-data-gzipper.yaml
96100
verbosity: -vvv

0 commit comments

Comments
 (0)