Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-42371: Update core reference to ignore automatically-added operator labels #40

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-42371: Update core reference to ignore automatically-added operator labels #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion telco-core/configuration/reference-crs-kube-compare/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,13 @@ fieldsToOmit:
- pathToKey: metadata.labels."kubernetes.io/metadata.name"
- pathToKey: metadata.labels."pod-security.kubernetes.io"
isPrefix: true
- pathToKey: metadata.labels."operators.coreos.com/"
isPrefix: true
- pathToKey: metadata.labels."security.openshift.io/scc.podSecurityLabelSync"
- pathToKey: metadata.resourceVersion
- pathToKey: metadata.uid
- pathToKey: spec.finalizers
- pathToKey: metadata.creationTimestamp
- pathToKey: metadata."pod-security.kubernetes.io"
- pathToKey: metadata.generation
- pathToKey: status # TODO: We need to check status in Subscription and CatalogSource. CNF-13521
- pathToKey: metadata.finalizers
Expand Down
2 changes: 2 additions & 0 deletions telco-core/configuration/reference-crs-kube-compare/required/networking/NMStateNS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ apiVersion: v1
kind: Namespace
metadata:
name: openshift-nmstate
labels:
openshift.io/cluster-monitoring: "true"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name appears to be automatically added (though I'm not sure why...) . The monitoring looks to be a specific opt-in. If that is the case it should either be included in the reference CR as well or ignored via metadata.yaml if we don't care.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MarSik : What's your verdict? I don't know enough about either of these, or the core RDS, to know which, if either, should be optional.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need someone from nmstate or networking here, I have no idea.

2 changes: 2 additions & 0 deletions telco-core/configuration/reference-crs/required/networking/NMStateNS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ apiVersion: v1
kind: Namespace
metadata:
name: openshift-nmstate
labels:
openshift.io/cluster-monitoring: "true"