🚑 hotfix annotations

modified: controllers/pod_controller.go; modified: controllers/pod_controller_functions.go
ElementTech · Dec 19, 2022 · 74f3ebd · 74f3ebd
1 parent 74c6bf4
commit 74f3ebd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controllers/pod_controller.go b/controllers/pod_controller.go
@@ -76,7 +76,7 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 		return ctrl.Result{}, err
 	}
 
-	if (!r.EnableAnnotation && !ignoreAnnotation) || (r.EnableAnnotation && annotation && !ignoreAnnotation) {
+	if ((!r.EnableAnnotation) || (r.EnableAnnotation && annotation)) && !ignoreAnnotation {
 
 		data, err := r.ClientSet.RESTClient().Get().AbsPath(fmt.Sprintf("apis/metrics.k8s.io/v1beta1/namespaces/%v/pods/%v", pod.Namespace, pod.Name)).DoRaw(ctx)
 

diff --git a/controllers/pod_controller_functions.go b/controllers/pod_controller_functions.go
@@ -37,7 +37,7 @@ func (r *PodReconciler) NamespaceOrPodHaveIgnoreAnnotation(pod corev1.Pod, ctx c
 		return false, err
 	}
 	namespaceHasIgnoreAnnotation := namespace.Annotations[operatorAnnotation] == "false"
-	return (namespaceHasIgnoreAnnotation) && (podHasIgnoreAnnotation), nil
+	return (namespaceHasIgnoreAnnotation) || (podHasIgnoreAnnotation), nil
 }
 
 func (r *PodReconciler) GetPodMode(pod corev1.Pod, ctx context.Context) string {