diff --git a/deploy/osd-logging/config.yaml b/deploy/osd-logging/config.yaml index 1aeb524695..e4a69b37c5 100644 --- a/deploy/osd-logging/config.yaml +++ b/deploy/osd-logging/config.yaml @@ -3,6 +3,12 @@ selectorSyncSet: # if this config no longer applies, don't delete the resources resourceApplyMode: "Upsert" + # Ignore the kubectl.kubernetes.io/last-applied-configuration + # annotation when patching resources. The result is that map additions + # made externally (e.g. by the customer) will be ignored rather than + # reverted. + applyBehavior: CreateOnly + matchExpressions: # Enable in-cluster logging alerts for those clusters that already have logging installed # https://issues.redhat.com/browse/OSD-7564 diff --git a/deploy/osd-logging/unsupported/config.yaml b/deploy/osd-logging/unsupported/config.yaml index c3a5d16fc1..b2cebecd11 100644 --- a/deploy/osd-logging/unsupported/config.yaml +++ b/deploy/osd-logging/unsupported/config.yaml @@ -2,6 +2,13 @@ deploymentMode: "SelectorSyncSet" selectorSyncSet: # if we ever remove this, do not remove the resources resourceApplyMode: "Upsert" + + # Ignore the kubectl.kubernetes.io/last-applied-configuration + # annotation when patching resources. The result is that map additions + # made externally (e.g. by the customer) will be ignored rather than + # reverted. + 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 diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index 26acfc160e..0c8836a308 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -30682,6 +30682,7 @@ objects: values: - 'true' resourceApplyMode: Upsert + applyBehavior: CreateOnly resources: - apiVersion: v1 kind: Namespace @@ -30927,6 +30928,7 @@ objects: values: - 'true' resourceApplyMode: Upsert + applyBehavior: CreateOnly resources: - apiVersion: v1 kind: Namespace diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl index 26acfc160e..0c8836a308 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -30682,6 +30682,7 @@ objects: values: - 'true' resourceApplyMode: Upsert + applyBehavior: CreateOnly resources: - apiVersion: v1 kind: Namespace @@ -30927,6 +30928,7 @@ objects: values: - 'true' resourceApplyMode: Upsert + applyBehavior: CreateOnly resources: - apiVersion: v1 kind: Namespace diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl index 26acfc160e..0c8836a308 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -30682,6 +30682,7 @@ objects: values: - 'true' resourceApplyMode: Upsert + applyBehavior: CreateOnly resources: - apiVersion: v1 kind: Namespace @@ -30927,6 +30928,7 @@ objects: values: - 'true' resourceApplyMode: Upsert + applyBehavior: CreateOnly resources: - apiVersion: v1 kind: Namespace