From 7f97e202f0f5d76c8815ce73aea0f1c7c63b7a1e Mon Sep 17 00:00:00 2001 From: geoffrey1330 Date: Mon, 7 Aug 2023 11:07:35 +0100 Subject: [PATCH 1/5] keep Signed-off-by: geoffrey1330 --- .../crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml index 7cb6115e29..b515135f9c 100644 --- a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml +++ b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml @@ -3,7 +3,11 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: +<<<<<<< HEAD controller-gen.kubebuilder.io/version: v0.13.0 +======= + controller-gen.kubebuilder.io/version: v0.12.0 +>>>>>>> 9f2c6d64 (keep) name: keptnmetricsproviders.metrics.keptn.sh spec: group: metrics.keptn.sh From deb385363f375911510d5b538c0350d62de243b9 Mon Sep 17 00:00:00 2001 From: geoffrey1330 Date: Fri, 22 Sep 2023 10:56:53 +0100 Subject: [PATCH 2/5] keep Signed-off-by: geoffrey1330 --- .../crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml index b515135f9c..7cb6115e29 100644 --- a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml +++ b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml @@ -3,11 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: -<<<<<<< HEAD controller-gen.kubebuilder.io/version: v0.13.0 -======= - controller-gen.kubebuilder.io/version: v0.12.0 ->>>>>>> 9f2c6d64 (keep) name: keptnmetricsproviders.metrics.keptn.sh spec: group: metrics.keptn.sh From 47bfbb5d7fd339368cd61ed3830764ec71e19f3d Mon Sep 17 00:00:00 2001 From: geoffrey1330 Date: Tue, 17 Oct 2023 15:03:28 +0100 Subject: [PATCH 3/5] Improve logging in schedulervusing relevant context Signed-off-by: geoffrey1330 --- scheduler/pkg/klcpermit/permit.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scheduler/pkg/klcpermit/permit.go b/scheduler/pkg/klcpermit/permit.go index 4fd5a40f8a..81300b27d0 100644 --- a/scheduler/pkg/klcpermit/permit.go +++ b/scheduler/pkg/klcpermit/permit.go @@ -31,16 +31,16 @@ func (pl *Permit) Name() string { func (pl *Permit) Permit(ctx context.Context, state *framework.CycleState, p *v1.Pod, nodeName string) (*framework.Status, time.Duration) { - klog.Infof("[Keptn Permit Plugin] waiting for pre-deployment checks on %s", p.GetObjectMeta().GetName()) + klog.Infof("[Keptn Permit Plugin] waiting for pre-deployment checks on %s", p.GetObjectMeta().GetName(), p.GetObjectMeta().GetNamespace()) // check the permit immediately, to fail early in case the pod cannot be queued switch pl.workloadManager.Permit(ctx, p) { case Success: - klog.Infof("[Keptn Permit Plugin] passed pre-deployment checks on %s", p.GetObjectMeta().GetName()) + klog.Infof("[Keptn Permit Plugin] passed pre-deployment checks on %s", p.GetObjectMeta().GetName(), p.GetObjectMeta().GetNamespace()) return framework.NewStatus(framework.Success), 0 * time.Second default: - klog.Infof("[Keptn Permit Plugin] waiting for pre-deployment checks on %s to succeed", p.GetObjectMeta().GetName()) + klog.Infof("[Keptn Permit Plugin] waiting for pre-deployment checks on %s to succeed", p.GetObjectMeta().GetName(), p.GetObjectMeta().GetNamespace()) go func() { // create a new context since we are in a new goroutine ctx2, cancel := context.WithCancel(context.Background()) From c1466afc9f8724ec50c7dff6e4aa11b3b021d3a8 Mon Sep 17 00:00:00 2001 From: geoffrey1330 Date: Tue, 17 Oct 2023 15:39:06 +0100 Subject: [PATCH 4/5] Improve logging in schedulervusing relevant context Signed-off-by: geoffrey1330 --- scheduler/pkg/klcpermit/workflow_manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scheduler/pkg/klcpermit/workflow_manager.go b/scheduler/pkg/klcpermit/workflow_manager.go index d8a8cb8fb9..64a83a62af 100644 --- a/scheduler/pkg/klcpermit/workflow_manager.go +++ b/scheduler/pkg/klcpermit/workflow_manager.go @@ -76,7 +76,7 @@ func (sMgr *WorkloadManager) Permit(ctx context.Context, pod *corev1.Pod) Status crd, err := sMgr.GetCRD(ctx, pod.Namespace, name) if err != nil { - klog.Infof("[Keptn Permit Plugin] could not find workloadVersion crd %s, err:%s", name, err.Error()) + klog.Infof("[Keptn Permit Plugin] could not find workloadVersion crd %s, err:%s", name, err.Error(), pod.GetObjectMeta().GetName(), pod.GetObjectMeta().GetNamespace()) return WorkloadVersionNotFound } From 18d575aaddbc1f9449bdc342a86a9dac6a94c8e6 Mon Sep 17 00:00:00 2001 From: geoffrey1330 Date: Tue, 17 Oct 2023 18:24:08 +0100 Subject: [PATCH 5/5] Improve logging in schedulervusing relevant context Signed-off-by: geoffrey1330 --- scheduler/pkg/klcpermit/permit.go | 6 +++--- scheduler/pkg/klcpermit/workflow_manager.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scheduler/pkg/klcpermit/permit.go b/scheduler/pkg/klcpermit/permit.go index 81300b27d0..c6b1a7b1d8 100644 --- a/scheduler/pkg/klcpermit/permit.go +++ b/scheduler/pkg/klcpermit/permit.go @@ -31,16 +31,16 @@ func (pl *Permit) Name() string { func (pl *Permit) Permit(ctx context.Context, state *framework.CycleState, p *v1.Pod, nodeName string) (*framework.Status, time.Duration) { - klog.Infof("[Keptn Permit Plugin] waiting for pre-deployment checks on %s", p.GetObjectMeta().GetName(), p.GetObjectMeta().GetNamespace()) + klog.Infof("[Keptn Permit Plugin] waiting for pre-deployment checks on %s in namespace %s", p.GetObjectMeta().GetName(), p.GetObjectMeta().GetNamespace()) // check the permit immediately, to fail early in case the pod cannot be queued switch pl.workloadManager.Permit(ctx, p) { case Success: - klog.Infof("[Keptn Permit Plugin] passed pre-deployment checks on %s", p.GetObjectMeta().GetName(), p.GetObjectMeta().GetNamespace()) + klog.Infof("[Keptn Permit Plugin] passed pre-deployment checks on %s in namespace %s", p.GetObjectMeta().GetName(), p.GetObjectMeta().GetNamespace()) return framework.NewStatus(framework.Success), 0 * time.Second default: - klog.Infof("[Keptn Permit Plugin] waiting for pre-deployment checks on %s to succeed", p.GetObjectMeta().GetName(), p.GetObjectMeta().GetNamespace()) + klog.Infof("[Keptn Permit Plugin] waiting for pre-deployment checks on %s in namespace %s to succeed", p.GetObjectMeta().GetName(), p.GetObjectMeta().GetNamespace()) go func() { // create a new context since we are in a new goroutine ctx2, cancel := context.WithCancel(context.Background()) diff --git a/scheduler/pkg/klcpermit/workflow_manager.go b/scheduler/pkg/klcpermit/workflow_manager.go index 64a83a62af..1b15c1d6a8 100644 --- a/scheduler/pkg/klcpermit/workflow_manager.go +++ b/scheduler/pkg/klcpermit/workflow_manager.go @@ -76,7 +76,7 @@ func (sMgr *WorkloadManager) Permit(ctx context.Context, pod *corev1.Pod) Status crd, err := sMgr.GetCRD(ctx, pod.Namespace, name) if err != nil { - klog.Infof("[Keptn Permit Plugin] could not find workloadVersion crd %s, err:%s", name, err.Error(), pod.GetObjectMeta().GetName(), pod.GetObjectMeta().GetNamespace()) + klog.Infof("[Keptn Permit Plugin] could not find workloadVersion crd %s in namespace %s, err:%s", name, pod.GetObjectMeta().GetNamespace(), err.Error()) return WorkloadVersionNotFound }