diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml index d294b67a57..f934d6c50b 100644 --- a/.github/scripts/.helm-tests/default/result.yaml +++ b/.github/scripts/.helm-tests/default/result.yaml @@ -8244,7 +8244,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -8572,7 +8572,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -8933,7 +8933,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha3 @@ -9603,7 +9603,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -9690,7 +9690,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -9812,7 +9812,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -10015,7 +10015,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -10525,7 +10525,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -10620,7 +10620,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha2 @@ -10813,7 +10813,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -12706,14 +12706,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-keptnmetric + path: /validate-metrics-keptn-sh-v1-keptnmetric failurePolicy: Fail name: vkeptnmetric.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -12726,14 +12726,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-analysis + path: /validate-metrics-keptn-sh-v1-analysis failurePolicy: Fail name: vanalysis.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -12746,14 +12746,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-analysisdefinition + path: /validate-metrics-keptn-sh-v1-analysisdefinition failurePolicy: Fail name: vanalysisdefinition.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE diff --git a/.github/scripts/.helm-tests/local-global-precedence/result.yaml b/.github/scripts/.helm-tests/local-global-precedence/result.yaml index cd6d101dd4..7fe8c4400f 100644 --- a/.github/scripts/.helm-tests/local-global-precedence/result.yaml +++ b/.github/scripts/.helm-tests/local-global-precedence/result.yaml @@ -8356,7 +8356,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -8684,7 +8684,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -9051,7 +9051,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha3 @@ -9721,7 +9721,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -9814,7 +9814,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -9936,7 +9936,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -10145,7 +10145,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -10655,7 +10655,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -10756,7 +10756,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha2 @@ -10949,7 +10949,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -13070,14 +13070,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-keptnmetric + path: /validate-metrics-keptn-sh-v1-keptnmetric failurePolicy: Fail name: vkeptnmetric.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -13090,14 +13090,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-analysis + path: /validate-metrics-keptn-sh-v1-analysis failurePolicy: Fail name: vanalysis.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -13110,14 +13110,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-analysisdefinition + path: /validate-metrics-keptn-sh-v1-analysisdefinition failurePolicy: Fail name: vanalysisdefinition.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE 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 28e571b65f..7975201d5f 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 @@ -224,7 +224,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -552,7 +552,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -913,7 +913,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha3 @@ -1583,7 +1583,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -1670,7 +1670,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -1792,7 +1792,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -1995,7 +1995,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -2505,7 +2505,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -2600,7 +2600,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha2 @@ -2793,7 +2793,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -3252,14 +3252,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-keptnmetric + path: /validate-metrics-keptn-sh-v1-keptnmetric failurePolicy: Fail name: vkeptnmetric.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -3272,14 +3272,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-analysis + path: /validate-metrics-keptn-sh-v1-analysis failurePolicy: Fail name: vanalysis.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -3292,14 +3292,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-analysisdefinition + path: /validate-metrics-keptn-sh-v1-analysisdefinition failurePolicy: Fail name: vanalysisdefinition.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE diff --git a/.github/scripts/.helm-tests/metrics-only/result.yaml b/.github/scripts/.helm-tests/metrics-only/result.yaml index 2f3e4c081e..b7724e5177 100644 --- a/.github/scripts/.helm-tests/metrics-only/result.yaml +++ b/.github/scripts/.helm-tests/metrics-only/result.yaml @@ -224,7 +224,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -552,7 +552,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -913,7 +913,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha3 @@ -1583,7 +1583,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -1670,7 +1670,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -1792,7 +1792,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -1995,7 +1995,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -2505,7 +2505,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -2600,7 +2600,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha2 @@ -2793,7 +2793,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -3317,14 +3317,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-keptnmetric + path: /validate-metrics-keptn-sh-v1-keptnmetric failurePolicy: Fail name: vkeptnmetric.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -3337,14 +3337,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-analysis + path: /validate-metrics-keptn-sh-v1-analysis failurePolicy: Fail name: vanalysis.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -3357,14 +3357,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-analysisdefinition + path: /validate-metrics-keptn-sh-v1-analysisdefinition failurePolicy: Fail name: vanalysisdefinition.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE diff --git a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml index 84a7da6d5a..5227c7f602 100644 --- a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml +++ b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml @@ -239,7 +239,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -567,7 +567,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -928,7 +928,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha3 @@ -1598,7 +1598,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -1685,7 +1685,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -1807,7 +1807,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -2010,7 +2010,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -2520,7 +2520,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -2615,7 +2615,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha2 @@ -2808,7 +2808,7 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} --- @@ -3573,14 +3573,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-keptnmetric + path: /validate-metrics-keptn-sh-v1-keptnmetric failurePolicy: Fail name: vkeptnmetric.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -3593,14 +3593,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-analysis + path: /validate-metrics-keptn-sh-v1-analysis failurePolicy: Fail name: vanalysis.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -3613,14 +3613,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: 'helmtests' - path: /validate-metrics-keptn-sh-v1beta1-analysisdefinition + path: /validate-metrics-keptn-sh-v1-analysisdefinition failurePolicy: Fail name: vanalysisdefinition.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE diff --git a/.github/scripts/keptnevaluationprovider_migrator.sh b/.github/scripts/keptnevaluationprovider_migrator.sh index 1e5ace4366..a40592b1b9 100755 --- a/.github/scripts/keptnevaluationprovider_migrator.sh +++ b/.github/scripts/keptnevaluationprovider_migrator.sh @@ -41,7 +41,7 @@ do kubectl get keptnevaluationproviders $n -oyaml >> $MANIFESTS_FILE done -sed -i 's#lifecycle\.keptn\.sh/v1alpha2#metrics\.keptn\.sh/v1beta1#g' $MANIFESTS_FILE +sed -i 's#lifecycle\.keptn\.sh/v1alpha2#metrics\.keptn\.sh/v1#g' $MANIFESTS_FILE sed -i 's/KeptnEvaluationProvider/KeptnMetricsProvider/g' $MANIFESTS_FILE echo -e "------------------------------\n" diff --git a/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric.go b/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric.go index 0855dd4018..eb60cccdcd 100644 --- a/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric.go +++ b/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric.go @@ -45,7 +45,7 @@ func (p *KeptnMetricProvider) GetKeptnMetric(ctx context.Context, objective klcv metric := &unstructured.Unstructured{ Object: map[string]interface{}{ "kind": "KeptnMetric", - "apiVersion": "metrics.keptn.sh/v1beta1", + "apiVersion": "metrics.keptn.sh/v1", }, } diff --git a/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric_test.go b/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric_test.go index 24f7a802c5..7a4b6b1121 100644 --- a/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric_test.go +++ b/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric_test.go @@ -7,7 +7,7 @@ import ( klcv1beta1 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1beta1" "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/config" "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/testcommon" - metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/lifecycle-operator/controllers/lifecycle/keptnevaluation/controller_test.go b/lifecycle-operator/controllers/lifecycle/keptnevaluation/controller_test.go index 2d58f06b8e..ba0b74ba15 100644 --- a/lifecycle-operator/controllers/lifecycle/keptnevaluation/controller_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptnevaluation/controller_test.go @@ -11,7 +11,7 @@ import ( "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/config" "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/eventsender" "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/telemetry" - metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/sdk/metric" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/lifecycle-operator/test/api/metrics/v1beta1/groupversion_info.go b/lifecycle-operator/test/api/metrics/v1/groupversion_info.go similarity index 90% rename from lifecycle-operator/test/api/metrics/v1beta1/groupversion_info.go rename to lifecycle-operator/test/api/metrics/v1/groupversion_info.go index 45a142ffb5..7e4c9748bd 100644 --- a/lifecycle-operator/test/api/metrics/v1beta1/groupversion_info.go +++ b/lifecycle-operator/test/api/metrics/v1/groupversion_info.go @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package v1beta1 contains API Schema definitions for the metrics v1beta1 API group +// Package v1 contains API Schema definitions for the metrics v1 API group // +kubebuilder:object:generate=true // +groupName=metrics.keptn.sh -package v1beta1 +package v1 import ( "k8s.io/apimachinery/pkg/runtime/schema" @@ -26,7 +26,7 @@ import ( var ( // GroupVersion is group version used to register these objects - GroupVersion = schema.GroupVersion{Group: "metrics.keptn.sh", Version: "v1beta1"} + GroupVersion = schema.GroupVersion{Group: "metrics.keptn.sh", Version: "v1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/lifecycle-operator/test/api/metrics/v1beta1/keptnmetric_types.go b/lifecycle-operator/test/api/metrics/v1/keptnmetric_types.go similarity index 99% rename from lifecycle-operator/test/api/metrics/v1beta1/keptnmetric_types.go rename to lifecycle-operator/test/api/metrics/v1/keptnmetric_types.go index fb96f59a78..3572268f2e 100644 --- a/lifecycle-operator/test/api/metrics/v1beta1/keptnmetric_types.go +++ b/lifecycle-operator/test/api/metrics/v1/keptnmetric_types.go @@ -1,4 +1,4 @@ -package v1beta1 +package v1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/lifecycle-operator/test/api/metrics/v1beta1/zz_generated.deepcopy.go b/lifecycle-operator/test/api/metrics/v1/zz_generated.deepcopy.go similarity index 99% rename from lifecycle-operator/test/api/metrics/v1beta1/zz_generated.deepcopy.go rename to lifecycle-operator/test/api/metrics/v1/zz_generated.deepcopy.go index 1855074782..14e14bcc6d 100644 --- a/lifecycle-operator/test/api/metrics/v1beta1/zz_generated.deepcopy.go +++ b/lifecycle-operator/test/api/metrics/v1/zz_generated.deepcopy.go @@ -18,7 +18,7 @@ limitations under the License. // Code generated by controller-gen. DO NOT EDIT. -package v1beta1 +package v1 import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/lifecycle-operator/test/component/common/common.go b/lifecycle-operator/test/component/common/common.go index a830b4ac71..96e17e4d30 100644 --- a/lifecycle-operator/test/component/common/common.go +++ b/lifecycle-operator/test/component/common/common.go @@ -11,7 +11,7 @@ import ( klcv1beta1 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1beta1" apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1beta1/common" "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/telemetry" - metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1" . "github.com/onsi/ginkgo/v2" ginkgotypes "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" diff --git a/lifecycle-operator/test/component/evaluation/evaluation_test.go b/lifecycle-operator/test/component/evaluation/evaluation_test.go index aa645a5f93..73eecdb2a6 100644 --- a/lifecycle-operator/test/component/evaluation/evaluation_test.go +++ b/lifecycle-operator/test/component/evaluation/evaluation_test.go @@ -7,7 +7,7 @@ import ( klcv1beta1 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1beta1" apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1beta1/common" - metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1" "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/metrics-operator/api/v1/analysis_types.go b/metrics-operator/api/v1/analysis_types.go index 003a24ff21..a5b1d6378c 100644 --- a/metrics-operator/api/v1/analysis_types.go +++ b/metrics-operator/api/v1/analysis_types.go @@ -93,6 +93,7 @@ type AnalysisStatus struct { //+kubebuilder:printcolumn:name="State",type=string,JSONPath=`.status.state` //+kubebuilder:printcolumn:name="Warning",type=string,JSONPath=`.status.warning` //+kubebuilder:printcolumn:name="Pass",type=string,JSONPath=`.status.pass` +//+kubebuilder:storageversion // Analysis is the Schema for the analyses API type Analysis struct { diff --git a/metrics-operator/api/v1beta1/analysis_webhook.go b/metrics-operator/api/v1/analysis_webhook.go similarity index 92% rename from metrics-operator/api/v1beta1/analysis_webhook.go rename to metrics-operator/api/v1/analysis_webhook.go index 82488f1be5..9dec44d97a 100644 --- a/metrics-operator/api/v1beta1/analysis_webhook.go +++ b/metrics-operator/api/v1/analysis_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package v1 import ( "github.com/pkg/errors" @@ -35,7 +35,7 @@ func (a *Analysis) SetupWebhookWithManager(mgr ctrl.Manager) error { Complete() } -//+kubebuilder:webhook:path=/validate-metrics-keptn-sh-v1beta1-analysis,mutating=false,failurePolicy=fail,sideEffects=None,groups=metrics.keptn.sh,resources=analyses,verbs=create;update,versions=v1beta1,name=analysis.kb.io,admissionReviewVersions=v1 +//+kubebuilder:webhook:path=/validate-metrics-keptn-sh-v1-analysis,mutating=false,failurePolicy=fail,sideEffects=None,groups=metrics.keptn.sh,resources=analyses,verbs=create;update,versions=v1,name=analysis.kb.io,admissionReviewVersions=v1 var _ webhook.Validator = &Analysis{} diff --git a/metrics-operator/api/v1beta1/analysis_webhook_test.go b/metrics-operator/api/v1/analysis_webhook_test.go similarity index 99% rename from metrics-operator/api/v1beta1/analysis_webhook_test.go rename to metrics-operator/api/v1/analysis_webhook_test.go index c62f90eea8..48eab68adc 100644 --- a/metrics-operator/api/v1beta1/analysis_webhook_test.go +++ b/metrics-operator/api/v1/analysis_webhook_test.go @@ -1,4 +1,4 @@ -package v1beta1 +package v1 import ( "testing" diff --git a/metrics-operator/api/v1/analysisdefinition_types.go b/metrics-operator/api/v1/analysisdefinition_types.go index 9650a46b21..5765edae01 100644 --- a/metrics-operator/api/v1/analysisdefinition_types.go +++ b/metrics-operator/api/v1/analysisdefinition_types.go @@ -110,6 +110,7 @@ type Operator struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status +//+kubebuilder:storageversion // AnalysisDefinition is the Schema for the analysisdefinitions APIs type AnalysisDefinition struct { diff --git a/metrics-operator/api/v1beta1/analysisdefinition_webhook.go b/metrics-operator/api/v1/analysisdefinition_webhook.go similarity index 90% rename from metrics-operator/api/v1beta1/analysisdefinition_webhook.go rename to metrics-operator/api/v1/analysisdefinition_webhook.go index 9e5700a43c..78d49d29b4 100644 --- a/metrics-operator/api/v1beta1/analysisdefinition_webhook.go +++ b/metrics-operator/api/v1/analysisdefinition_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package v1 import ( "fmt" @@ -35,7 +35,7 @@ func (r *AnalysisDefinition) SetupWebhookWithManager(mgr ctrl.Manager) error { Complete() } -//+kubebuilder:webhook:path=/validate-metrics-keptn-sh-v1beta1-analysisdefinition,mutating=false,failurePolicy=fail,sideEffects=None,groups=metrics.keptn.sh,resources=analysisdefinitions,verbs=create;update,versions=v1beta1,name=analysisdefinition.kb.io,admissionReviewVersions=v1 +//+kubebuilder:webhook:path=/validate-metrics-keptn-sh-v1-analysisdefinition,mutating=false,failurePolicy=fail,sideEffects=None,groups=metrics.keptn.sh,resources=analysisdefinitions,verbs=create;update,versions=v1,name=analysisdefinition.kb.io,admissionReviewVersions=v1 var _ webhook.Validator = &AnalysisDefinition{} @@ -74,7 +74,7 @@ func (r *AnalysisDefinition) ValidateDelete() (admission.Warnings, error) { func (s *TotalScore) validate() error { if s.WarningPercentage >= s.PassPercentage { - return fmt.Errorf("Warn percentage score cannot be higher or equal than Pass percentage score") + return fmt.Errorf("warn percentage score cannot be higher or equal than Pass percentage score") } return nil } diff --git a/metrics-operator/api/v1beta1/analysisdefinition_webhook_test.go b/metrics-operator/api/v1/analysisdefinition_webhook_test.go similarity index 97% rename from metrics-operator/api/v1beta1/analysisdefinition_webhook_test.go rename to metrics-operator/api/v1/analysisdefinition_webhook_test.go index dfac02def2..4cf071d307 100644 --- a/metrics-operator/api/v1beta1/analysisdefinition_webhook_test.go +++ b/metrics-operator/api/v1/analysisdefinition_webhook_test.go @@ -1,4 +1,4 @@ -package v1beta1 +package v1 import ( "fmt" @@ -132,7 +132,7 @@ func TestScore_validate(t *testing.T) { PassPercentage: 90, WarningPercentage: 90, }, - wantErr: fmt.Errorf("Warn percentage score cannot be higher or equal than Pass percentage score"), + wantErr: fmt.Errorf("warn percentage score cannot be higher or equal than Pass percentage score"), }, { name: "warn higher than pass", @@ -140,7 +140,7 @@ func TestScore_validate(t *testing.T) { PassPercentage: 90, WarningPercentage: 95, }, - wantErr: fmt.Errorf("Warn percentage score cannot be higher or equal than Pass percentage score"), + wantErr: fmt.Errorf("warn percentage score cannot be higher or equal than Pass percentage score"), }, } @@ -257,7 +257,7 @@ func TestAnalysisDefinition_validateCreateUpdate(t *testing.T) { }, }, }, - wantErr: fmt.Errorf("Warn percentage score cannot be higher or equal than Pass percentage score"), + wantErr: fmt.Errorf("warn percentage score cannot be higher or equal than Pass percentage score"), }, { name: "happy path", diff --git a/metrics-operator/api/v1/analysisvaluetemplate_types.go b/metrics-operator/api/v1/analysisvaluetemplate_types.go index 31e6899891..3f7fc23ce3 100644 --- a/metrics-operator/api/v1/analysisvaluetemplate_types.go +++ b/metrics-operator/api/v1/analysisvaluetemplate_types.go @@ -32,6 +32,7 @@ type AnalysisValueTemplateSpec struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status //+kubebuilder:printcolumn:name="Provider",type=string,JSONPath=`.spec.provider.name` +//+kubebuilder:storageversion // AnalysisValueTemplate is the Schema for the analysisvaluetemplates API type AnalysisValueTemplate struct { diff --git a/metrics-operator/api/v1/keptnmetric_types.go b/metrics-operator/api/v1/keptnmetric_types.go index a2779a1a2b..e4804473e4 100644 --- a/metrics-operator/api/v1/keptnmetric_types.go +++ b/metrics-operator/api/v1/keptnmetric_types.go @@ -97,6 +97,7 @@ type IntervalResult struct { // +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 type KeptnMetric struct { diff --git a/metrics-operator/api/v1beta1/keptnmetric_webhook.go b/metrics-operator/api/v1/keptnmetric_webhook.go similarity index 93% rename from metrics-operator/api/v1beta1/keptnmetric_webhook.go rename to metrics-operator/api/v1/keptnmetric_webhook.go index 48e0e2066e..5ec0dc4899 100644 --- a/metrics-operator/api/v1beta1/keptnmetric_webhook.go +++ b/metrics-operator/api/v1/keptnmetric_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package v1 import ( "time" @@ -39,7 +39,7 @@ func (r *KeptnMetric) SetupWebhookWithManager(mgr ctrl.Manager) error { Complete() } -//+kubebuilder:webhook:path=/validate-metrics-keptn-sh-v1beta1-keptnmetric,mutating=false,failurePolicy=fail,sideEffects=None,groups=metrics.keptn.sh,resources=keptnmetrics,verbs=create;update,versions=v1beta1,name=vkeptnmetric.kb.io,admissionReviewVersions=v1 +//+kubebuilder:webhook:path=/validate-metrics-keptn-sh-v1-keptnmetric,mutating=false,failurePolicy=fail,sideEffects=None,groups=metrics.keptn.sh,resources=keptnmetrics,verbs=create;update,versions=v1,name=vkeptnmetric.kb.io,admissionReviewVersions=v1 var _ webhook.Validator = &KeptnMetric{} diff --git a/metrics-operator/api/v1beta1/keptnmetric_webhook_test.go b/metrics-operator/api/v1/keptnmetric_webhook_test.go similarity index 99% rename from metrics-operator/api/v1beta1/keptnmetric_webhook_test.go rename to metrics-operator/api/v1/keptnmetric_webhook_test.go index 247173789d..f6d6a0fd97 100644 --- a/metrics-operator/api/v1beta1/keptnmetric_webhook_test.go +++ b/metrics-operator/api/v1/keptnmetric_webhook_test.go @@ -1,4 +1,4 @@ -package v1beta1 +package v1 import ( "testing" diff --git a/metrics-operator/api/v1/keptnmetricsprovider_types.go b/metrics-operator/api/v1/keptnmetricsprovider_types.go index c9492f7790..89550b913b 100644 --- a/metrics-operator/api/v1/keptnmetricsprovider_types.go +++ b/metrics-operator/api/v1/keptnmetricsprovider_types.go @@ -40,6 +40,7 @@ type KeptnMetricsProviderSpec struct { // +kubebuilder:object:root=true // +kubebuilder:subresource:status // +kubebuilder:resource:path=keptnmetricsproviders,shortName=kmp +// +kubebuilder:storageversion // KeptnMetricsProvider is the Schema for the keptnmetricsproviders API type KeptnMetricsProvider struct { diff --git a/metrics-operator/api/v1/zz_generated.deepcopy.go b/metrics-operator/api/v1/zz_generated.deepcopy.go index e3a764af51..fed7797c0a 100644 --- a/metrics-operator/api/v1/zz_generated.deepcopy.go +++ b/metrics-operator/api/v1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1 import ( - runtime "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/metrics-operator/api/v1beta1/analysis_types.go b/metrics-operator/api/v1beta1/analysis_types.go index 47ff159d6f..54186dee19 100644 --- a/metrics-operator/api/v1beta1/analysis_types.go +++ b/metrics-operator/api/v1beta1/analysis_types.go @@ -93,7 +93,6 @@ type AnalysisStatus struct { //+kubebuilder:printcolumn:name="State",type=string,JSONPath=`.status.state` //+kubebuilder:printcolumn:name="Warning",type=string,JSONPath=`.status.warning` //+kubebuilder:printcolumn:name="Pass",type=string,JSONPath=`.status.pass` -//+kubebuilder:storageversion // Analysis is the Schema for the analyses API type Analysis struct { diff --git a/metrics-operator/api/v1beta1/analysisdefinition_types.go b/metrics-operator/api/v1beta1/analysisdefinition_types.go index d9ef244202..90be30d000 100644 --- a/metrics-operator/api/v1beta1/analysisdefinition_types.go +++ b/metrics-operator/api/v1beta1/analysisdefinition_types.go @@ -110,7 +110,6 @@ type Operator struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status -//+kubebuilder:storageversion // AnalysisDefinition is the Schema for the analysisdefinitions APIs type AnalysisDefinition struct { diff --git a/metrics-operator/api/v1beta1/analysisvaluetemplate_types.go b/metrics-operator/api/v1beta1/analysisvaluetemplate_types.go index 00034e239d..3392726b7e 100644 --- a/metrics-operator/api/v1beta1/analysisvaluetemplate_types.go +++ b/metrics-operator/api/v1beta1/analysisvaluetemplate_types.go @@ -32,7 +32,6 @@ type AnalysisValueTemplateSpec struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status //+kubebuilder:printcolumn:name="Provider",type=string,JSONPath=`.spec.provider.name` -//+kubebuilder:storageversion // AnalysisValueTemplate is the Schema for the analysisvaluetemplates API type AnalysisValueTemplate struct { diff --git a/metrics-operator/api/v1beta1/keptnmetric_types.go b/metrics-operator/api/v1beta1/keptnmetric_types.go index 4662878d2a..cc4c5567dd 100644 --- a/metrics-operator/api/v1beta1/keptnmetric_types.go +++ b/metrics-operator/api/v1beta1/keptnmetric_types.go @@ -100,7 +100,6 @@ type IntervalResult struct { // +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 type KeptnMetric struct { diff --git a/metrics-operator/api/v1beta1/keptnmetricsprovider_types.go b/metrics-operator/api/v1beta1/keptnmetricsprovider_types.go index 00c80b0bad..c0c7f34127 100644 --- a/metrics-operator/api/v1beta1/keptnmetricsprovider_types.go +++ b/metrics-operator/api/v1beta1/keptnmetricsprovider_types.go @@ -40,7 +40,6 @@ type KeptnMetricsProviderSpec struct { // +kubebuilder:object:root=true // +kubebuilder:subresource:status // +kubebuilder:resource:path=keptnmetricsproviders,shortName=kmp -// +kubebuilder:storageversion // KeptnMetricsProvider is the Schema for the keptnmetricsproviders API type KeptnMetricsProvider struct { diff --git a/metrics-operator/api/v1beta1/zz_generated.deepcopy.go b/metrics-operator/api/v1beta1/zz_generated.deepcopy.go index 1ef444c2c9..b8d425588b 100644 --- a/metrics-operator/api/v1beta1/zz_generated.deepcopy.go +++ b/metrics-operator/api/v1beta1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/apimachinery/pkg/runtime" + runtime "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/metrics-operator/chart/templates/analysis-crd.yaml b/metrics-operator/chart/templates/analysis-crd.yaml index 93bd9524b4..7fd0b7da8a 100644 --- a/metrics-operator/chart/templates/analysis-crd.yaml +++ b/metrics-operator/chart/templates/analysis-crd.yaml @@ -183,7 +183,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -511,6 +511,6 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} diff --git a/metrics-operator/chart/templates/analysisdefinition-crd.yaml b/metrics-operator/chart/templates/analysisdefinition-crd.yaml index db13005e59..7117a9f30c 100644 --- a/metrics-operator/chart/templates/analysisdefinition-crd.yaml +++ b/metrics-operator/chart/templates/analysisdefinition-crd.yaml @@ -354,7 +354,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha3 @@ -1024,6 +1024,6 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} diff --git a/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml b/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml index e3791f4440..41d47fa463 100644 --- a/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml +++ b/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml @@ -80,7 +80,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -202,6 +202,6 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} diff --git a/metrics-operator/chart/templates/keptnmetric-crd.yaml b/metrics-operator/chart/templates/keptnmetric-crd.yaml index a9ef696879..6dcd6a3a36 100644 --- a/metrics-operator/chart/templates/keptnmetric-crd.yaml +++ b/metrics-operator/chart/templates/keptnmetric-crd.yaml @@ -196,7 +196,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -706,6 +706,6 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} diff --git a/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml b/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml index d756261e25..ff69b2ffb6 100644 --- a/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml +++ b/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml @@ -88,7 +88,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha2 @@ -281,6 +281,6 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} diff --git a/metrics-operator/chart/templates/metrics-validating-webhook-configuration.yaml b/metrics-operator/chart/templates/metrics-validating-webhook-configuration.yaml index 3cebb018c4..66d1944a45 100644 --- a/metrics-operator/chart/templates/metrics-validating-webhook-configuration.yaml +++ b/metrics-operator/chart/templates/metrics-validating-webhook-configuration.yaml @@ -23,14 +23,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: '{{ .Release.Namespace }}' - path: /validate-metrics-keptn-sh-v1beta1-keptnmetric + path: /validate-metrics-keptn-sh-v1-keptnmetric failurePolicy: Fail name: vkeptnmetric.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -43,14 +43,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: '{{ .Release.Namespace }}' - path: /validate-metrics-keptn-sh-v1beta1-analysis + path: /validate-metrics-keptn-sh-v1-analysis failurePolicy: Fail name: vanalysis.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -63,14 +63,14 @@ webhooks: service: name: 'metrics-webhook-service' namespace: '{{ .Release.Namespace }}' - path: /validate-metrics-keptn-sh-v1beta1-analysisdefinition + path: /validate-metrics-keptn-sh-v1-analysisdefinition failurePolicy: Fail name: vanalysisdefinition.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE diff --git a/metrics-operator/cmd/metrics/adapter/provider/provider.go b/metrics-operator/cmd/metrics/adapter/provider/provider.go index be4bcbf6bd..5648e85bd4 100644 --- a/metrics-operator/cmd/metrics/adapter/provider/provider.go +++ b/metrics-operator/cmd/metrics/adapter/provider/provider.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/custom-metrics-apiserver/pkg/provider" ) -var keptnMetricGroupVersionResource = schema.GroupVersionResource{Group: "metrics.keptn.sh", Version: "v1beta1", Resource: "keptnmetrics"} +var keptnMetricGroupVersionResource = schema.GroupVersionResource{Group: "metrics.keptn.sh", Version: "v1", Resource: "keptnmetrics"} var providerInstance *keptnMetricsProvider diff --git a/metrics-operator/cmd/metrics/adapter/provider/provider_test.go b/metrics-operator/cmd/metrics/adapter/provider/provider_test.go index 06b1c1feec..5f8c79b152 100644 --- a/metrics-operator/cmd/metrics/adapter/provider/provider_test.go +++ b/metrics-operator/cmd/metrics/adapter/provider/provider_test.go @@ -124,7 +124,7 @@ func TestProvider(t *testing.T) { func getSampleKeptnMetric(metricName string, labels map[string]interface{}) map[string]interface{} { return map[string]interface{}{ - "apiVersion": "metrics.keptn.sh/v1beta1", + "apiVersion": "metrics.keptn.sh/v1", "kind": "KeptnMetric", "metadata": map[string]interface{}{ "name": metricName, diff --git a/metrics-operator/config/crd/bases/metrics.keptn.sh_analyses.yaml b/metrics-operator/config/crd/bases/metrics.keptn.sh_analyses.yaml index 4977fc22f1..7030ae3798 100644 --- a/metrics-operator/config/crd/bases/metrics.keptn.sh_analyses.yaml +++ b/metrics-operator/config/crd/bases/metrics.keptn.sh_analyses.yaml @@ -175,7 +175,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -503,6 +503,6 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} diff --git a/metrics-operator/config/crd/bases/metrics.keptn.sh_analysisdefinitions.yaml b/metrics-operator/config/crd/bases/metrics.keptn.sh_analysisdefinitions.yaml index f3b3a2eda7..46eec34b99 100644 --- a/metrics-operator/config/crd/bases/metrics.keptn.sh_analysisdefinitions.yaml +++ b/metrics-operator/config/crd/bases/metrics.keptn.sh_analysisdefinitions.yaml @@ -346,7 +346,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha3 @@ -1016,6 +1016,6 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} diff --git a/metrics-operator/config/crd/bases/metrics.keptn.sh_analysisvaluetemplates.yaml b/metrics-operator/config/crd/bases/metrics.keptn.sh_analysisvaluetemplates.yaml index d8d9679bc3..59460bfc6c 100644 --- a/metrics-operator/config/crd/bases/metrics.keptn.sh_analysisvaluetemplates.yaml +++ b/metrics-operator/config/crd/bases/metrics.keptn.sh_analysisvaluetemplates.yaml @@ -72,7 +72,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -194,6 +194,6 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} 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 1d2b346ff0..fc6ba4cfcb 100644 --- a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetrics.yaml +++ b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetrics.yaml @@ -188,7 +188,7 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} - additionalPrinterColumns: @@ -698,6 +698,6 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} 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 8b1ad3875b..b33fbadabd 100644 --- a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml +++ b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml @@ -80,7 +80,7 @@ spec: type: string type: object served: true - storage: false + storage: true subresources: status: {} - name: v1alpha2 @@ -273,6 +273,6 @@ spec: type: string type: object served: true - storage: true + storage: false subresources: status: {} diff --git a/metrics-operator/config/webhook/manifests.yaml b/metrics-operator/config/webhook/manifests.yaml index a6aeebe423..a8ebcb1165 100644 --- a/metrics-operator/config/webhook/manifests.yaml +++ b/metrics-operator/config/webhook/manifests.yaml @@ -13,14 +13,14 @@ webhooks: service: name: metrics-webhook-service namespace: system - path: /validate-metrics-keptn-sh-v1beta1-keptnmetric + path: /validate-metrics-keptn-sh-v1-keptnmetric failurePolicy: Fail name: vkeptnmetric.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -33,14 +33,14 @@ webhooks: service: name: metrics-webhook-service namespace: system - path: /validate-metrics-keptn-sh-v1beta1-analysisdefinition + path: /validate-metrics-keptn-sh-v1-analysisdefinition failurePolicy: Fail name: vanalysisdefinition.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE @@ -53,14 +53,14 @@ webhooks: service: name: metrics-webhook-service namespace: system - path: /validate-metrics-keptn-sh-v1beta1-analysis + path: /validate-metrics-keptn-sh-v1-analysis failurePolicy: Fail name: vanalysis.kb.io rules: - apiGroups: - metrics.keptn.sh apiVersions: - - v1beta1 + - v1 operations: - CREATE - UPDATE diff --git a/metrics-operator/controllers/analysis/controller.go b/metrics-operator/controllers/analysis/controller.go index a35097bc5a..40fcc84029 100644 --- a/metrics-operator/controllers/analysis/controller.go +++ b/metrics-operator/controllers/analysis/controller.go @@ -23,7 +23,7 @@ import ( "time" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" ctrlcommon "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common" common "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis" evalType "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" diff --git a/metrics-operator/controllers/analysis/controller_test.go b/metrics-operator/controllers/analysis/controller_test.go index 30901379a4..0b92eae188 100644 --- a/metrics-operator/controllers/analysis/controller_test.go +++ b/metrics-operator/controllers/analysis/controller_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-logr/logr" "github.com/go-logr/logr/testr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/analysis/fake" common "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis" fakeEvaluator "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/fake" diff --git a/metrics-operator/controllers/analysis/fake/analysispool_mock.go b/metrics-operator/controllers/analysis/fake/analysispool_mock.go index bbbd96efc2..7f9ff48f27 100644 --- a/metrics-operator/controllers/analysis/fake/analysispool_mock.go +++ b/metrics-operator/controllers/analysis/fake/analysispool_mock.go @@ -5,7 +5,7 @@ package fake import ( "context" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "sync" ) diff --git a/metrics-operator/controllers/analysis/fake/providers_pool_mock.go b/metrics-operator/controllers/analysis/fake/providers_pool_mock.go index cc36e7e2ab..5b6c3a8da6 100644 --- a/metrics-operator/controllers/analysis/fake/providers_pool_mock.go +++ b/metrics-operator/controllers/analysis/fake/providers_pool_mock.go @@ -5,7 +5,7 @@ package fake import ( "context" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "sync" ) diff --git a/metrics-operator/controllers/analysis/objectives_assigner.go b/metrics-operator/controllers/analysis/objectives_assigner.go index 016585a019..6c556efa2f 100644 --- a/metrics-operator/controllers/analysis/objectives_assigner.go +++ b/metrics-operator/controllers/analysis/objectives_assigner.go @@ -1,6 +1,6 @@ package analysis -import metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" +import metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" type ITaskAssigner interface { AssignTasks(tasks []metricsapi.Objective, numWorkers int) [][]metricsapi.Objective diff --git a/metrics-operator/controllers/analysis/objectives_assigner_test.go b/metrics-operator/controllers/analysis/objectives_assigner_test.go index f0dee7931c..2b11bfd9f7 100644 --- a/metrics-operator/controllers/analysis/objectives_assigner_test.go +++ b/metrics-operator/controllers/analysis/objectives_assigner_test.go @@ -3,7 +3,7 @@ package analysis import ( "testing" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/stretchr/testify/require" ) diff --git a/metrics-operator/controllers/analysis/objectives_evaluator.go b/metrics-operator/controllers/analysis/objectives_evaluator.go index a559b8c94e..fe2409b2ab 100644 --- a/metrics-operator/controllers/analysis/objectives_evaluator.go +++ b/metrics-operator/controllers/analysis/objectives_evaluator.go @@ -2,7 +2,7 @@ package analysis import ( "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" metricstypes "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers" "golang.org/x/net/context" diff --git a/metrics-operator/controllers/analysis/objectives_evaluator_test.go b/metrics-operator/controllers/analysis/objectives_evaluator_test.go index 562f034594..856e994e69 100644 --- a/metrics-operator/controllers/analysis/objectives_evaluator_test.go +++ b/metrics-operator/controllers/analysis/objectives_evaluator_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" metricstypes "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/fake" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers" diff --git a/metrics-operator/controllers/analysis/provider_selector.go b/metrics-operator/controllers/analysis/provider_selector.go index 010ad70e60..84efc30ddd 100644 --- a/metrics-operator/controllers/analysis/provider_selector.go +++ b/metrics-operator/controllers/analysis/provider_selector.go @@ -8,7 +8,7 @@ import ( "text/template" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" metricstypes "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers" "k8s.io/apimachinery/pkg/types" diff --git a/metrics-operator/controllers/analysis/provider_selector_test.go b/metrics-operator/controllers/analysis/provider_selector_test.go index bb2d4cc94e..46736eb5cd 100644 --- a/metrics-operator/controllers/analysis/provider_selector_test.go +++ b/metrics-operator/controllers/analysis/provider_selector_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/analysis/fake" metricstypes "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" fake2 "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/fake" diff --git a/metrics-operator/controllers/analysis/worker_pool.go b/metrics-operator/controllers/analysis/worker_pool.go index dafd03e837..bed5c95a9c 100644 --- a/metrics-operator/controllers/analysis/worker_pool.go +++ b/metrics-operator/controllers/analysis/worker_pool.go @@ -4,7 +4,7 @@ import ( "time" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis" metricstypes "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers" diff --git a/metrics-operator/controllers/analysis/worker_pool_test.go b/metrics-operator/controllers/analysis/worker_pool_test.go index a69a615f83..2848233853 100644 --- a/metrics-operator/controllers/analysis/worker_pool_test.go +++ b/metrics-operator/controllers/analysis/worker_pool_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-logr/logr/testr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/stretchr/testify/require" ) diff --git a/metrics-operator/controllers/common/analysis/analysis_evaluator.go b/metrics-operator/controllers/common/analysis/analysis_evaluator.go index 268219d59e..6d5508ce42 100644 --- a/metrics-operator/controllers/common/analysis/analysis_evaluator.go +++ b/metrics-operator/controllers/common/analysis/analysis_evaluator.go @@ -1,7 +1,7 @@ package analysis import ( - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" ) diff --git a/metrics-operator/controllers/common/analysis/analysis_evaluator_test.go b/metrics-operator/controllers/common/analysis/analysis_evaluator_test.go index 6c894a4aa4..645c38514e 100644 --- a/metrics-operator/controllers/common/analysis/analysis_evaluator_test.go +++ b/metrics-operator/controllers/common/analysis/analysis_evaluator_test.go @@ -3,7 +3,7 @@ package analysis import ( "testing" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/fake" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "github.com/stretchr/testify/require" diff --git a/metrics-operator/controllers/common/analysis/fake/analysis_evaluator_mock.go b/metrics-operator/controllers/common/analysis/fake/analysis_evaluator_mock.go index 6827540d38..a49ff4a7a6 100644 --- a/metrics-operator/controllers/common/analysis/fake/analysis_evaluator_mock.go +++ b/metrics-operator/controllers/common/analysis/fake/analysis_evaluator_mock.go @@ -4,7 +4,7 @@ package fake import ( - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "sync" ) diff --git a/metrics-operator/controllers/common/analysis/fake/objective_evaluator_mock.go b/metrics-operator/controllers/common/analysis/fake/objective_evaluator_mock.go index de26cfb68d..84d81171c9 100644 --- a/metrics-operator/controllers/common/analysis/fake/objective_evaluator_mock.go +++ b/metrics-operator/controllers/common/analysis/fake/objective_evaluator_mock.go @@ -4,7 +4,7 @@ package fake import ( - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "sync" ) diff --git a/metrics-operator/controllers/common/analysis/fake/operator_evaluator_mock.go b/metrics-operator/controllers/common/analysis/fake/operator_evaluator_mock.go index 224f2b4486..2301972a35 100644 --- a/metrics-operator/controllers/common/analysis/fake/operator_evaluator_mock.go +++ b/metrics-operator/controllers/common/analysis/fake/operator_evaluator_mock.go @@ -4,7 +4,7 @@ package fake import ( - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "sync" ) diff --git a/metrics-operator/controllers/common/analysis/fake/target_evaluator_mock.go b/metrics-operator/controllers/common/analysis/fake/target_evaluator_mock.go index 675e3ee391..b21056fba1 100644 --- a/metrics-operator/controllers/common/analysis/fake/target_evaluator_mock.go +++ b/metrics-operator/controllers/common/analysis/fake/target_evaluator_mock.go @@ -4,7 +4,7 @@ package fake import ( - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "sync" ) diff --git a/metrics-operator/controllers/common/analysis/interfaces.go b/metrics-operator/controllers/common/analysis/interfaces.go index 8563464e04..f8475cc4db 100644 --- a/metrics-operator/controllers/common/analysis/interfaces.go +++ b/metrics-operator/controllers/common/analysis/interfaces.go @@ -1,7 +1,7 @@ package analysis import ( - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" ) diff --git a/metrics-operator/controllers/common/analysis/objective_evaluator.go b/metrics-operator/controllers/common/analysis/objective_evaluator.go index 6e10df0353..98de7f7e06 100644 --- a/metrics-operator/controllers/common/analysis/objective_evaluator.go +++ b/metrics-operator/controllers/common/analysis/objective_evaluator.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" ) diff --git a/metrics-operator/controllers/common/analysis/objective_evaluator_test.go b/metrics-operator/controllers/common/analysis/objective_evaluator_test.go index 3dded85261..2ff652cbfc 100644 --- a/metrics-operator/controllers/common/analysis/objective_evaluator_test.go +++ b/metrics-operator/controllers/common/analysis/objective_evaluator_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/fake" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "github.com/stretchr/testify/require" diff --git a/metrics-operator/controllers/common/analysis/operator_evaluator.go b/metrics-operator/controllers/common/analysis/operator_evaluator.go index 5fdd8a9bf1..d8caefb6e1 100644 --- a/metrics-operator/controllers/common/analysis/operator_evaluator.go +++ b/metrics-operator/controllers/common/analysis/operator_evaluator.go @@ -1,7 +1,7 @@ package analysis import ( - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" ) diff --git a/metrics-operator/controllers/common/analysis/operator_evaluator_test.go b/metrics-operator/controllers/common/analysis/operator_evaluator_test.go index 5d38474f7d..a76c2f3876 100644 --- a/metrics-operator/controllers/common/analysis/operator_evaluator_test.go +++ b/metrics-operator/controllers/common/analysis/operator_evaluator_test.go @@ -3,7 +3,7 @@ package analysis import ( "testing" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/api/resource" diff --git a/metrics-operator/controllers/common/analysis/target_evaluator.go b/metrics-operator/controllers/common/analysis/target_evaluator.go index 59c02bdf15..29acafccfc 100644 --- a/metrics-operator/controllers/common/analysis/target_evaluator.go +++ b/metrics-operator/controllers/common/analysis/target_evaluator.go @@ -1,7 +1,7 @@ package analysis import ( - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" ) diff --git a/metrics-operator/controllers/common/analysis/target_evaluator_test.go b/metrics-operator/controllers/common/analysis/target_evaluator_test.go index 82b002ea31..991708c8af 100644 --- a/metrics-operator/controllers/common/analysis/target_evaluator_test.go +++ b/metrics-operator/controllers/common/analysis/target_evaluator_test.go @@ -3,7 +3,7 @@ package analysis import ( "testing" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/api/resource" diff --git a/metrics-operator/controllers/common/analysis/types/types.go b/metrics-operator/controllers/common/analysis/types/types.go index f93aabdfa4..77d06e719c 100644 --- a/metrics-operator/controllers/common/analysis/types/types.go +++ b/metrics-operator/controllers/common/analysis/types/types.go @@ -1,7 +1,7 @@ package types import ( - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" ) type ProviderRequest struct { diff --git a/metrics-operator/controllers/common/fake/fakeclient.go b/metrics-operator/controllers/common/fake/fakeclient.go index 83d9644807..3b54dc9b35 100644 --- a/metrics-operator/controllers/common/fake/fakeclient.go +++ b/metrics-operator/controllers/common/fake/fakeclient.go @@ -1,7 +1,7 @@ package fake import ( - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" corev1 "k8s.io/api/core/v1" apiv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" diff --git a/metrics-operator/controllers/common/providers/datadog/common.go b/metrics-operator/controllers/common/providers/datadog/common.go index 6bcaca4a69..dbb5da3a13 100644 --- a/metrics-operator/controllers/common/providers/datadog/common.go +++ b/metrics-operator/controllers/common/providers/datadog/common.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/metrics-operator/controllers/common/providers/datadog/common_test.go b/metrics-operator/controllers/common/providers/datadog/common_test.go index 55885452c0..0601c79220 100644 --- a/metrics-operator/controllers/common/providers/datadog/common_test.go +++ b/metrics-operator/controllers/common/providers/datadog/common_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/fake" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/metrics-operator/controllers/common/providers/datadog/datadog.go b/metrics-operator/controllers/common/providers/datadog/datadog.go index 9e8cb1a69d..eef487077b 100644 --- a/metrics-operator/controllers/common/providers/datadog/datadog.go +++ b/metrics-operator/controllers/common/providers/datadog/datadog.go @@ -13,7 +13,7 @@ import ( "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/metrics-operator/controllers/common/providers/datadog/datadog_test.go b/metrics-operator/controllers/common/providers/datadog/datadog_test.go index eb9b0797fc..15d7c06dfb 100644 --- a/metrics-operator/controllers/common/providers/datadog/datadog_test.go +++ b/metrics-operator/controllers/common/providers/datadog/datadog_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/fake" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/metrics-operator/controllers/common/providers/dynatrace/common.go b/metrics-operator/controllers/common/providers/dynatrace/common.go index 17be0cb02a..a3c2917a16 100644 --- a/metrics-operator/controllers/common/providers/dynatrace/common.go +++ b/metrics-operator/controllers/common/providers/dynatrace/common.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/metrics-operator/controllers/common/providers/dynatrace/common_test.go b/metrics-operator/controllers/common/providers/dynatrace/common_test.go index 6f5edeb688..40cd022758 100644 --- a/metrics-operator/controllers/common/providers/dynatrace/common_test.go +++ b/metrics-operator/controllers/common/providers/dynatrace/common_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/fake" "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" diff --git a/metrics-operator/controllers/common/providers/dynatrace/dynatrace.go b/metrics-operator/controllers/common/providers/dynatrace/dynatrace.go index 9f59eba3da..d776bf40a8 100644 --- a/metrics-operator/controllers/common/providers/dynatrace/dynatrace.go +++ b/metrics-operator/controllers/common/providers/dynatrace/dynatrace.go @@ -11,7 +11,7 @@ import ( "time" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql.go b/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql.go index f2fc0537e5..7a25276f8c 100644 --- a/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql.go +++ b/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql.go @@ -11,7 +11,7 @@ import ( "github.com/benbjohnson/clock" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" dtclient "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers/dynatrace/client" "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql_test.go b/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql_test.go index daefaafa16..b23c47ff04 100644 --- a/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql_test.go +++ b/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql_test.go @@ -12,7 +12,7 @@ import ( "github.com/benbjohnson/clock" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers/dynatrace/client/fake" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/metrics-operator/controllers/common/providers/dynatrace/dynatrace_test.go b/metrics-operator/controllers/common/providers/dynatrace/dynatrace_test.go index b885cf53e6..ad0f33586d 100644 --- a/metrics-operator/controllers/common/providers/dynatrace/dynatrace_test.go +++ b/metrics-operator/controllers/common/providers/dynatrace/dynatrace_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/fake" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/metrics-operator/controllers/common/providers/fake/provider_mock.go b/metrics-operator/controllers/common/providers/fake/provider_mock.go index b9b4fcd9f2..76aaab71ff 100644 --- a/metrics-operator/controllers/common/providers/fake/provider_mock.go +++ b/metrics-operator/controllers/common/providers/fake/provider_mock.go @@ -5,7 +5,7 @@ package fake import ( "context" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "sync" ) diff --git a/metrics-operator/controllers/common/providers/prometheus/common.go b/metrics-operator/controllers/common/providers/prometheus/common.go index ed23dd8b10..a2330f9ac9 100644 --- a/metrics-operator/controllers/common/providers/prometheus/common.go +++ b/metrics-operator/controllers/common/providers/prometheus/common.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" promapi "github.com/prometheus/client_golang/api" "github.com/prometheus/common/config" corev1 "k8s.io/api/core/v1" diff --git a/metrics-operator/controllers/common/providers/prometheus/common_test.go b/metrics-operator/controllers/common/providers/prometheus/common_test.go index cd840afd31..046a99fc05 100644 --- a/metrics-operator/controllers/common/providers/prometheus/common_test.go +++ b/metrics-operator/controllers/common/providers/prometheus/common_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/fake" promapi "github.com/prometheus/client_golang/api" "github.com/prometheus/common/config" diff --git a/metrics-operator/controllers/common/providers/prometheus/fake/roundtripper_mock.go b/metrics-operator/controllers/common/providers/prometheus/fake/roundtripper_mock.go index 24fb6b13fb..f9fda90164 100644 --- a/metrics-operator/controllers/common/providers/prometheus/fake/roundtripper_mock.go +++ b/metrics-operator/controllers/common/providers/prometheus/fake/roundtripper_mock.go @@ -5,7 +5,7 @@ package fake import ( "context" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "net/http" "sigs.k8s.io/controller-runtime/pkg/client" "sync" diff --git a/metrics-operator/controllers/common/providers/prometheus/prometheus.go b/metrics-operator/controllers/common/providers/prometheus/prometheus.go index 4a119860e2..6c6b627d5d 100644 --- a/metrics-operator/controllers/common/providers/prometheus/prometheus.go +++ b/metrics-operator/controllers/common/providers/prometheus/prometheus.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" promapi "github.com/prometheus/client_golang/api" prometheus "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/common/model" diff --git a/metrics-operator/controllers/common/providers/prometheus/prometheus_test.go b/metrics-operator/controllers/common/providers/prometheus/prometheus_test.go index ee46df9662..798749d421 100644 --- a/metrics-operator/controllers/common/providers/prometheus/prometheus_test.go +++ b/metrics-operator/controllers/common/providers/prometheus/prometheus_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/fake" fakeprom "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers/prometheus/fake" promapi "github.com/prometheus/client_golang/api" diff --git a/metrics-operator/controllers/common/providers/provider.go b/metrics-operator/controllers/common/providers/provider.go index fcbe8413c4..8ddf4ee0fd 100644 --- a/metrics-operator/controllers/common/providers/provider.go +++ b/metrics-operator/controllers/common/providers/provider.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers/datadog" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers/dynatrace" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers/prometheus" diff --git a/metrics-operator/controllers/metrics/controller.go b/metrics-operator/controllers/metrics/controller.go index 9799afca86..faa0151f08 100644 --- a/metrics-operator/controllers/metrics/controller.go +++ b/metrics-operator/controllers/metrics/controller.go @@ -24,7 +24,7 @@ import ( "time" "github.com/go-logr/logr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" ctrlcommon "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/aggregation" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers" diff --git a/metrics-operator/controllers/metrics/controller_test.go b/metrics-operator/controllers/metrics/controller_test.go index 9d883edbb6..27026bd9b0 100644 --- a/metrics-operator/controllers/metrics/controller_test.go +++ b/metrics-operator/controllers/metrics/controller_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-logr/logr" "github.com/go-logr/logr/testr" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/fake" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers" providersfake "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/providers/fake" @@ -25,7 +25,7 @@ func TestKeptnMetricReconciler_fetchProvider(t *testing.T) { provider := metricsapi.KeptnMetricsProvider{ TypeMeta: metav1.TypeMeta{ Kind: "KeptnMetricsProvider", - APIVersion: "metrics.keptn.sh/v1beta1"}, + APIVersion: "metrics.keptn.sh/v1"}, ObjectMeta: metav1.ObjectMeta{ Name: "myprovider", Namespace: "default", diff --git a/metrics-operator/converter/sli_converter.go b/metrics-operator/converter/sli_converter.go index 6351a4aa9e..ee4c208c16 100644 --- a/metrics-operator/converter/sli_converter.go +++ b/metrics-operator/converter/sli_converter.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) @@ -60,7 +60,7 @@ func (c *SLIConverter) convertMapToAnalysisValueTemplate(slis map[string]string, template := &metricsapi.AnalysisValueTemplate{ TypeMeta: v1.TypeMeta{ Kind: "AnalysisValueTemplate", - APIVersion: "metrics.keptn.sh/v1beta1", + APIVersion: "metrics.keptn.sh/v1", }, ObjectMeta: v1.ObjectMeta{ Name: ConvertResourceName(key), diff --git a/metrics-operator/converter/sli_converter.md b/metrics-operator/converter/sli_converter.md index efbabf0032..760ad24ae5 100644 --- a/metrics-operator/converter/sli_converter.md +++ b/metrics-operator/converter/sli_converter.md @@ -2,7 +2,7 @@ SLI converter is a tool to convert the old `sli.yaml` [file format](https://github.com/keptn/spec/blob/master/service_level_indicator.md) into the new -`AnalysisValueTemplate` [custom resource definition](https://keptn.sh/latest/docs/reference/api-reference/metrics/v1beta1/). +`AnalysisValueTemplate` [custom resource definition](https://keptn.sh/latest/docs/reference/api-reference/metrics/v1/). The converter is part of `metrics-operator` image. ## Usage @@ -54,7 +54,7 @@ will be converted to: ```yaml --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisValueTemplate metadata: creationTimestamp: null @@ -65,7 +65,7 @@ spec: namespace: keptn query: builtin:service.response.time:merge(0):percentile(95)?scope=tag(keptn_project:{{.project}}),tag(keptn_stage:{{.stage}}),tag(keptn_service:{{.service}}),tag(keptn_deployment:{{.deployment}}) --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisValueTemplate metadata: creationTimestamp: null diff --git a/metrics-operator/converter/sli_converter_test.go b/metrics-operator/converter/sli_converter_test.go index 603ef1ca7b..969699c614 100644 --- a/metrics-operator/converter/sli_converter_test.go +++ b/metrics-operator/converter/sli_converter_test.go @@ -3,7 +3,7 @@ package converter import ( "testing" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/stretchr/testify/require" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -15,7 +15,7 @@ indicators: response_time_p95: "builtin:service.response.time:merge(0):percentile(95)?scope=tag(keptn_project:$PROJECT),tag(keptn_stage:$STAGE),tag(keptn_service:$SERVICE),tag(keptn_deployment:$DEPLOYMENT)"` const expectedOutput1 = `--- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisValueTemplate metadata: creationTimestamp: null @@ -28,7 +28,7 @@ spec: ` const expectedOutput2 = `--- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisValueTemplate metadata: creationTimestamp: null @@ -59,7 +59,7 @@ func TestConvertMapToAnalysisValueTemplate(t *testing.T) { out1 := &metricsapi.AnalysisValueTemplate{ TypeMeta: v1.TypeMeta{ Kind: "AnalysisValueTemplate", - APIVersion: "metrics.keptn.sh/v1beta1", + APIVersion: "metrics.keptn.sh/v1", }, ObjectMeta: v1.ObjectMeta{ Name: "key1", @@ -75,7 +75,7 @@ func TestConvertMapToAnalysisValueTemplate(t *testing.T) { out2 := &metricsapi.AnalysisValueTemplate{ TypeMeta: v1.TypeMeta{ Kind: "AnalysisValueTemplate", - APIVersion: "metrics.keptn.sh/v1beta1", + APIVersion: "metrics.keptn.sh/v1", }, ObjectMeta: v1.ObjectMeta{ Name: "key2", diff --git a/metrics-operator/converter/slo_converter.go b/metrics-operator/converter/slo_converter.go index e1f12f02f1..3dcb898e9b 100644 --- a/metrics-operator/converter/slo_converter.go +++ b/metrics-operator/converter/slo_converter.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "gopkg.in/inf.v0" "k8s.io/apimachinery/pkg/api/resource" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -101,7 +101,7 @@ func (c *SLOConverter) convertSLO(sloContent *SLO, name string, namespace string definition := &metricsapi.AnalysisDefinition{ TypeMeta: v1.TypeMeta{ Kind: "AnalysisDefinition", - APIVersion: "metrics.keptn.sh/v1beta1", + APIVersion: "metrics.keptn.sh/v1", }, ObjectMeta: v1.ObjectMeta{ Name: name, diff --git a/metrics-operator/converter/slo_converter.md b/metrics-operator/converter/slo_converter.md index f2dd5b5a1d..51d8e4e5b9 100644 --- a/metrics-operator/converter/slo_converter.md +++ b/metrics-operator/converter/slo_converter.md @@ -24,7 +24,7 @@ SLO converter is a tool to convert the old `slo.yaml` [file format](https://github.com/keptn/spec/blob/master/service_level_objective.md) into the new -`AnalysisDefinition` [custom resource definition](https://keptn.sh/latest/docs/reference/api-reference/metrics/v1beta1/). +`AnalysisDefinition` [custom resource definition](https://keptn.sh/latest/docs/reference/api-reference/metrics/v1/). The converter is part of `metrics-operator` image. ## Usage @@ -368,7 +368,7 @@ docker run $METRICS_OPERATOR_IMAGE manager --convert-slo=./slo.yaml --slo-namesp will be converted to: ```yaml -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: creationTimestamp: null diff --git a/metrics-operator/converter/slo_converter_test.go b/metrics-operator/converter/slo_converter_test.go index 5a4f0b92a0..2eff7a3d3a 100644 --- a/metrics-operator/converter/slo_converter_test.go +++ b/metrics-operator/converter/slo_converter_test.go @@ -4,7 +4,7 @@ package converter import ( "testing" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/stretchr/testify/require" "gopkg.in/inf.v0" "k8s.io/apimachinery/pkg/api/resource" @@ -88,7 +88,7 @@ total_score: pass: "100%" warning: "65%"` -const expectedOutput = `apiVersion: metrics.keptn.sh/v1beta1 +const expectedOutput = `apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: creationTimestamp: null @@ -1612,7 +1612,7 @@ func TestConvertSLO(t *testing.T) { out: &metricsapi.AnalysisDefinition{ TypeMeta: v1.TypeMeta{ Kind: "AnalysisDefinition", - APIVersion: "metrics.keptn.sh/v1beta1", + APIVersion: "metrics.keptn.sh/v1", }, ObjectMeta: v1.ObjectMeta{ Name: "defName", @@ -1666,7 +1666,7 @@ func TestConvertSLO(t *testing.T) { out: &metricsapi.AnalysisDefinition{ TypeMeta: v1.TypeMeta{ Kind: "AnalysisDefinition", - APIVersion: "metrics.keptn.sh/v1beta1", + APIVersion: "metrics.keptn.sh/v1", }, ObjectMeta: v1.ObjectMeta{ Name: "defName", @@ -1755,7 +1755,7 @@ func TestConvertSLO(t *testing.T) { out: &metricsapi.AnalysisDefinition{ TypeMeta: v1.TypeMeta{ Kind: "AnalysisDefinition", - APIVersion: "metrics.keptn.sh/v1beta1", + APIVersion: "metrics.keptn.sh/v1", }, ObjectMeta: v1.ObjectMeta{ Name: "defName", diff --git a/metrics-operator/main.go b/metrics-operator/main.go index 3a50b5ad62..eca42f9a2c 100644 --- a/metrics-operator/main.go +++ b/metrics-operator/main.go @@ -30,7 +30,7 @@ import ( "github.com/keptn/lifecycle-toolkit/keptn-cert-manager/pkg/certificates" certCommon "github.com/keptn/lifecycle-toolkit/keptn-cert-manager/pkg/common" certwebhook "github.com/keptn/lifecycle-toolkit/keptn-cert-manager/pkg/webhook" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/keptn/lifecycle-toolkit/metrics-operator/cmd/metrics/adapter" analysiscontroller "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/analysis" "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis" diff --git a/metrics-operator/pkg/metrics/analysis/results_test.go b/metrics-operator/pkg/metrics/analysis/results_test.go index 4ca53c90d3..9a84f584d7 100644 --- a/metrics-operator/pkg/metrics/analysis/results_test.go +++ b/metrics-operator/pkg/metrics/analysis/results_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" analysistypes "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/common/analysis/types" "github.com/prometheus/client_golang/prometheus" io_prometheus_client "github.com/prometheus/client_model/go" diff --git a/metrics-operator/pkg/metrics/server.go b/metrics-operator/pkg/metrics/server.go index 7c7f4eed12..fe053805ac 100644 --- a/metrics-operator/pkg/metrics/server.go +++ b/metrics-operator/pkg/metrics/server.go @@ -13,7 +13,7 @@ import ( "github.com/benbjohnson/clock" "github.com/gorilla/mux" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/open-feature/go-sdk/openfeature" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/metrics-operator/pkg/metrics/server_test.go b/metrics-operator/pkg/metrics/server_test.go index 7337be2c41..cdf0edbaf8 100644 --- a/metrics-operator/pkg/metrics/server_test.go +++ b/metrics-operator/pkg/metrics/server_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/benbjohnson/clock" - metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1" + metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1" "github.com/open-feature/go-sdk/openfeature" "github.com/stretchr/testify/require" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/chainsaw/integration/app-failing-post-evaluation/00-install.yaml b/test/chainsaw/integration/app-failing-post-evaluation/00-install.yaml index b46d79b636..440d53df3e 100644 --- a/test/chainsaw/integration/app-failing-post-evaluation/00-install.yaml +++ b/test/chainsaw/integration/app-failing-post-evaluation/00-install.yaml @@ -46,7 +46,7 @@ spec: keptnMetricRef: name: available-cpus --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: available-cpus @@ -57,7 +57,7 @@ spec: query: >- sum(kube_node_status_capacity{resource='cpu'}) --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: prometheus diff --git a/test/chainsaw/integration/app-failing-pre-evaluation-retry/00-install.yaml b/test/chainsaw/integration/app-failing-pre-evaluation-retry/00-install.yaml index 940dbbd340..49a86c6900 100644 --- a/test/chainsaw/integration/app-failing-pre-evaluation-retry/00-install.yaml +++ b/test/chainsaw/integration/app-failing-pre-evaluation-retry/00-install.yaml @@ -64,7 +64,7 @@ spec: retries: 2 retryInterval: 3s --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: available-cpus @@ -75,7 +75,7 @@ spec: query: >- sum(kube_node_status_capacity{resource='cpu'}) --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: prometheus diff --git a/test/chainsaw/integration/app-failing-pre-evaluation/00-install.yaml b/test/chainsaw/integration/app-failing-pre-evaluation/00-install.yaml index fe89ab3982..6acc764d24 100644 --- a/test/chainsaw/integration/app-failing-pre-evaluation/00-install.yaml +++ b/test/chainsaw/integration/app-failing-pre-evaluation/00-install.yaml @@ -62,7 +62,7 @@ spec: keptnMetricRef: name: available-cpus --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: available-cpus @@ -73,7 +73,7 @@ spec: query: >- sum(kube_node_status_capacity{resource='cpu'}) --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: prometheus diff --git a/test/chainsaw/integration/expose-keptn-metric/job-existing-metric.yaml b/test/chainsaw/integration/expose-keptn-metric/job-existing-metric.yaml index 1c4fdb43d7..faef9c44f4 100644 --- a/test/chainsaw/integration/expose-keptn-metric/job-existing-metric.yaml +++ b/test/chainsaw/integration/expose-keptn-metric/job-existing-metric.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: (replace_all($namespace, '-', '')) diff --git a/test/chainsaw/integration/podtato-head-application/00-install.yaml b/test/chainsaw/integration/podtato-head-application/00-install.yaml index 3ef76c52e4..71bf58d95d 100644 --- a/test/chainsaw/integration/podtato-head-application/00-install.yaml +++ b/test/chainsaw/integration/podtato-head-application/00-install.yaml @@ -358,7 +358,7 @@ spec: keptnMetricRef: name: available-cpus --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: available-cpus @@ -369,7 +369,7 @@ spec: query: >- sum(kube_node_status_capacity{resource='cpu'}) --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: prometheus diff --git a/test/chainsaw/integration/simple-deployment-evaluation/00-install.yaml b/test/chainsaw/integration/simple-deployment-evaluation/00-install.yaml index 58b4bc6dbf..2466b26108 100644 --- a/test/chainsaw/integration/simple-deployment-evaluation/00-install.yaml +++ b/test/chainsaw/integration/simple-deployment-evaluation/00-install.yaml @@ -8,7 +8,7 @@ spec: keptnMetricRef: name: available-cpus --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: available-cpus @@ -19,7 +19,7 @@ spec: query: >- sum(kube_node_status_capacity{resource='cpu'}) --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: prometheus diff --git a/test/chainsaw/integration/validate-analysisdefinition/analysisdef_bad.yaml b/test/chainsaw/integration/validate-analysisdefinition/analysisdef_bad.yaml index 3d562d522b..894b89720e 100644 --- a/test/chainsaw/integration/validate-analysisdefinition/analysisdef_bad.yaml +++ b/test/chainsaw/integration/validate-analysisdefinition/analysisdef_bad.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: name: analysisdefinition-bad diff --git a/test/chainsaw/integration/validate-analysisdefinition/analysisdef_good.yaml b/test/chainsaw/integration/validate-analysisdefinition/analysisdef_good.yaml index f8a24e97f0..14d02af237 100644 --- a/test/chainsaw/integration/validate-analysisdefinition/analysisdef_good.yaml +++ b/test/chainsaw/integration/validate-analysisdefinition/analysisdef_good.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: name: analysisdefinition diff --git a/test/chainsaw/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml b/test/chainsaw/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml index b76b77bb18..89479073e6 100644 --- a/test/chainsaw/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml +++ b/test/chainsaw/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: name: analysisdefinition-empty diff --git a/test/chainsaw/testanalysis/analysis-controller-existing-status/assert-1.yaml b/test/chainsaw/testanalysis/analysis-controller-existing-status/assert-1.yaml index 97e0628de5..fc1c35729a 100755 --- a/test/chainsaw/testanalysis/analysis-controller-existing-status/assert-1.yaml +++ b/test/chainsaw/testanalysis/analysis-controller-existing-status/assert-1.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: analysis-sample diff --git a/test/chainsaw/testanalysis/analysis-controller-existing-status/assert-2.yaml b/test/chainsaw/testanalysis/analysis-controller-existing-status/assert-2.yaml index 614f8c5a10..a0bca3fdd5 100755 --- a/test/chainsaw/testanalysis/analysis-controller-existing-status/assert-2.yaml +++ b/test/chainsaw/testanalysis/analysis-controller-existing-status/assert-2.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: analysis-sample diff --git a/test/chainsaw/testanalysis/analysis-controller-existing-status/install.yaml b/test/chainsaw/testanalysis/analysis-controller-existing-status/install.yaml index 3b0a438a8a..b863189e12 100644 --- a/test/chainsaw/testanalysis/analysis-controller-existing-status/install.yaml +++ b/test/chainsaw/testanalysis/analysis-controller-existing-status/install.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisValueTemplate metadata: name: ready @@ -7,7 +7,7 @@ spec: name: my-mocked-provider query: 'sum(kube_pod_container_status_ready{namespace="{{.ns}}"})' --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: name: ed-my-proj-dev-svc1 @@ -28,7 +28,7 @@ spec: passPercentage: 90 warningPercentage: 75 --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: analysis-sample @@ -49,7 +49,7 @@ status: errMsg: "" --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: my-mocked-provider diff --git a/test/chainsaw/testanalysis/analysis-controller-multiple-providers/assert-1.yaml b/test/chainsaw/testanalysis/analysis-controller-multiple-providers/assert-1.yaml index e27c4d9bd4..e4dcfd493a 100755 --- a/test/chainsaw/testanalysis/analysis-controller-multiple-providers/assert-1.yaml +++ b/test/chainsaw/testanalysis/analysis-controller-multiple-providers/assert-1.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: analysis-sample diff --git a/test/chainsaw/testanalysis/analysis-controller-multiple-providers/install.yaml b/test/chainsaw/testanalysis/analysis-controller-multiple-providers/install.yaml index d8b206a104..4d1a262b1e 100644 --- a/test/chainsaw/testanalysis/analysis-controller-multiple-providers/install.yaml +++ b/test/chainsaw/testanalysis/analysis-controller-multiple-providers/install.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisValueTemplate metadata: name: value-1 @@ -7,7 +7,7 @@ spec: name: my-first-mocked-provider query: 'query-1' --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisValueTemplate metadata: name: value-2 @@ -16,7 +16,7 @@ spec: name: my-second-mocked-provider query: 'query-2' --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisValueTemplate metadata: name: value-3 @@ -25,7 +25,7 @@ spec: name: my-third-mocked-provider query: 'query-3' --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: name: ed-my-proj-dev-svc1 @@ -66,7 +66,7 @@ spec: passPercentage: 75 warningPercentage: 50 --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: analysis-sample @@ -79,7 +79,7 @@ spec: analysisDefinition: name: ed-my-proj-dev-svc1 --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: my-first-mocked-provider @@ -87,7 +87,7 @@ spec: type: prometheus targetServer: (join('.', ['http://mockserver', $namespace, 'svc.cluster.local:1080'])) --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: my-second-mocked-provider @@ -95,7 +95,7 @@ spec: type: prometheus targetServer: (join('.', ['http://mockserver', $namespace, 'svc.cluster.local:1080'])) --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: my-third-mocked-provider diff --git a/test/chainsaw/testanalysis/analysis-controller-with-duration-timeframe/assert-1.yaml b/test/chainsaw/testanalysis/analysis-controller-with-duration-timeframe/assert-1.yaml index 8c8c27bdbf..af935e6c98 100755 --- a/test/chainsaw/testanalysis/analysis-controller-with-duration-timeframe/assert-1.yaml +++ b/test/chainsaw/testanalysis/analysis-controller-with-duration-timeframe/assert-1.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: analysis-sample diff --git a/test/chainsaw/testanalysis/analysis-controller-with-duration-timeframe/install.yaml b/test/chainsaw/testanalysis/analysis-controller-with-duration-timeframe/install.yaml index 4c96d256f4..c697761563 100644 --- a/test/chainsaw/testanalysis/analysis-controller-with-duration-timeframe/install.yaml +++ b/test/chainsaw/testanalysis/analysis-controller-with-duration-timeframe/install.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisValueTemplate metadata: name: ready @@ -7,7 +7,7 @@ spec: name: my-mocked-provider query: 'sum(kube_pod_container_status_ready{namespace="{{.ns}}"})' --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: name: ed-my-proj-dev-svc1 @@ -28,7 +28,7 @@ spec: passPercentage: 90 warningPercentage: 75 --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: analysis-sample @@ -40,7 +40,7 @@ spec: analysisDefinition: name: ed-my-proj-dev-svc1 --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: my-mocked-provider diff --git a/test/chainsaw/testanalysis/analysis-controller/assert-1.yaml b/test/chainsaw/testanalysis/analysis-controller/assert-1.yaml index 8c8c27bdbf..af935e6c98 100755 --- a/test/chainsaw/testanalysis/analysis-controller/assert-1.yaml +++ b/test/chainsaw/testanalysis/analysis-controller/assert-1.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: analysis-sample diff --git a/test/chainsaw/testanalysis/analysis-controller/install.yaml b/test/chainsaw/testanalysis/analysis-controller/install.yaml index 4c96d256f4..c697761563 100644 --- a/test/chainsaw/testanalysis/analysis-controller/install.yaml +++ b/test/chainsaw/testanalysis/analysis-controller/install.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisValueTemplate metadata: name: ready @@ -7,7 +7,7 @@ spec: name: my-mocked-provider query: 'sum(kube_pod_container_status_ready{namespace="{{.ns}}"})' --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: name: ed-my-proj-dev-svc1 @@ -28,7 +28,7 @@ spec: passPercentage: 90 warningPercentage: 75 --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: analysis-sample @@ -40,7 +40,7 @@ spec: analysisDefinition: name: ed-my-proj-dev-svc1 --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: my-mocked-provider diff --git a/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-1.yaml b/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-1.yaml index cfcff9e781..75a26a58ff 100644 --- a/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-1.yaml +++ b/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-1.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: invalid-analysis-1 diff --git a/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-2.yaml b/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-2.yaml index 9606cda5f9..eef41e4745 100644 --- a/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-2.yaml +++ b/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-2.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: invalid-analysis-2 diff --git a/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-3.yaml b/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-3.yaml index 84941353dd..eb0f01d622 100644 --- a/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-3.yaml +++ b/test/chainsaw/testanalysis/analysis-resources/invalid-analysis-3.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: invalid-analysis-3 diff --git a/test/chainsaw/testanalysis/analysis-resources/valid-analysis-1.yaml b/test/chainsaw/testanalysis/analysis-resources/valid-analysis-1.yaml index b506e2b6b1..74515f16b8 100644 --- a/test/chainsaw/testanalysis/analysis-resources/valid-analysis-1.yaml +++ b/test/chainsaw/testanalysis/analysis-resources/valid-analysis-1.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: valid-analysis-1 diff --git a/test/chainsaw/testanalysis/analysis-resources/valid-analysis-2.yaml b/test/chainsaw/testanalysis/analysis-resources/valid-analysis-2.yaml index 1156d93ccc..37753cc374 100644 --- a/test/chainsaw/testanalysis/analysis-resources/valid-analysis-2.yaml +++ b/test/chainsaw/testanalysis/analysis-resources/valid-analysis-2.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: Analysis metadata: name: valid-analysis-2 diff --git a/test/chainsaw/testanalysis/analysisdefinition-validate/badanalysis.yaml b/test/chainsaw/testanalysis/analysisdefinition-validate/badanalysis.yaml index f894a30c65..565db262d5 100644 --- a/test/chainsaw/testanalysis/analysisdefinition-validate/badanalysis.yaml +++ b/test/chainsaw/testanalysis/analysisdefinition-validate/badanalysis.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: name: ed-my-proj-dev-svc1 diff --git a/test/chainsaw/testanalysis/analysisdefinition-validate/goodanalysis.yaml b/test/chainsaw/testanalysis/analysisdefinition-validate/goodanalysis.yaml index 18c84bffaa..835b5f2221 100644 --- a/test/chainsaw/testanalysis/analysisdefinition-validate/goodanalysis.yaml +++ b/test/chainsaw/testanalysis/analysisdefinition-validate/goodanalysis.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: AnalysisDefinition metadata: name: ed-my-proj-dev-svc2 diff --git a/test/chainsaw/testmetrics/metrics-hpa/hpa.yaml b/test/chainsaw/testmetrics/metrics-hpa/hpa.yaml index a3107b7a4a..97d6bede2f 100644 --- a/test/chainsaw/testmetrics/metrics-hpa/hpa.yaml +++ b/test/chainsaw/testmetrics/metrics-hpa/hpa.yaml @@ -15,7 +15,7 @@ spec: metric: name: cpu-throttling describedObject: - apiVersion: metrics.keptn.sh/v1beta1 + apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric name: cpu-throttling target: diff --git a/test/chainsaw/testmetrics/metrics-hpa/metric.yaml b/test/chainsaw/testmetrics/metrics-hpa/metric.yaml index bdb879653d..7290707d40 100644 --- a/test/chainsaw/testmetrics/metrics-hpa/metric.yaml +++ b/test/chainsaw/testmetrics/metrics-hpa/metric.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: my-provider @@ -6,7 +6,7 @@ spec: type: prometheus targetServer: (join('.', ['http://mockserver', $namespace, 'svc.cluster.local:1080'])) --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: cpu-throttling diff --git a/test/chainsaw/testmetrics/metrics-provider/00-install.yaml b/test/chainsaw/testmetrics/metrics-provider/00-install.yaml index 0144dc52d4..7161ccd8a3 100644 --- a/test/chainsaw/testmetrics/metrics-provider/00-install.yaml +++ b/test/chainsaw/testmetrics/metrics-provider/00-install.yaml @@ -7,7 +7,7 @@ type: Opaque data: DT_TOKEN: dG9rZW46IG15dG9rZW4= --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: podtatometric @@ -19,7 +19,7 @@ spec: fetchIntervalSeconds: 5 --- -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: dynatrace diff --git a/test/chainsaw/testmetrics/metrics/00-install.yaml b/test/chainsaw/testmetrics/metrics/00-install.yaml index f79a4ff223..24833bca1a 100644 --- a/test/chainsaw/testmetrics/metrics/00-install.yaml +++ b/test/chainsaw/testmetrics/metrics/00-install.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: prometheus diff --git a/test/chainsaw/testmetrics/metrics/badmetric1.yaml b/test/chainsaw/testmetrics/metrics/badmetric1.yaml index b49e00e706..137e11c550 100644 --- a/test/chainsaw/testmetrics/metrics/badmetric1.yaml +++ b/test/chainsaw/testmetrics/metrics/badmetric1.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: podtato-head1 diff --git a/test/chainsaw/testmetrics/metrics/badmetric2.yaml b/test/chainsaw/testmetrics/metrics/badmetric2.yaml index 5175c54e5e..0a8d35e1aa 100644 --- a/test/chainsaw/testmetrics/metrics/badmetric2.yaml +++ b/test/chainsaw/testmetrics/metrics/badmetric2.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: podtato-head1 diff --git a/test/chainsaw/testmetrics/metrics/badmetric3.yaml b/test/chainsaw/testmetrics/metrics/badmetric3.yaml index 5844664304..5c24461668 100644 --- a/test/chainsaw/testmetrics/metrics/badmetric3.yaml +++ b/test/chainsaw/testmetrics/metrics/badmetric3.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: podtato-head1 diff --git a/test/chainsaw/testmetrics/metrics/goodmetric.yaml b/test/chainsaw/testmetrics/metrics/goodmetric.yaml index 38d94c3cc2..0567c1b778 100644 --- a/test/chainsaw/testmetrics/metrics/goodmetric.yaml +++ b/test/chainsaw/testmetrics/metrics/goodmetric.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: podtato-head diff --git a/test/load/assets/templates/metric.yaml b/test/load/assets/templates/metric.yaml index bc5d37f669..e56b82b16a 100644 --- a/test/load/assets/templates/metric.yaml +++ b/test/load/assets/templates/metric.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetric metadata: name: keptnmetric-load-test-{{.Iteration}}-{{.Replica}} diff --git a/test/load/assets/templates/provider.yaml b/test/load/assets/templates/provider.yaml index 205b0cafa9..ff0cb37ec8 100644 --- a/test/load/assets/templates/provider.yaml +++ b/test/load/assets/templates/provider.yaml @@ -1,4 +1,4 @@ -apiVersion: metrics.keptn.sh/v1beta1 +apiVersion: metrics.keptn.sh/v1 kind: KeptnMetricsProvider metadata: name: prometheus