Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 42 additions & 0 deletions values-azure-spoke.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ clusterGroup:
channel: stable
installPlanApproval: Manual
csv: sandboxed-containers-operator.v1.13.1
annotations:
argocd.argoproj.io/sync-wave: "10"
cert-manager:
name: openshift-cert-manager-operator
namespace: cert-manager-operator
Expand All @@ -45,6 +47,36 @@ clusterGroup:
sharedValueFiles:
- '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
- '/overrides/values-{{ $.Values.global.clusterVersion }}.yaml'

extraObjects:
# Bridge for the first-sync ordering race (patterns-operator#887): ArgoCD
# applies wave-0 resources by kind, so the imperative ServiceAccounts are
# attempted before the cluster-admin ClusterRoleBinding that authorises the
# controller to create them. Ungated installs self-heal on the next
# auto-sync; with sync-wave gating the first operation parks on wave-0
# health and deadlocks. This binding applies at wave -1, before any wave-0
# kind, which the controller can create from the start (the operator's
# instance role already grants rbac.authorization.k8s.io: */*).
# Distinct name on purpose — matching the clustergroup chart's own
# vp-gitops-cluster-admin-rolebinding would collide in the manifest.
# TODO: remove once patterns-operator creates the binding (or the
# clustergroup chart moves its own to wave -1) — see patterns-operator#887.
argocd-cluster-admin-bootstrap:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: coco-pattern-argocd-cluster-admin-bootstrap
annotations:
argocd.argoproj.io/sync-wave: "-1"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: cluster-admin
subjects:
- kind: ServiceAccount
name: vp-gitops-argocd-application-controller
namespace: vp-gitops

applications:

secrets-operator:
Expand All @@ -53,13 +85,17 @@ clusterGroup:
project: external-secrets
chart: openshift-external-secrets
chartVersion: 0.0.*
annotations:
argocd.argoproj.io/sync-wave: "0"

sandbox:
name: sandbox
namespace: openshift-sandboxed-containers-operator
project: sandbox
chart: sandboxed-containers
chartVersion: 0.2.*
annotations:
argocd.argoproj.io/sync-wave: "10"
overrides:
- name: global.secretStore.backend
value: vault
Expand All @@ -73,18 +109,24 @@ clusterGroup:
namespace: hello-openshift
project: workloads
path: charts/coco-supported/hello-openshift
annotations:
argocd.argoproj.io/sync-wave: "30"

kbs-access-curl:
name: kbs-access-curl
namespace: kbs-access
project: workloads
path: charts/coco-supported/kbs-access-curl
annotations:
argocd.argoproj.io/sync-wave: "30"

kbs-access-sealed:
name: kbs-access-sealed
namespace: kbs-access
project: workloads
path: charts/coco-supported/kbs-access-sealed
annotations:
argocd.argoproj.io/sync-wave: "30"

imperative:
jobs:
Expand Down
104 changes: 104 additions & 0 deletions values-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ clusterGroup:
acm:
name: advanced-cluster-management
namespace: open-cluster-management
annotations:
argocd.argoproj.io/sync-wave: "10"
eso:
name: openshift-external-secrets-operator
namespace: external-secrets-operator
Expand All @@ -37,16 +39,22 @@ clusterGroup:
channel: stable
installPlanApproval: Manual
csv: sandboxed-containers-operator.v1.13.1
annotations:
argocd.argoproj.io/sync-wave: "10"
trustee:
name: trustee-operator
namespace: trustee-operator-system
channel: stable
installPlanApproval: Manual
csv: trustee-operator.v1.2.1
annotations:
argocd.argoproj.io/sync-wave: "10"
cert-manager:
name: openshift-cert-manager-operator
namespace: cert-manager-operator
channel: stable-v1
annotations:
argocd.argoproj.io/sync-wave: "10"

projects:
- hub
Expand All @@ -61,13 +69,89 @@ clusterGroup:
sharedValueFiles:
- '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
- '/overrides/values-{{ $.Values.global.clusterVersion }}.yaml'

extraObjects:
# Bridge for the first-sync ordering race (patterns-operator#887): ArgoCD
# applies wave-0 resources by kind, so the imperative ServiceAccounts are
# attempted before the cluster-admin ClusterRoleBinding that authorises the
# controller to create them. Ungated installs self-heal on the next
# auto-sync; with sync-wave gating the first operation parks on wave-0
# health and deadlocks. This binding applies at wave -1, before any wave-0
# kind, which the controller can create from the start (the operator's
# instance role already grants rbac.authorization.k8s.io: */*).
# Distinct name on purpose — matching the clustergroup chart's own
# vp-gitops-cluster-admin-rolebinding would collide in the manifest.
# TODO: remove once patterns-operator creates the binding (or the
# clustergroup chart moves its own to wave -1) — see patterns-operator#887.
argocd-cluster-admin-bootstrap:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: coco-pattern-argocd-cluster-admin-bootstrap
annotations:
argocd.argoproj.io/sync-wave: "-1"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: cluster-admin
subjects:
- kind: ServiceAccount
name: vp-gitops-argocd-application-controller
namespace: vp-gitops
wait-for-vault-unsealed:
apiVersion: batch/v1
kind: Job
metadata:
name: wait-for-vault-unsealed
annotations:
argocd.argoproj.io/hook: Sync
argocd.argoproj.io/hook-delete-policy: HookSucceeded,BeforeHookCreation
argocd.argoproj.io/sync-wave: "5"
spec:
backoffLimit: 10
activeDeadlineSeconds: 1800
template:
spec:
restartPolicy: OnFailure
containers:
- name: wait-for-vault
image: registry.redhat.io/openshift4/ose-cli:latest
command:
- /bin/bash
- -c
- |
echo "Waiting for vault to be unsealed..."
while true; do
if curl -sk https://vault.vault.svc:8200/v1/sys/seal-status | grep -q '"sealed":false'; then
echo "Vault unsealed. Waiting 120s for secrets to load..."
sleep 120
echo "Done. Proceeding."
exit 0
fi
echo "Vault not ready. Retrying in 15s..."
sleep 15
done

applications:
acm:
name: acm
namespace: open-cluster-management
project: hub
chart: acm
chartVersion: 0.1.*
# Wave 15: after the wave-10 ACM operator subscription (MCH CRD),
# before trustee at 20.
annotations:
argocd.argoproj.io/sync-wave: "15"
# The MCH operator creates the multicluster-engine subscription at
# runtime from the mce-subscription-spec annotation (rendered from this
# value), so it must be born on the right catalog. Connected: the
# default redhat-operators. Airgap: the mirrored catalog (the default
# catalogs are disabled). Kept as a single tpl-conditional list entry —
# an overlay list would replace this one wholesale.
overrides:
- name: acm.mce_operator.source
value: '{{ if $.Values.global.airgap }}cs-redhat-operator-index-v4-22{{ else }}redhat-operators{{ end }}'

vault:
name: vault
Expand All @@ -76,19 +160,25 @@ clusterGroup:
chart: hashicorp-vault
# Require 0.1.10 or newer within the 0.1.x release series.
chartVersion: "~0.1.10"
annotations:
argocd.argoproj.io/sync-wave: "0"

secrets-operator:
name: openshift-external-secrets
namespace: external-secrets
project: external-secrets
chart: openshift-external-secrets
chartVersion: 0.0.*
annotations:
argocd.argoproj.io/sync-wave: "0"
trustee:
name: trustee
namespace: trustee-operator-system
project: trustee
chart: trustee
chartVersion: 0.10.*
annotations:
argocd.argoproj.io/sync-wave: "20"
extraValueFiles:
- '/overrides/values-trustee.yaml'
- '/overrides/values-trustee-azure.yaml'
Expand All @@ -101,12 +191,16 @@ clusterGroup:
project: sandbox
chart: sandboxed-containers
chartVersion: 0.2.*
annotations:
argocd.argoproj.io/sync-wave: "10"
sandbox-policies:
name: sandbox-policies
namespace: openshift-sandboxed-containers-operator
project: sandbox
chart: sandboxed-policies
chartVersion: 0.3.*
annotations:
argocd.argoproj.io/sync-wave: "20"
overrides:
- name: global.coco.azure.tags
value: "key1=value1,key2=value2"
Expand All @@ -117,6 +211,8 @@ clusterGroup:
namespace: hello-openshift
project: workloads
path: charts/coco-supported/hello-openshift
annotations:
argocd.argoproj.io/sync-wave: "30"
syncPolicy:
automated:
prune: true
Expand All @@ -126,6 +222,8 @@ clusterGroup:
namespace: kbs-access
project: workloads
path: charts/coco-supported/kbs-access-curl
annotations:
argocd.argoproj.io/sync-wave: "30"
syncPolicy:
automated:
prune: true
Expand All @@ -135,6 +233,8 @@ clusterGroup:
namespace: kbs-access
project: workloads
path: charts/coco-supported/kbs-access-sealed
annotations:
argocd.argoproj.io/sync-wave: "30"
syncPolicy:
automated:
prune: true
Expand All @@ -144,6 +244,8 @@ clusterGroup:
namespace: kyverno
project: hub
path: charts/vendor/kyverno
annotations:
argocd.argoproj.io/sync-wave: "0"
syncPolicy:
automated: {}
retry:
Expand Down Expand Up @@ -232,6 +334,8 @@ clusterGroup:
namespace: openshift-sandboxed-containers-operator
project: sandbox
path: charts/all/coco-kyverno-policies
annotations:
argocd.argoproj.io/sync-wave: "20"

imperative:
# NOTE: We *must* use lists and not hashes. As hashes lose ordering once parsed by helm
Expand Down
44 changes: 40 additions & 4 deletions values-baremetal-hub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,33 @@ clusterGroup:
- '/overrides/values-baremetal-{{ if $.Values.global.airgap }}airgap{{ else }}connected{{ end }}.yaml'

extraObjects:
# Bridge for the first-sync ordering race (patterns-operator#887): ArgoCD
# applies wave-0 resources by kind, so the imperative ServiceAccounts are
# attempted before the cluster-admin ClusterRoleBinding that authorises the
# controller to create them. Ungated installs self-heal on the next
# auto-sync; with sync-wave gating the first operation parks on wave-0
# health and deadlocks. This binding applies at wave -1, before any wave-0
# kind, which the controller can create from the start (the operator's
# instance role already grants rbac.authorization.k8s.io: */*).
# Distinct name on purpose — matching the clustergroup chart's own
# vp-gitops-cluster-admin-rolebinding would collide in the manifest.
# TODO: remove once patterns-operator creates the binding (or the
# clustergroup chart moves its own to wave -1) — see patterns-operator#887.
argocd-cluster-admin-bootstrap:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: coco-pattern-argocd-cluster-admin-bootstrap
annotations:
argocd.argoproj.io/sync-wave: "-1"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: cluster-admin
subjects:
- kind: ServiceAccount
name: vp-gitops-argocd-application-controller
namespace: vp-gitops
wait-for-vault-unsealed:
apiVersion: batch/v1
kind: Job
Expand Down Expand Up @@ -155,10 +182,19 @@ clusterGroup:
project: hub
chart: acm
chartVersion: 0.1.*
# Required for airgap -- set to your mirrored catalog source name
# overrides:
# - name: acm.mce_operator.source
# value: "cs-redhat-operator-index-v4-22"
# Wave 15: after the wave-10 ACM operator subscription (MCH CRD),
# before trustee at 20.
annotations:
argocd.argoproj.io/sync-wave: "15"
# The MCH operator creates the multicluster-engine subscription at
# runtime from the mce-subscription-spec annotation (rendered from this
# value), so it must be born on the right catalog. Connected: the
# default redhat-operators. Airgap: the mirrored catalog (the default
# catalogs are disabled). Kept as a single tpl-conditional list entry —
# an overlay list would replace this one wholesale.
overrides:
- name: acm.mce_operator.source
value: '{{ if $.Values.global.airgap }}cs-redhat-operator-index-v4-22{{ else }}redhat-operators{{ end }}'

vault:
name: vault
Expand Down
31 changes: 30 additions & 1 deletion values-baremetal-spoke.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,36 @@ clusterGroup:
- '/overrides/values-storage-{{ $.Values.global.storageProvider }}.yaml'
- '/overrides/values-{{ $.Values.global.clusterVersion }}.yaml'
- '/overrides/values-hw-{{ $.Values.global.hardware.profile }}.yaml'
- '/overrides/values-baremetal-airgap.yaml'
- '/overrides/values-baremetal-{{ if $.Values.global.airgap }}airgap{{ else }}connected{{ end }}.yaml'

extraObjects:
# Bridge for the first-sync ordering race (patterns-operator#887): ArgoCD
# applies wave-0 resources by kind, so the imperative ServiceAccounts are
# attempted before the cluster-admin ClusterRoleBinding that authorises the
# controller to create them. Ungated installs self-heal on the next
# auto-sync; with sync-wave gating the first operation parks on wave-0
# health and deadlocks. This binding applies at wave -1, before any wave-0
# kind, which the controller can create from the start (the operator's
# instance role already grants rbac.authorization.k8s.io: */*).
# Distinct name on purpose — matching the clustergroup chart's own
# vp-gitops-cluster-admin-rolebinding would collide in the manifest.
# TODO: remove once patterns-operator creates the binding (or the
# clustergroup chart moves its own to wave -1) — see patterns-operator#887.
argocd-cluster-admin-bootstrap:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: coco-pattern-argocd-cluster-admin-bootstrap
annotations:
argocd.argoproj.io/sync-wave: "-1"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: cluster-admin
subjects:
- kind: ServiceAccount
name: vp-gitops-argocd-application-controller
namespace: vp-gitops

applications:
secrets-operator:
Expand Down
Loading
Loading