Skip to content

Commit

Permalink
Update the files
Browse files Browse the repository at this point in the history
Signed-off-by: Petr <[email protected]>
  • Loading branch information
petrkotas committed Nov 15, 2024
1 parent 800d821 commit 7d99654
Show file tree
Hide file tree
Showing 28 changed files with 38 additions and 109 deletions.
17 changes: 17 additions & 0 deletions deploy/osd-logging/00-namespace.patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
kind: Namespace
name: openshift-logging
applyMode: AlwaysApply
patchType: merge
patch: |-
{
"annotations": {
"openshift.io/node-selector": ""
},
"labels": {
"managed.openshift.io/service-lb-quota-exempt": "true"
"managed.openshift.io/storage-pv-quota-exempt": "true"
"openshift.io/cluster-logging": "true"
"openshift.io/cluster-monitoring": 'true'
}
}
8 changes: 1 addition & 7 deletions deploy/osd-logging/00-namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@ apiVersion: v1
kind: Namespace
metadata:
name: openshift-logging
annotations:
openshift.io/node-selector: ""
labels:
managed.openshift.io/service-lb-quota-exempt: "true"
managed.openshift.io/storage-pv-quota-exempt: "true"
openshift.io/cluster-logging: "true"
openshift.io/cluster-monitoring: 'true'

7 changes: 0 additions & 7 deletions deploy/osd-logging/01-operatorgroup.patch.yaml

This file was deleted.

File renamed without changes.
7 changes: 0 additions & 7 deletions deploy/osd-logging/02-curator.configmap.patch.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions deploy/osd-logging/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ selectorSyncSet:
# if this config no longer applies, don't delete the resources
resourceApplyMode: "Upsert"

applyBehavior: "CreateOnly"

matchExpressions:
# Enable in-cluster logging alerts for those clusters that already have logging installed
# https://issues.redhat.com/browse/OSD-7564
Expand Down
7 changes: 0 additions & 7 deletions deploy/osd-logging/supported/03-storage-quota.patch.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions deploy/osd-logging/supported/05-role.patch.yaml

This file was deleted.

File renamed without changes.
7 changes: 0 additions & 7 deletions deploy/osd-logging/supported/06-rolebinding.patch.yaml

This file was deleted.

14 changes: 14 additions & 0 deletions deploy/osd-logging/unsupported/00-namespace.patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: v1
kind: Namespace
name: openshift-logging
applyMode: AlwaysApply
patchType: merge
patch: |-
{
"annotations": {
"openshift.io/node-selector": ""
},
"labels": {
"openshift.io/cluster-logging": "true"
}
}
5 changes: 1 addition & 4 deletions deploy/osd-logging/unsupported/00-namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@ apiVersion: v1
kind: Namespace
metadata:
name: openshift-logging
annotations:
openshift.io/node-selector: ""
labels:
openshift.io/cluster-logging: "true"

7 changes: 0 additions & 7 deletions deploy/osd-logging/unsupported/05-role.patch.yaml

This file was deleted.

File renamed without changes.
7 changes: 0 additions & 7 deletions deploy/osd-logging/unsupported/0601-rolebinding.patch.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions deploy/osd-logging/unsupported/0602-rolebinding.patch.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions deploy/osd-logging/unsupported/0603-rolebinding.patch.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions deploy/osd-logging/unsupported/0604-rolebinding.patch.yaml

This file was deleted.

3 changes: 3 additions & 0 deletions deploy/osd-logging/unsupported/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ deploymentMode: "SelectorSyncSet"
selectorSyncSet:
# if we ever remove this, do not remove the resources
resourceApplyMode: "Upsert"

applyBehavior: "CreateOnly"

matchExpressions:
# Disable in-cluster logging alerts for those clusters that do not already have logging installed
# We removed the version check because that would conflict with this check here for clusters that
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 7d99654

Please sign in to comment.