update cilium CRDs for 1.16.0 release (#365)

datreeio · Aug 11, 2024 · f0c7285 · f0c7285
1 parent dc68967
commit f0c7285
Show file tree

Hide file tree

Showing 10 changed files with 2,850 additions and 494 deletions.
diff --git a/cilium.io/ciliumcidrgroup_v2alpha1.json b/cilium.io/ciliumcidrgroup_v2alpha1.json
@@ -18,7 +18,7 @@
           "description": "ExternalCIDRs is a list of CIDRs selecting peers outside the clusters.",
           "items": {
             "description": "CIDR specifies a block of IP addresses. Example: 192.0.2.1/32",
-            "pattern": "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\/([0-9]|[1-2][0-9]|3[0-2])$|^s*((([0-9A-Fa-f]{1,4}:){7}(:|([0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){6}:([0-9A-Fa-f]{1,4})?)|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){0,1}):([0-9A-Fa-f]{1,4})?))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){0,2}):([0-9A-Fa-f]{1,4})?))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){0,3}):([0-9A-Fa-f]{1,4})?))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){0,4}):([0-9A-Fa-f]{1,4})?))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){0,5}):([0-9A-Fa-f]{1,4})?))|(:(:|((:[0-9A-Fa-f]{1,4}){1,7}))))(%.+)?s*/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])$",
+            "format": "cidr",
             "type": "string"
           },
           "minItems": 0,

diff --git a/cilium.io/ciliumclusterwidenetworkpolicy_v2.json b/cilium.io/ciliumclusterwidenetworkpolicy_v2.json
diff --git a/cilium.io/ciliumendpoint_v2.json b/cilium.io/ciliumendpoint_v2.json
@@ -97,12 +97,16 @@
         "external-identifiers": {
           "description": "ExternalIdentifiers is a set of identifiers to identify the endpoint apart from the pod name. This includes container runtime IDs.",
           "properties": {
+            "cni-attachment-id": {
+              "description": "ID assigned to this attachment by container runtime",
+              "type": "string"
+            },
             "container-id": {
-              "description": "ID assigned by container runtime",
+              "description": "ID assigned by container runtime (deprecated, may not be unique)",
               "type": "string"
             },
             "container-name": {
-              "description": "Name assigned to container",
+              "description": "Name assigned to container (deprecated, may not be unique)",
               "type": "string"
             },
             "docker-endpoint-id": {
@@ -114,15 +118,15 @@
               "type": "string"
             },
             "k8s-namespace": {
-              "description": "K8s namespace for this endpoint",
+              "description": "K8s namespace for this endpoint (deprecated, may not be unique)",
               "type": "string"
             },
             "k8s-pod-name": {
-              "description": "K8s pod name for this endpoint",
+              "description": "K8s pod name for this endpoint (deprecated, may not be unique)",
               "type": "string"
             },
             "pod-name": {
-              "description": "K8s pod for this endpoint(Deprecated, use K8sPodName and K8sNamespace instead)",
+              "description": "K8s pod for this endpoint (deprecated, may not be unique)",
               "type": "string"
             }
           },

diff --git a/cilium.io/ciliumidentity_v2.json b/cilium.io/ciliumidentity_v2.json
@@ -1,5 +1,5 @@
 {
-  "description": "CiliumIdentity is a CRD that represents an identity managed by Cilium. It is intended as a backing store for identity allocation, acting as the global coordination backend, and can be used in place of a KVStore (such as etcd). The name of the CRD is the numeric identity and the labels on the CRD object are the kubernetes sourced labels seen by cilium. This is currently the only label source possible when running under kubernetes. Non-kubernetes labels are filtered but all labels, from all sources, are places in the SecurityLabels field. These also include the source and are used to define the identity. The labels under metav1.ObjectMeta can be used when searching for CiliumIdentity instances that include particular labels. This can be done with invocations such as: \n \tkubectl get ciliumid -l 'foo=bar'",
+  "description": "CiliumIdentity is a CRD that represents an identity managed by Cilium. It is intended as a backing store for identity allocation, acting as the global coordination backend, and can be used in place of a KVStore (such as etcd). The name of the CRD is the numeric identity and the labels on the CRD object are the kubernetes sourced labels seen by cilium. This is currently the only label source possible when running under kubernetes. Non-kubernetes labels are filtered but all labels, from all sources, are places in the SecurityLabels field. These also include the source and are used to define the identity. The labels under metav1.ObjectMeta can be used when searching for CiliumIdentity instances that include particular labels. This can be done with invocations such as: \n kubectl get ciliumid -l 'foo=bar'",
   "properties": {
     "apiVersion": {
       "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",

diff --git a/cilium.io/ciliuml2announcementpolicy_v2alpha1.json b/cilium.io/ciliuml2announcementpolicy_v2alpha1.json
@@ -57,7 +57,8 @@
                     "items": {
                       "type": "string"
                     },
-                    "type": "array"
+                    "type": "array",
+                    "x-kubernetes-list-type": "atomic"
                   }
                 },
                 "required": [
@@ -67,7 +68,8 @@
                 "type": "object",
                 "additionalProperties": false
               },
-              "type": "array"
+              "type": "array",
+              "x-kubernetes-list-type": "atomic"
             },
             "matchLabels": {
               "additionalProperties": {
@@ -84,7 +86,7 @@
           "additionalProperties": false
         },
         "serviceSelector": {
-          "description": "ServiceSelector selects a set of services which will be announced over L2 networks \n If nil this policy applies to all services.",
+          "description": "ServiceSelector selects a set of services which will be announced over L2 networks. The loadBalancerClass for a service must be nil or specify a supported class, e.g. \"io.cilium/l2-announcer\". Refer to the following document for additional details regarding load balancer classes: \n https://kubernetes.io/docs/concepts/services-networking/service/#load-balancer-class \n If nil this policy applies to all services.",
           "properties": {
             "matchExpressions": {
               "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.",
@@ -110,7 +112,8 @@
                     "items": {
                       "type": "string"
                     },
-                    "type": "array"
+                    "type": "array",
+                    "x-kubernetes-list-type": "atomic"
                   }
                 },
                 "required": [
@@ -120,7 +123,8 @@
                 "type": "object",
                 "additionalProperties": false
               },
-              "type": "array"
+              "type": "array",
+              "x-kubernetes-list-type": "atomic"
             },
             "matchLabels": {
               "additionalProperties": {
@@ -146,7 +150,7 @@
         "conditions": {
           "description": "Current service state",
           "items": {
-            "description": "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n \ttype FooStatus struct{ \t    // Represents the observations of a foo's current state. \t    // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" \t    // +patchMergeKey=type \t    // +patchStrategy=merge \t    // +listType=map \t    // +listMapKey=type \t    Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n \t    // other fields \t}",
+            "description": "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }",
             "properties": {
               "lastTransitionTime": {
                 "description": "lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.",

diff --git a/cilium.io/ciliumloadbalancerippool_v2alpha1.json b/cilium.io/ciliumloadbalancerippool_v2alpha1.json
@@ -15,23 +15,33 @@
     "spec": {
       "description": "Spec is a human readable description for a BGP load balancer ip pool.",
       "properties": {
-        "cidrs": {
-          "description": "CiliumLoadBalancerIPPoolCIDRBlock is a list of CIDRs comprising this IP Pool",
+        "allowFirstLastIPs": {
+          "description": "AllowFirstLastIPs, if set to `yes` means that the first and last IPs of each CIDR will be allocatable. If `no` or undefined, these IPs will be reserved. This field is ignored for /{31,32} and /{127,128} CIDRs since reserving the first and last IPs would make the CIDRs unusable.",
+          "enum": [
+            "Yes",
+            "No"
+          ],
+          "type": "string"
+        },
+        "blocks": {
+          "description": "Blocks is a list of CIDRs comprising this IP Pool",
           "items": {
-            "description": "CiliumLoadBalancerIPPoolCIDRBlock describes a single CIDR block.",
+            "description": "CiliumLoadBalancerIPPoolIPBlock describes a single IP block.",
             "properties": {
               "cidr": {
                 "format": "cidr",
                 "type": "string"
+              },
+              "start": {
+                "type": "string"
+              },
+              "stop": {
+                "type": "string"
               }
             },
-            "required": [
-              "cidr"
-            ],
             "type": "object",
             "additionalProperties": false
           },
-          "minItems": 1,
           "type": "array"
         },
         "disabled": {
@@ -66,7 +76,8 @@
                     "items": {
                       "type": "string"
                     },
-                    "type": "array"
+                    "type": "array",
+                    "x-kubernetes-list-type": "atomic"
                   }
                 },
                 "required": [
@@ -76,7 +87,8 @@
                 "type": "object",
                 "additionalProperties": false
               },
-              "type": "array"
+              "type": "array",
+              "x-kubernetes-list-type": "atomic"
             },
             "matchLabels": {
               "additionalProperties": {
@@ -93,9 +105,6 @@
           "additionalProperties": false
         }
       },
-      "required": [
-        "cidrs"
-      ],
       "type": "object",
       "additionalProperties": false
     },
@@ -105,7 +114,7 @@
         "conditions": {
           "description": "Current service state",
           "items": {
-            "description": "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n \ttype FooStatus struct{ \t    // Represents the observations of a foo's current state. \t    // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" \t    // +patchMergeKey=type \t    // +patchStrategy=merge \t    // +listType=map \t    // +listMapKey=type \t    Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n \t    // other fields \t}",
+            "description": "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }",
             "properties": {
               "lastTransitionTime": {
                 "description": "lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.",