remove dns healthcheck probes

update manifests and bundle upgrade controller-gen to 0.14.0 (Kuadrant#460) dns: Bump DNS Operator version propagate health check to DNS Records
philbrookes · Apr 16, 2024 · e586a45 · e586a45
1 parent 6ba870a
commit e586a45
Show file tree

Hide file tree

Showing 30 changed files with 772 additions and 1,453 deletions.
diff --git a/Makefile b/Makefile
@@ -136,7 +136,7 @@ endif
 LIMITADOR_OPERATOR_BUNDLE_IMG ?= quay.io/kuadrant/limitador-operator-bundle:$(LIMITADOR_OPERATOR_BUNDLE_IMG_TAG)
 
 ## dns
-DNS_OPERATOR_VERSION ?= 0.1.0
+DNS_OPERATOR_VERSION ?= latest
 
 kuadrantdns_bundle_is_semantic := $(call is_semantic_version,$(DNS_OPERATOR_VERSION))
 ifeq (latest,$(DNS_OPERATOR_VERSION))

diff --git a/api/v1alpha1/dnspolicy_types.go b/api/v1alpha1/dnspolicy_types.go
@@ -24,8 +24,6 @@ import (
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
-	kuadrantdnsv1alpha1 "github.com/kuadrant/dns-operator/api/v1alpha1"
-
 	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 )
 
@@ -215,14 +213,14 @@ type DNSPolicyList struct {
 // By default, this health check will be applied to each unique DNS A Record for
 // the listeners assigned to the target gateway
 type HealthCheckSpec struct {
-	Endpoint                  string                                    `json:"endpoint,omitempty"`
-	Port                      *int                                      `json:"port,omitempty"`
-	Protocol                  *kuadrantdnsv1alpha1.HealthProtocol       `json:"protocol,omitempty"`
-	FailureThreshold          *int                                      `json:"failureThreshold,omitempty"`
-	AdditionalHeadersRef      *kuadrantdnsv1alpha1.AdditionalHeadersRef `json:"additionalHeadersRef,omitempty"`
-	ExpectedResponses         []int                                     `json:"expectedResponses,omitempty"`
-	AllowInsecureCertificates bool                                      `json:"allowInsecureCertificates,omitempty"`
-	Interval                  *metav1.Duration                          `json:"interval,omitempty"`
+	Endpoint                  string           `json:"endpoint,omitempty"`
+	Port                      *int             `json:"port,omitempty"`
+	Protocol                  *string          `json:"protocol,omitempty"`
+	FailureThreshold          *int             `json:"failureThreshold,omitempty"`
+	AdditionalHeadersRef      *string          `json:"additionalHeadersRef,omitempty"`
+	ExpectedResponses         []int            `json:"expectedResponses,omitempty"`
+	AllowInsecureCertificates bool             `json:"allowInsecureCertificates,omitempty"`
+	Interval                  *metav1.Duration `json:"interval,omitempty"`
 }
 
 func (s *HealthCheckSpec) Validate() error {
@@ -243,7 +241,7 @@ func (s *HealthCheckSpec) Default() {
 	}
 
 	if s.Protocol == nil {
-		protocol := kuadrantdnsv1alpha1.HttpsProtocol
+		protocol := "HTTPS"
 		s.Protocol = &protocol
 	}
 }
@@ -311,7 +309,7 @@ func (p *DNSPolicy) WithTargetGateway(gwName string) *DNSPolicy {
 
 //HealthCheck
 
-func (p *DNSPolicy) WithHealthCheckFor(endpoint string, port *int, protocol kuadrantdnsv1alpha1.HealthProtocol, failureThreshold *int) *DNSPolicy {
+func (p *DNSPolicy) WithHealthCheckFor(endpoint string, port *int, protocol string, failureThreshold *int) *DNSPolicy {
 	return p.WithHealthCheck(HealthCheckSpec{
 		Endpoint:                  endpoint,
 		Port:                      port,

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
@@ -106,7 +106,7 @@ metadata:
     capabilities: Basic Install
     categories: Integration & Delivery
     containerImage: quay.io/kuadrant/kuadrant-operator:latest
-    createdAt: "2024-03-25T09:38:12Z"
+    createdAt: "2024-04-11T14:20:56Z"
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/Kuadrant/kuadrant-operator
@@ -262,6 +262,14 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - ""
+          resources:
+          - namespaces
+          verbs:
+          - get
+          - list
+          - watch
         - apiGroups:
           - extensions.istio.io
           resources:
@@ -347,24 +355,6 @@ spec:
           - get
           - patch
           - update
-        - apiGroups:
-          - kuadrant.io
-          resources:
-          - dnshealthcheckprobes
-          verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
-        - apiGroups:
-          - kuadrant.io
-          resources:
-          - dnshealthcheckprobes/status
-          verbs:
-          - get
         - apiGroups:
           - kuadrant.io
           resources:

diff --git a/bundle/manifests/kuadrant.io_dnspolicies.yaml b/bundle/manifests/kuadrant.io_dnspolicies.yaml
@@ -68,12 +68,7 @@ spec:
                   the listeners assigned to the target gateway
                 properties:
                   additionalHeadersRef:
-                    properties:
-                      name:
-                        type: string
-                    required:
-                    - name
-                    type: object
+                    type: string
                   allowInsecureCertificates:
                     type: boolean
                   endpoint:
@@ -89,8 +84,6 @@ spec:
                   port:
                     type: integer
                   protocol:
-                    description: HealthProtocol represents the protocol to use when
-                      making a health check request
                     type: string
                 type: object
               loadBalancing:

diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml
@@ -10,7 +10,7 @@ dependencies:
   - type: olm.package
     value:
       packageName: dns-operator
-      version: "0.1.0"
+      version: "0.0.0"
   - type: olm.package
     value:
       packageName: cert-manager

diff --git a/config/crd/bases/kuadrant.io_dnspolicies.yaml b/config/crd/bases/kuadrant.io_dnspolicies.yaml
@@ -67,12 +67,7 @@ spec:
                   the listeners assigned to the target gateway
                 properties:
                   additionalHeadersRef:
-                    properties:
-                      name:
-                        type: string
-                    required:
-                    - name
-                    type: object
+                    type: string
                   allowInsecureCertificates:
                     type: boolean
                   endpoint:
@@ -88,8 +83,6 @@ spec:
                   port:
                     type: integer
                   protocol:
-                    description: HealthProtocol represents the protocol to use when
-                      making a health check request
                     type: string
                 type: object
               loadBalancing:

diff --git a/config/dependencies/dns/kustomization.yaml b/config/dependencies/dns/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-- github.com/kuadrant/dns-operator/config/default?ref=v0.1.0
+- github.com/kuadrant/dns-operator/config/default?ref=main
 
 patches:
   - path: deployment_patch.yaml

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -110,6 +110,14 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - extensions.istio.io
   resources:
@@ -195,24 +203,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - kuadrant.io
-  resources:
-  - dnshealthcheckprobes
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kuadrant.io
-  resources:
-  - dnshealthcheckprobes/status
-  verbs:
-  - get
 - apiGroups:
   - kuadrant.io
   resources: