diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml index 0651ec3081..53a005bf80 100644 --- a/.github/scripts/.helm-tests/default/result.yaml +++ b/.github/scripts/.helm-tests/default/result.yaml @@ -8956,6 +8956,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/.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..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,6 +1397,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/.github/scripts/.helm-tests/metrics-only/result.yaml b/.github/scripts/.helm-tests/metrics-only/result.yaml index 7b1f5d7216..b10f54ab51 100644 --- a/.github/scripts/.helm-tests/metrics-only/result.yaml +++ b/.github/scripts/.helm-tests/metrics-only/result.yaml @@ -1397,6 +1397,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/.github/scripts/.helm-tests/metrics-with-certs/result.yaml b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml index 138b689477..b6043cdeb5 100644 --- a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml +++ b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml @@ -1412,6 +1412,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/api/v1beta1/keptnmetric_types.go b/metrics-operator/api/v1beta1/keptnmetric_types.go index 8ab284b967..4662878d2a 100644 --- a/metrics-operator/api/v1beta1/keptnmetric_types.go +++ b/metrics-operator/api/v1beta1/keptnmetric_types.go @@ -98,6 +98,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 5920c22e7e..e073d68e3e 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