Merge pull request #379 from containeroo/CO-71

Allow externally managed DNS records

Author: rxbn

LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     cloudflare-operator: Manage Cloudflare DNS records with Kubernetes objects.
-    Copyright (C) 2024  containeroo
+    Copyright (C) 2025  containeroo
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    cloudflare-operator  Copyright (C) 2024  containeroo
+    cloudflare-operator  Copyright (C) 2025  containeroo
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 1.3.1
+VERSION ?= 1.4.0
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -48,12 +48,12 @@ endif
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.34.2
+OPERATOR_SDK_VERSION ?= v1.39.1
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.30.1
+ENVTEST_K8S_VERSION = 1.32.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -121,7 +121,7 @@ test-e2e:
 	go test ./test/e2e/ -v -ginkgo.v
 
 GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.54.2
+GOLANGCI_LINT_VERSION ?= v1.63.4
 golangci-lint:
 	@[ -f $(GOLANGCI_LINT) ] || { \
 	set -e ;\
@@ -213,8 +213,8 @@ GEN_CRD_API_REFERENCE_DOCS ?= $(LOCALBIN)/gen-crd-api-reference-docs
 GEN_API_REF_DOCS_VERSION ?= f2b6666352402b0f00e81881f7f60b056a02f0e2
 
 ## Tool Versions
-KUSTOMIZE_VERSION ?= v5.2.1
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
+KUSTOMIZE_VERSION ?= v5.6.0
+CONTROLLER_TOOLS_VERSION ?= v0.17.1
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.

api/v1/account_types.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2024 containeroo
+Copyright 2025 containeroo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -35,27 +35,17 @@ type AccountSpec struct {
 	// +optional
 	Interval metav1.Duration `json:"interval,omitempty"`
 	// List of zone names that should be managed by cloudflare-operator
+	// Deprecated and will be removed in a future release
 	// +optional
+	// +deprecated
 	ManagedZones []string `json:"managedZones,omitempty"`
 }
 
-type AccountStatusZones struct {
-	// Name of the zone
-	// +optional
-	Name string `json:"name,omitempty"`
-	// ID of the zone
-	// +optional
-	ID string `json:"id,omitempty"`
-}
-
 // AccountStatus defines the observed state of Account
 type AccountStatus struct {
 	// Conditions contains the different condition statuses for the Account object.
 	// +optional
 	Conditions []metav1.Condition `json:"conditions"`
-	// Zones contains all the zones of the Account
-	// +optional
-	Zones []AccountStatusZones `json:"zones,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/v1/dnsrecord_types.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2024 containeroo
+Copyright 2025 containeroo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

api/v1/doc.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2024 containeroo
+Copyright 2025 containeroo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

api/v1/groupversion_info.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2024 containeroo
+Copyright 2025 containeroo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

api/v1/ip_types.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2024 containeroo
+Copyright 2025 containeroo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

api/v1/zone_types.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2024 containeroo
+Copyright 2025 containeroo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,8 +24,10 @@ import (
 type ZoneSpec struct {
 	// Name of the zone
 	Name string `json:"name"`
-	// ID of the zone
-	ID string `json:"id"`
+	// Prune determines whether DNS records in the zone that are not managed by Kubernetes should be automatically removed
+	// +kubebuilder:default=true
+	// +optional
+	Prune bool `json:"prune"`
 	// Interval to check zone status
 	// +kubebuilder:default="5m"
 	// +optional
@@ -34,6 +36,9 @@ type ZoneSpec struct {
 
 // ZoneStatus defines the observed state of Zone
 type ZoneStatus struct {
+	// ID of the zone
+	// +optional
+	ID string `json:"id,omitempty"`
 	// Conditions contains the different condition statuses for the Zone object.
 	// +optional
 	Conditions []metav1.Condition `json:"conditions"`
@@ -45,7 +50,7 @@ type ZoneStatus struct {
 
 // Zone is the Schema for the zones API
 // +kubebuilder:printcolumn:name="Zone Name",type="string",JSONPath=".spec.name"
-// +kubebuilder:printcolumn:name="ID",type="string",JSONPath=".spec.id"
+// +kubebuilder:printcolumn:name="ID",type="string",JSONPath=".status.id"
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=`.status.conditions[?(@.type == "Ready")].status`
 type Zone struct {
 	metav1.TypeMeta   `json:",inline"`

api/v1/zz_generated.deepcopy.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2024 containeroo
+Copyright 2025 containeroo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.