Update to 1.18 of crossplane

Signed-off-by: Knut-Erik Johnsen <[email protected]>
crossplane · Nov 8, 2024 · 272e596 · 272e596
1 parent a2db617
commit 272e596
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 1,622 deletions.
diff --git a/...c/main/resources/kubernetes/apiextensions.crossplane.io_compositeresourcedefinitions.yaml b/...c/main/resources/kubernetes/apiextensions.crossplane.io_compositeresourcedefinitions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: compositeresourcedefinitions.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io
@@ -36,7 +36,6 @@ spec:
           A CompositeResourceDefinition defines the schema for a new custom Kubernetes
           API.
 
-
           Read the Crossplane documentation for
           [more information about CustomResourceDefinitions](https://docs.crossplane.io/latest/concepts/composite-resource-definitions).
         properties:
@@ -155,7 +154,6 @@ spec:
                               service is a reference to the service for this webhook. Either
                               service or url must be specified.
 
-
                               If the webhook is running within the cluster, then you should use `service`.
                             properties:
                               name:
@@ -189,29 +187,24 @@ spec:
                               (`scheme://host:port/path`). Exactly one of `url` or `service`
                               must be specified.
 
-
                               The `host` should not refer to a service running in the cluster; use
                               the `service` field instead. The host might be resolved via external
                               DNS in some apiservers (e.g., `kube-apiserver` cannot resolve
                               in-cluster DNS as that would be a layering violation). `host` may
                               also be an IP address.
 
-
                               Please note that using `localhost` or `127.0.0.1` as a `host` is
                               risky unless you take great care to run this webhook on all hosts
                               which run an apiserver which might need to make calls to this
                               webhook. Such installs are likely to be non-portable, i.e., not easy
                               to turn up in a new cluster.
 
-
                               The scheme must be "https"; the URL must begin with "https://".
 
-
                               A path is optional, and if present may be any string permissible in
                               a URL. You may use the path to pass an arbitrary string to the
                               webhook, for example, a cluster identifier.
 
-
                               Attempting to use a user or basic auth e.g. "user:password@" is not
                               allowed. Fragments ("#...") and query parameters ("?...") are not
                               allowed, either.

diff --git a/...model/src/main/resources/kubernetes/apiextensions.crossplane.io_compositionrevisions.yaml b/...model/src/main/resources/kubernetes/apiextensions.crossplane.io_compositionrevisions.yaml
diff --git a/...ane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_compositions.yaml b/...ane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_compositions.yaml
diff --git a/...d-model/src/main/resources/kubernetes/apiextensions.crossplane.io_environmentconfigs.yaml b/...d-model/src/main/resources/kubernetes/apiextensions.crossplane.io_environmentconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: environmentconfigs.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io
@@ -29,6 +29,47 @@ spec:
           An EnvironmentConfig contains user-defined unstructured values for
           use in a Composition.
 
+          Read the Crossplane documentation for
+          [more information about EnvironmentConfigs](https://docs.crossplane.io/latest/concepts/environment-configs).
+        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
+            type: string
+          data:
+            additionalProperties:
+              x-kubernetes-preserve-unknown-fields: true
+            description: |-
+              The data of this EnvironmentConfig.
+              This may contain any kind of structure that can be serialized into JSON.
+            type: object
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+        type: object
+    served: true
+    storage: false
+    subresources: {}
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          An EnvironmentConfig contains user-defined unstructured values for
+          use in a Composition.
 
           Read the Crossplane documentation for
           [more information about EnvironmentConfigs](https://docs.crossplane.io/latest/concepts/environment-configs).

diff --git a/crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_usages.yaml b/crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_usages.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: usages.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io
@@ -32,11 +32,9 @@ spec:
         description: |-
           A Usage defines a deletion blocking relationship between two resources.
 
-
           Usages prevent accidental deletion of a single resource or deletion of
           resources with dependent resources.
 
-
           Read the Crossplane documentation for
           [more information about Compositions](https://docs.crossplane.io/latest/concepts/usages).
         properties:

diff --git a/crossplane-crd-model/src/main/resources/kubernetes/fetch.sh b/crossplane-crd-model/src/main/resources/kubernetes/fetch.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-release="v1.17.1"
+release="v1.18.0"
 
 apiextensions=$(gh api --jq '.[].name' "/repos/crossplane/crossplane/contents/cluster/crds?ref=${release}" | grep apiextensions)
 

diff --git a/crossplane-protobuf-model/src/main/proto/fetch.sh b/crossplane-protobuf-model/src/main/proto/fetch.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-release="v1.17.1"
+release="v1.18.0"
 file="run_function.proto"
 gh api   -H "Accept: application/vnd.github.raw+json"  "/repos/crossplane/crossplane/contents/apis/apiextensions/fn/proto/v1/${file}?ref=${release}" > $file
 

diff --git a/crossplane-protobuf-model/src/main/proto/run_function.proto b/crossplane-protobuf-model/src/main/proto/run_function.proto
@@ -226,8 +226,11 @@ message Resource {
   // * A Function should set this field to READY_TRUE in a RunFunctionResponse
   //   to indicate that a desired composed resource is ready.
   //
-  // * A Function should not set this field in a RunFunctionResponse to indicate
-  //   that the desired composite resource is ready. This will be ignored.
+  // * A Function should set this field to READY_TRUE in a RunFunctionResponse
+  //   to indicate that a desired composite resource is ready.
+  //   This overwrites the standard readiness detection that determines the
+  //   ready state of the composite by the ready state of the the
+  //   composed resources.
   Ready ready = 3;
 }