File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -5,11 +5,12 @@ metadata:
55 open-cluster-management.io/policy-set : openshift-plus
66 name : binding-policy-openshift-plus-hub
77 namespace : policies
8- placementRef :
9- apiGroup : cluster.open-cluster-management.io
10- kind : Placement
11- name : placement-openshift-plus-hub
12- subjects :
13- - apiGroup : policy.open-cluster-management.io
14- kind : PolicySet
15- name : openshift-plus-hub
8+ spec :
9+ placementRef :
10+ apiGroup : cluster.open-cluster-management.io
11+ kind : Placement
12+ name : placement-openshift-plus-hub
13+ subjects :
14+ - apiGroup : policy.open-cluster-management.io
15+ kind : PolicySet
16+ name : openshift-plus-hub
Original file line number Diff line number Diff line change @@ -5,11 +5,12 @@ metadata:
55 open-cluster-management.io/policy-set : openshift-plus
66 name : binding-policy-openshift-plus-managed
77 namespace : policies
8- placementRef :
9- apiGroup : cluster.open-cluster-management.io
10- kind : Placement
11- name : placement-openshift-plus-managed
12- subjects :
13- - apiGroup : policy.open-cluster-management.io
14- kind : PolicySet
15- name : openshift-plus-managed
8+ spec :
9+ placementRef :
10+ apiGroup : cluster.open-cluster-management.io
11+ kind : Placement
12+ name : placement-openshift-plus-managed
13+ subjects :
14+ - apiGroup : policy.open-cluster-management.io
15+ kind : PolicySet
16+ name : openshift-plus-managed
Original file line number Diff line number Diff line change @@ -35,11 +35,11 @@ spec:
3535 thanos.yaml : |
3636 type: s3
3737 config:
38- bucket: ' {{ `{{ (lookup "objectbucket.io/v1alpha1" "ObjectBucket" "" "obc-openshift-storage-obc-observability").spec.endpoint.bucketName }}` }}'
39- endpoint: ' {{ `{{ (lookup "objectbucket.io/v1alpha1" "ObjectBucket" "" "obc-openshift-storage-obc-observability").spec.endpoint.bucketHost }}` }}'
38+ bucket: " {{ (lookup "objectbucket.io/v1alpha1" "ObjectBucket" "" "obc-openshift-storage-obc-observability").spec.endpoint.bucketName | default "obc-observability-bucket" }}"
39+ endpoint: " {{ (lookup "objectbucket.io/v1alpha1" "ObjectBucket" "" "obc-openshift-storage-obc-observability").spec.endpoint.bucketHost | default "s3.openshift-storage.svc.cluster.local" }}"
4040 insecure: false
41- access_key: ' {{ `{{ (lookup "v1" "Secret" "openshift-storage" "noobaa-admin").data.AWS_ACCESS_KEY_ID | base64dec }}` }}'
42- secret_key: ' {{ `{{ (lookup "v1" "Secret" "openshift-storage" "noobaa-admin").data.AWS_SECRET_ACCESS_KEY | base64dec }}` }}'
41+ access_key: " {{ (lookup "v1" "Secret" "openshift-storage" "noobaa-admin").data.AWS_ACCESS_KEY_ID | b64dec | default "placeholder" }}"
42+ secret_key: " {{ (lookup "v1" "Secret" "openshift-storage" "noobaa-admin").data.AWS_SECRET_ACCESS_KEY | b64dec | default "placeholder" }}"
4343 http_config:
4444 insecure_skip_verify: true
4545 tls_config:
5050 kind : MultiClusterObservability
5151 metadata :
5252 name : observability
53+ namespace : open-cluster-management-observability
5354 spec :
5455 observabilityAddonSpec : {}
5556 storageConfig :
Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ clusterGroup:
33 isHubCluster : true
44 namespaces :
55 - open-cluster-management
6+ - open-cluster-management-observability
67 - vault
78 - golang-external-secrets
89 - regional-dr
@@ -69,8 +70,16 @@ clusterGroup:
6970 automated : {}
7071 retry :
7172 limit : 20
73+ backoff :
74+ duration : 5s
75+ factor : 2
76+ maxDuration : 3m
7277 syncOptions :
73- - syncTimeout=600s
78+ - syncTimeout=1800s
79+ - CreateNamespace=true
80+ - PrunePropagationPolicy=foreground
81+ - RespectIgnoreDifferences=true
82+ - ServerSideApply=true
7483 ignoreDifferences :
7584 - group : operators.openshift.io
7685 kind : Console
You can’t perform that action at this time.
0 commit comments