Merge pull request #275 from Kuadrant/regex-typo

fix healthcheck api

api/v1alpha1/dnshealthcheckprobe_types.go

@@ -32,7 +32,7 @@ type DNSHealthCheckProbeSpec struct {
  // +kubebuilder:validation:Pattern=`^[a-z][a-z0-9\-]+\.([a-z][a-z0-9\-]+\.)*[a-z][a-z0-9\-]+$`
  Hostname string `json:"hostname,omitempty"`
  // Address to connect to the host on (IP Address (A Record) or hostname (CNAME)).
- // +kubebuilder:validation:Pattern=`^([1-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]|[a-z][a-z0-9\-]+\.([a-z][a-z0-9\-]+\.)*[a-z][a-z0-9\-]+)?$`
+ // +kubebuilder:validation:Pattern=`^([1-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?|[a-z][a-z0-9\-]+\.([a-z][a-z0-9\-]+\.)*[a-z][a-z0-9\-]+)?$`
  Address string `json:"address,omitempty"`
  // Path is the path to append to the host to reach the expected health check.
  // Must start with "?" or "/", contain only valid URL characters and end with alphanumeric char or "/". For example "/" or "/healthz" are common

api/v1alpha1/dnsrecord_types.go

@@ -37,7 +37,7 @@ const HttpsProtocol Protocol = "HTTPS"
 type HealthCheckSpec struct {
  // Port to connect to the host on. Must be either 80, 443 or 1024-49151
  // +kubebuilder:validation:XValidation:rule="self in [80, 443] || (self >= 1024 && self <= 49151)",message="Only ports 80, 443, 1024-49151 are allowed"
- Port *int `json:"port,omitempty"`
+ Port int `json:"port,omitempty"`
  // Path is the path to append to the host to reach the expected health check.
  // Must start with "?" or "/", contain only valid URL characters and end with alphanumeric char or "/". For example "/" or "/healthz" are common
  // +kubebuilder:validation:Pattern=`^(?:\?|\/)[\w\-.~:\/?#\[\]@!$&'()*+,;=]+(?:[a-zA-Z0-9]|\/){1}$`
@@ -52,7 +52,7 @@ type HealthCheckSpec struct {
  AdditionalHeadersRef *AdditionalHeadersRef `json:"additionalHeadersRef,omitempty"`
  // FailureThreshold is a limit of consecutive failures that must occur for a host to be considered unhealthy
  // +kubebuilder:validation:XValidation:rule="self > 0",message="Failure threshold must be greater than 0"
- FailureThreshold *int `json:"failureThreshold,omitempty"`
+ FailureThreshold int `json:"failureThreshold,omitempty"`
 }
 
 type HealthCheckStatus struct {

bundle/manifests/dns-operator.clusterserviceversion.yaml

@@ -58,7 +58,7 @@ metadata:
  capabilities: Basic Install
  categories: Integration & Delivery
  containerImage: quay.io/kuadrant/dns-operator:latest
- createdAt: "2024-10-17T11:03:25Z"
+ createdAt: "2024-10-18T15:21:24Z"
  description: A Kubernetes Operator to manage the lifecycle of DNS resources
  operators.operatorframework.io/builder: operator-sdk-v1.33.0
  operators.operatorframework.io/project_layout: go.kubebuilder.io/v4

bundle/manifests/kuadrant.io_dnshealthcheckprobes.yaml

@@ -62,7 +62,7 @@ spec:
  address:
  description: Address to connect to the host on (IP Address (A Record)
  or hostname (CNAME)).
- pattern: ^([1-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]|[a-z][a-z0-9\-]+\.([a-z][a-z0-9\-]+\.)*[a-z][a-z0-9\-]+)?$
+ pattern: ^([1-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?|[a-z][a-z0-9\-]+\.([a-z][a-z0-9\-]+\.)*[a-z][a-z0-9\-]+)?$
  type: string
  allowInsecureCertificate:
  description: |-

charts/dns-operator/templates/manifests.yaml

@@ -63,7 +63,7 @@ spec:
  address:
  description: Address to connect to the host on (IP Address (A Record)
  or hostname (CNAME)).
- pattern: ^([1-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]|[a-z][a-z0-9\-]+\.([a-z][a-z0-9\-]+\.)*[a-z][a-z0-9\-]+)?$
+ pattern: ^([1-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?|[a-z][a-z0-9\-]+\.([a-z][a-z0-9\-]+\.)*[a-z][a-z0-9\-]+)?$
  type: string
  allowInsecureCertificate:
  description: |-

config/crd/bases/kuadrant.io_dnshealthcheckprobes.yaml

@@ -62,7 +62,7 @@ spec:
  address:
  description: Address to connect to the host on (IP Address (A Record)
  or hostname (CNAME)).
- pattern: ^([1-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]|[a-z][a-z0-9\-]+\.([a-z][a-z0-9\-]+\.)*[a-z][a-z0-9\-]+)?$
+ pattern: ^([1-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?|[a-z][a-z0-9\-]+\.([a-z][a-z0-9\-]+\.)*[a-z][a-z0-9\-]+)?$
  type: string
  allowInsecureCertificate:
  description: |-

internal/controller/dnsrecord_controller_test.go

@@ -30,7 +30,6 @@ import (
 
  v1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/ptr"
  "sigs.k8s.io/controller-runtime/pkg/client"
  externaldnsendpoint "sigs.k8s.io/external-dns/endpoint"
 
@@ -153,9 +152,9 @@ var _ = Describe("DNSRecordReconciler", func() {
  Endpoints: getTestEndpoints("bar.example.com", "127.0.0.1"),
  HealthCheck: &v1alpha1.HealthCheckSpec{
  Path: "health",
- Port: ptr.To(5),
+ Port: 5,
  Protocol: v1alpha1.Protocol("cat"),
- FailureThreshold: ptr.To(-1),
+ FailureThreshold: -1,
  },
  },
  }

internal/controller/dnsrecord_healthchecks.go

@@ -160,8 +160,8 @@ func getHealthChecksConfig(dnsRecord *v1alpha1.DNSRecord) *healthChecksConfig {
  return nil
  }
 
- port := int64(*dnsRecord.Spec.HealthCheck.Port)
- failureThreshold := int64(*dnsRecord.Spec.HealthCheck.FailureThreshold)
+ port := int64(dnsRecord.Spec.HealthCheck.Port)
+ failureThreshold := int64(dnsRecord.Spec.HealthCheck.FailureThreshold)
 
  return &healthChecksConfig{
  Endpoint: dnsRecord.Spec.HealthCheck.Path,