From f22ddfc08696721a9a18c8a0cda6e511992e4c62 Mon Sep 17 00:00:00 2001 From: aryansharma9917 Date: Thu, 23 Nov 2023 18:00:33 +0530 Subject: [PATCH 1/7] Added and field Signed-off-by: aryansharma9917 --- metrics-operator/api/v1beta1/keptnmetric_types.go | 2 ++ metrics-operator/chart/templates/keptnmetric-crd.yaml | 6 ++++++ .../config/crd/bases/metrics.keptn.sh_keptnmetrics.yaml | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/metrics-operator/api/v1beta1/keptnmetric_types.go b/metrics-operator/api/v1beta1/keptnmetric_types.go index 8fd9128745..94be5367b1 100644 --- a/metrics-operator/api/v1beta1/keptnmetric_types.go +++ b/metrics-operator/api/v1beta1/keptnmetric_types.go @@ -87,6 +87,8 @@ type IntervalResult struct { // +kubebuilder:printcolumn:name="Query",type=string,JSONPath=`.spec.query` // +kubebuilder:printcolumn:name="Interval",type=string,JSONPath=`.spec.range.interval` // +kubebuilder:printcolumn:name="Value",type=string,JSONPath=`.status.value` +// +kubebuilder:printcolumn:name="Step",type=string,JSONPath=`.spec.range.step` +// +kubebuilder:printcolumn:name="Aggregation",type=string,JSONPath=`.spec.range.aggregation` // +kubebuilder:storageversion // KeptnMetric is the Schema for the keptnmetrics API diff --git a/metrics-operator/chart/templates/keptnmetric-crd.yaml b/metrics-operator/chart/templates/keptnmetric-crd.yaml index 90d7856073..7c77a3e880 100644 --- a/metrics-operator/chart/templates/keptnmetric-crd.yaml +++ b/metrics-operator/chart/templates/keptnmetric-crd.yaml @@ -182,6 +182,12 @@ spec: - jsonPath: .spec.range.interval name: Interval type: string + - jsonPath: .spec.range.step + name: Step + type: string + - jsonPath: .spec.range.aggregation + name: Aggregation + type: string - jsonPath: .status.value name: Value type: string diff --git a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetrics.yaml b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetrics.yaml index 47eb1a8f7d..96ff478e92 100644 --- a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetrics.yaml +++ b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetrics.yaml @@ -176,6 +176,12 @@ spec: - jsonPath: .spec.range.interval name: Interval type: string + - jsonPath: .spec.range.step + name: Step + type: string + - jsonPath: .spec.range.aggregation + name: Aggregation + type: string - jsonPath: .status.value name: Value type: string From a6243d23f7882129bb0ee0bd6c5fbd381ba182f2 Mon Sep 17 00:00:00 2001 From: aryansharma9917 Date: Fri, 1 Dec 2023 17:48:24 +0530 Subject: [PATCH 2/7] Done some modifications Signed-off-by: aryansharma9917 --- .github/scripts/.helm-tests/default/result.yaml | 6 ++++++ .github/scripts/.helm-tests/metrics-only/result.yaml | 6 ++++++ .github/scripts/.helm-tests/metrics-with-certs/result.yaml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml index c36c9f0be9..b187f20d2f 100644 --- a/.github/scripts/.helm-tests/default/result.yaml +++ b/.github/scripts/.helm-tests/default/result.yaml @@ -7037,6 +7037,12 @@ spec: - jsonPath: .status.value name: Value type: string + - jsonPath: .spec.range.step + name: Step + type: string + - jsonPath: .spec.range.aggregation + name: Aggregation + type: string name: v1alpha3 schema: openAPIV3Schema: diff --git a/.github/scripts/.helm-tests/metrics-only/result.yaml b/.github/scripts/.helm-tests/metrics-only/result.yaml index caa6d6d0fa..768a811980 100644 --- a/.github/scripts/.helm-tests/metrics-only/result.yaml +++ b/.github/scripts/.helm-tests/metrics-only/result.yaml @@ -1400,6 +1400,12 @@ spec: - jsonPath: .status.value name: Value type: string + - jsonPath: .spec.range.step + name: Step + type: string + - jsonPath: .spec.range.aggregation + name: Aggregation + type: string name: v1alpha3 schema: openAPIV3Schema: diff --git a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml index 6842b9f4bb..f7b53d50a8 100644 --- a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml +++ b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml @@ -1415,6 +1415,12 @@ spec: - jsonPath: .status.value name: Value type: string + - jsonPath: .spec.range.step + name: Step + type: string + - jsonPath: .spec.range.aggregation + name: Aggregation + type: string name: v1alpha3 schema: openAPIV3Schema: From ab0d791312df993b878befb65d60641726c67ef1 Mon Sep 17 00:00:00 2001 From: Aryan Sharma Date: Tue, 5 Dec 2023 01:36:54 +0530 Subject: [PATCH 3/7] Update .github/scripts/.helm-tests/default/result.yaml Co-authored-by: Florian Bacher Signed-off-by: Aryan Sharma --- .github/scripts/.helm-tests/default/result.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml index b187f20d2f..78285ac86c 100644 --- a/.github/scripts/.helm-tests/default/result.yaml +++ b/.github/scripts/.helm-tests/default/result.yaml @@ -7034,15 +7034,15 @@ spec: - jsonPath: .spec.range.interval name: Interval type: string - - jsonPath: .status.value - name: Value - type: string - jsonPath: .spec.range.step name: Step type: string - jsonPath: .spec.range.aggregation name: Aggregation type: string + - jsonPath: .status.value + name: Value + type: string name: v1alpha3 schema: openAPIV3Schema: From 1a685ad849c3eedf56bf7db6549e09dc87d74a5c Mon Sep 17 00:00:00 2001 From: Aryan Sharma Date: Thu, 7 Dec 2023 00:15:35 +0530 Subject: [PATCH 4/7] Update .github/scripts/.helm-tests/metrics-with-certs/result.yaml Co-authored-by: Florian Bacher Signed-off-by: Aryan Sharma --- .github/scripts/.helm-tests/metrics-with-certs/result.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml index f7b53d50a8..fccb936048 100644 --- a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml +++ b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml @@ -1412,15 +1412,15 @@ spec: - jsonPath: .spec.range.interval name: Interval type: string - - jsonPath: .status.value - name: Value - type: string - jsonPath: .spec.range.step name: Step type: string - jsonPath: .spec.range.aggregation name: Aggregation type: string + - jsonPath: .status.value + name: Value + type: string name: v1alpha3 schema: openAPIV3Schema: From e64e1533bef8bea518dacd2ccd3a5ffbd92b1a8e Mon Sep 17 00:00:00 2001 From: Aryan Sharma Date: Thu, 7 Dec 2023 00:15:54 +0530 Subject: [PATCH 5/7] Update .github/scripts/.helm-tests/metrics-only/result.yaml Co-authored-by: Florian Bacher Signed-off-by: Aryan Sharma --- .github/scripts/.helm-tests/metrics-only/result.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/.helm-tests/metrics-only/result.yaml b/.github/scripts/.helm-tests/metrics-only/result.yaml index 768a811980..3a915cee59 100644 --- a/.github/scripts/.helm-tests/metrics-only/result.yaml +++ b/.github/scripts/.helm-tests/metrics-only/result.yaml @@ -1397,15 +1397,15 @@ spec: - jsonPath: .spec.range.interval name: Interval type: string - - jsonPath: .status.value - name: Value - type: string - jsonPath: .spec.range.step name: Step type: string - jsonPath: .spec.range.aggregation name: Aggregation type: string + - jsonPath: .status.value + name: Value + type: string name: v1alpha3 schema: openAPIV3Schema: From 18c54347cc3ec67c67908bf579731137f7aca925 Mon Sep 17 00:00:00 2001 From: Aryan Sharma Date: Sat, 9 Dec 2023 00:13:01 +0530 Subject: [PATCH 6/7] Update result.yaml Signed-off-by: Aryan Sharma --- .../metrics-only-with-apiservice-disabled/result.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml b/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml index f63e003beb..af220f8ffa 100644 --- a/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml +++ b/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml @@ -1400,6 +1400,12 @@ spec: - jsonPath: .status.value name: Value type: string + - jsonPath: .spec.range.step + name: Step + type: string + - jsonPath: .spec.range.aggregation + name: Aggregation + type: string name: v1alpha3 schema: openAPIV3Schema: From d24265a21a78989a6cbcd8cc85205bce8048f99b Mon Sep 17 00:00:00 2001 From: odubajDT Date: Wed, 17 Jan 2024 10:10:13 +0100 Subject: [PATCH 7/7] fix failing test Signed-off-by: odubajDT --- .../metrics-only-with-apiservice-disabled/result.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml b/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml index af220f8ffa..5b0d8e415d 100644 --- a/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml +++ b/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml @@ -1397,15 +1397,15 @@ spec: - jsonPath: .spec.range.interval name: Interval type: string - - jsonPath: .status.value - name: Value - type: string - jsonPath: .spec.range.step name: Step type: string - jsonPath: .spec.range.aggregation name: Aggregation type: string + - jsonPath: .status.value + name: Value + type: string name: v1alpha3 schema: openAPIV3Schema: