🚑 hotfix annotations

amitai-devops · amitai-devops · commit 74f3ebde5033 · 2022-12-19T15:06:49.000+02:00
modified:   controllers/pod_controller.go; modified:   controllers/pod_controller_functions.go
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 {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R`
`76`	`76`	`return ctrl.Result{}, err`
`77`	`77`	`}`
`78`	`78`
`79`		`- if (!r.EnableAnnotation && !ignoreAnnotation) \|\| (r.EnableAnnotation && annotation && !ignoreAnnotation) {`
	`79`	`+ if ((!r.EnableAnnotation) \|\| (r.EnableAnnotation && annotation)) && !ignoreAnnotation {`
`80`	`80`
`81`	`81`	`data, err := r.ClientSet.RESTClient().Get().AbsPath(fmt.Sprintf("apis/metrics.k8s.io/v1beta1/namespaces/%v/pods/%v", pod.Namespace, pod.Name)).DoRaw(ctx)`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (r *PodReconciler) NamespaceOrPodHaveIgnoreAnnotation(pod corev1.Pod, ctx c`
`37`	`37`	`return false, err`
`38`	`38`	`}`
`39`	`39`	`namespaceHasIgnoreAnnotation := namespace.Annotations[operatorAnnotation] == "false"`
`40`		`- return (namespaceHasIgnoreAnnotation) && (podHasIgnoreAnnotation), nil`
	`40`	`+ return (namespaceHasIgnoreAnnotation) \|\| (podHasIgnoreAnnotation), nil`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func (r *PodReconciler) GetPodMode(pod corev1.Pod, ctx context.Context) string {`