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

fix: don't require app.kubernetes.io/instance:che label on k8s object to trigger a reconcile #1204

Merged
merged 2 commits into from
Nov 30, 2021
Merged

fix: don't require app.kubernetes.io/instance:che label on k8s object to trigger a reconcile #1204

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1c972c
fix: don't require 'app.kubernetes.io/instance:che' label
tolusha Nov 30, 2021
621f04d
Revert some changes
tolusha Nov 30, 2021
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
11 changes: 0 additions & 11 deletions controllers/che/cheobj_verifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ func IsTrustedBundleConfigMap(cl client.Client, watchNamespace string, obj clien
// ignore not matched labels
return false, ctrl.Request{}
}

// Check for instance label
if value, exists := obj.GetLabels()[deploy.KubernetesInstanceLabelKey]; !exists || value != deploy.DefaultCheFlavor(checluster) {
// Ignore config map with missing instance label
return false, ctrl.Request{}
}
}

return true, ctrl.Request{
Expand Down Expand Up @@ -100,11 +94,6 @@ func IsEclipseCheRelatedObj(cl client.Client, watchNamespace string, obj client.
return false, ctrl.Request{}
}

// Check for instance label
if value, exists := obj.GetLabels()[deploy.KubernetesInstanceLabelKey]; !exists || value != deploy.DefaultCheFlavor(checluster) {
return false, ctrl.Request{}
}

return true, ctrl.Request{
NamespacedName: types.NamespacedName{
Namespace: checluster.Namespace,
Expand Down