From 4b367c8055dcf0de6e3a21610ab5b1e1d7001d1b Mon Sep 17 00:00:00 2001 From: Robin Scherrer <43877944+rxbn@users.noreply.github.com> Date: Sun, 9 Feb 2025 08:19:40 +0100 Subject: [PATCH] Update cloudflare-operator.io resources (#463) --- cloudflare-operator.io/account_v1.json | 24 +++--------------------- cloudflare-operator.io/dnsrecord_v1.json | 6 +++--- cloudflare-operator.io/ip_v1.json | 5 ++--- cloudflare-operator.io/zone_v1.json | 18 +++++++++++------- 4 files changed, 19 insertions(+), 34 deletions(-) diff --git a/cloudflare-operator.io/account_v1.json b/cloudflare-operator.io/account_v1.json index 5d646ffd..47174f9c 100644 --- a/cloudflare-operator.io/account_v1.json +++ b/cloudflare-operator.io/account_v1.json @@ -47,7 +47,7 @@ "type": "string" }, "managedZones": { - "description": "List of zone names that should be managed by cloudflare-operator", + "description": "List of zone names that should be managed by cloudflare-operator\nDeprecated and will be removed in a future release", "items": { "type": "string" }, @@ -66,7 +66,7 @@ "conditions": { "description": "Conditions contains the different condition statuses for the Account object.", "items": { - "description": "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}", + "description": "Condition contains details for one aspect of the current state of this API Resource.", "properties": { "lastTransitionTime": { "description": "lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", @@ -101,7 +101,7 @@ "type": "string" }, "type": { - "description": "type of condition in CamelCase or in foo.example.com/CamelCase.\n---\nMany .condition.type values are consistent across resources like Available, but because arbitrary conditions can be\nuseful (see .node.status.conditions), the ability to deconflict is important.\nThe regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)", + "description": "type of condition in CamelCase or in foo.example.com/CamelCase.", "maxLength": 316, "pattern": "^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$", "type": "string" @@ -118,24 +118,6 @@ "additionalProperties": false }, "type": "array" - }, - "zones": { - "description": "Zones contains all the zones of the Account", - "items": { - "properties": { - "id": { - "description": "ID of the zone", - "type": "string" - }, - "name": { - "description": "Name of the zone", - "type": "string" - } - }, - "type": "object", - "additionalProperties": false - }, - "type": "array" } }, "type": "object", diff --git a/cloudflare-operator.io/dnsrecord_v1.json b/cloudflare-operator.io/dnsrecord_v1.json index 7505a97f..7fdfdec2 100644 --- a/cloudflare-operator.io/dnsrecord_v1.json +++ b/cloudflare-operator.io/dnsrecord_v1.json @@ -57,7 +57,7 @@ }, "ttl": { "default": 1, - "description": "Time to live, in seconds, of the DNS record. Must be between 60 and 86400, or 1 for 'automatic' (e.g. 3600)", + "description": "Time to live, in seconds, of the DNS record. Must be between 60 and 86400, or 1 for \"automatic\" (e.g. 3600)", "maximum": 86400, "minimum": 1, "type": "integer" @@ -80,7 +80,7 @@ "conditions": { "description": "Conditions contains the different condition statuses for the DNSRecord object.", "items": { - "description": "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}", + "description": "Condition contains details for one aspect of the current state of this API Resource.", "properties": { "lastTransitionTime": { "description": "lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", @@ -115,7 +115,7 @@ "type": "string" }, "type": { - "description": "type of condition in CamelCase or in foo.example.com/CamelCase.\n---\nMany .condition.type values are consistent across resources like Available, but because arbitrary conditions can be\nuseful (see .node.status.conditions), the ability to deconflict is important.\nThe regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)", + "description": "type of condition in CamelCase or in foo.example.com/CamelCase.", "maxLength": 316, "pattern": "^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$", "type": "string" diff --git a/cloudflare-operator.io/ip_v1.json b/cloudflare-operator.io/ip_v1.json index 91f9aeee..193d83e5 100644 --- a/cloudflare-operator.io/ip_v1.json +++ b/cloudflare-operator.io/ip_v1.json @@ -60,7 +60,6 @@ "additionalProperties": false }, "requestMethod": { - "default": "GET", "description": "RequestMethod defines the HTTP method to be used", "enum": [ "GET", @@ -103,7 +102,7 @@ "conditions": { "description": "Conditions contains the different condition statuses for the IP object.", "items": { - "description": "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}", + "description": "Condition contains details for one aspect of the current state of this API Resource.", "properties": { "lastTransitionTime": { "description": "lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", @@ -138,7 +137,7 @@ "type": "string" }, "type": { - "description": "type of condition in CamelCase or in foo.example.com/CamelCase.\n---\nMany .condition.type values are consistent across resources like Available, but because arbitrary conditions can be\nuseful (see .node.status.conditions), the ability to deconflict is important.\nThe regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)", + "description": "type of condition in CamelCase or in foo.example.com/CamelCase.", "maxLength": 316, "pattern": "^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$", "type": "string" diff --git a/cloudflare-operator.io/zone_v1.json b/cloudflare-operator.io/zone_v1.json index 7198cff8..8d33d398 100644 --- a/cloudflare-operator.io/zone_v1.json +++ b/cloudflare-operator.io/zone_v1.json @@ -15,10 +15,6 @@ "spec": { "description": "ZoneSpec defines the desired state of Zone", "properties": { - "id": { - "description": "ID of the zone", - "type": "string" - }, "interval": { "default": "5m", "description": "Interval to check zone status", @@ -27,10 +23,14 @@ "name": { "description": "Name of the zone", "type": "string" + }, + "prune": { + "default": false, + "description": "Prune determines whether DNS records in the zone that are not managed by cloudflare-operator should be automatically removed", + "type": "boolean" } }, "required": [ - "id", "name" ], "type": "object", @@ -42,7 +42,7 @@ "conditions": { "description": "Conditions contains the different condition statuses for the Zone object.", "items": { - "description": "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}", + "description": "Condition contains details for one aspect of the current state of this API Resource.", "properties": { "lastTransitionTime": { "description": "lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", @@ -77,7 +77,7 @@ "type": "string" }, "type": { - "description": "type of condition in CamelCase or in foo.example.com/CamelCase.\n---\nMany .condition.type values are consistent across resources like Available, but because arbitrary conditions can be\nuseful (see .node.status.conditions), the ability to deconflict is important.\nThe regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)", + "description": "type of condition in CamelCase or in foo.example.com/CamelCase.", "maxLength": 316, "pattern": "^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$", "type": "string" @@ -94,6 +94,10 @@ "additionalProperties": false }, "type": "array" + }, + "id": { + "description": "ID of the zone", + "type": "string" } }, "type": "object",