From a77733eef9cf5d52cda08d4bab60b5d6e8895fba Mon Sep 17 00:00:00 2001 From: odubajDT Date: Tue, 27 Aug 2024 09:40:11 +0200 Subject: [PATCH] rename Signed-off-by: odubajDT --- docs/docs/reference/api-reference/metrics/v1/index.md | 2 +- metrics-operator/api/v1/keptnmetricsprovider_types.go | 4 ++-- .../crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml | 8 ++++---- .../common/providers/dynatrace/dynatrace_dql.go | 2 +- metrics-operator/controllers/common/providers/provider.go | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/docs/reference/api-reference/metrics/v1/index.md b/docs/docs/reference/api-reference/metrics/v1/index.md index 5981b04a5c..dfde68403c 100644 --- a/docs/docs/reference/api-reference/metrics/v1/index.md +++ b/docs/docs/reference/api-reference/metrics/v1/index.md @@ -376,7 +376,7 @@ _Appears in:_ | `type` _string_ | Type represents the provider type. This can be one of cortex, datadog, dql, dynatrace, prometheus or thanos. || x | Optional: {}
Pattern: `cortex|datadog|dql|dynatrace|prometheus|thanos`
| | `targetServer` _string_ | TargetServer defines URL (including port and protocol) at which the metrics provider is reachable. || x | | | `secretKeyRef` _[SecretKeySelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#secretkeyselector-v1-core)_ | SecretKeyRef defines an optional secret for access credentials to the metrics provider. || ✓ | Optional: {}
| -| `skipVerifyCertificate` _boolean_ | SkipVerifyCertificate skips verification of the certificate |false| ✓ | | +| `insecureSkipTlsVerify` _boolean_ | InsecureSkipTlsVerify skips verification of the tls certificate |false| ✓ | | #### ObjectReference diff --git a/metrics-operator/api/v1/keptnmetricsprovider_types.go b/metrics-operator/api/v1/keptnmetricsprovider_types.go index 02b7b4fd9b..1e833521f9 100644 --- a/metrics-operator/api/v1/keptnmetricsprovider_types.go +++ b/metrics-operator/api/v1/keptnmetricsprovider_types.go @@ -35,10 +35,10 @@ type KeptnMetricsProviderSpec struct { // SecretKeyRef defines an optional secret for access credentials to the metrics provider. // +optional SecretKeyRef corev1.SecretKeySelector `json:"secretKeyRef,omitempty"` - // SkipVerifyCertificate skips verification of the certificate + // InsecureSkipTlsVerify skips verification of the tls certificate // +kubebuilder:default:=false // +optional - SkipVerifyCertificate bool `json:"skipVerifyCertificate,omitempty"` + InsecureSkipTlsVerify bool `json:"insecureSkipTlsVerify,omitempty"` } // +kubebuilder:object:root=true 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 11a6c00bf9..b51799e57c 100644 --- a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml +++ b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml @@ -42,6 +42,10 @@ spec: spec: description: KeptnMetricsProviderSpec defines the desired state of KeptnMetricsProvider properties: + insecureSkipTlsVerify: + default: false + description: InsecureSkipTlsVerify skips verification of the tls certificate + type: boolean secretKeyRef: description: SecretKeyRef defines an optional secret for access credentials to the metrics provider. @@ -63,10 +67,6 @@ spec: - key type: object x-kubernetes-map-type: atomic - skipVerifyCertificate: - default: false - description: SkipVerifyCertificate skips verification of the certificate - type: boolean targetServer: description: TargetServer defines URL (including port and protocol) at which the metrics provider is reachable. diff --git a/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql.go b/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql.go index 7a0ad8e23f..eafe83eef4 100644 --- a/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql.go +++ b/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql.go @@ -277,7 +277,7 @@ func (d *keptnDynatraceDQLProvider) ensureDTClientIsSetUp(ctx context.Context, p http.Client{ Transport: &http.Transport{ TLSClientConfig: &tls.Config{ - InsecureSkipVerify: provider.Spec.SkipVerifyCertificate, + InsecureSkipVerify: provider.Spec.InsecureSkipTlsVerify, }, }, }, diff --git a/metrics-operator/controllers/common/providers/provider.go b/metrics-operator/controllers/common/providers/provider.go index e235fe25a6..7bfb250b04 100644 --- a/metrics-operator/controllers/common/providers/provider.go +++ b/metrics-operator/controllers/common/providers/provider.go @@ -37,7 +37,7 @@ func NewProvider(provider *metricsapi.KeptnMetricsProvider, log logr.Logger, k8s HttpClient: http.Client{ Transport: &http.Transport{ TLSClientConfig: &tls.Config{ - InsecureSkipVerify: provider.Spec.SkipVerifyCertificate, + InsecureSkipVerify: provider.Spec.InsecureSkipTlsVerify, }, }, }, @@ -48,7 +48,7 @@ func NewProvider(provider *metricsapi.KeptnMetricsProvider, log logr.Logger, k8s return dynatrace.NewKeptnDynatraceDQLProvider( k8sClient, dynatrace.WithLogger(log), - dynatrace.WithSkipVerifyCertificate(provider.Spec.SkipVerifyCertificate), + dynatrace.WithSkipVerifyCertificate(provider.Spec.InsecureSkipTlsVerify), ), nil case DataDogProviderType: return &datadog.KeptnDataDogProvider{ @@ -56,7 +56,7 @@ func NewProvider(provider *metricsapi.KeptnMetricsProvider, log logr.Logger, k8s HttpClient: http.Client{ Transport: &http.Transport{ TLSClientConfig: &tls.Config{ - InsecureSkipVerify: provider.Spec.SkipVerifyCertificate, + InsecureSkipVerify: provider.Spec.InsecureSkipTlsVerify, }, }, },