Rename from extra to required resources. Add support for bootstrap requirements for functions. Add support for ttl for function responses. Better flexibility in the registration of functions

Signed-off-by: Knut-Erik Johnsen <knut-erik.johnsen@klp.no>

Author: knutejohKLP

crossplane-crd-model/src/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.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: compositeresourcedefinitions.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io

crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_compositionrevisions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: compositionrevisions.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io

crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_compositions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: compositions.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io

crossplane-crd-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.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: environmentconfigs.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io

crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_managedresourceactivationpolicies.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: managedresourceactivationpolicies.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io

crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_managedresourcedefinitions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: managedresourcedefinitions.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io

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.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: usages.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io

crossplane-function-base/src/main/java/io/crossplane/compositefunctions/base/CrossplaneCompositeFunctionBase.java

@@ -1,8 +1,10 @@
 package io.crossplane.compositefunctions.base;
 
 
+import com.google.protobuf.Duration;
 import io.crossplane.compositefunctions.protobuf.v1.FunctionRunnerServiceGrpc;
 import io.crossplane.compositefunctions.protobuf.v1.Requirements;
+import io.crossplane.compositefunctions.protobuf.v1.ResponseMeta;
 import io.crossplane.compositefunctions.protobuf.v1.RunFunctionRequest;
 import io.crossplane.compositefunctions.protobuf.v1.RunFunctionResponse;
 import io.crossplane.compositefunctions.protobuf.v1.State;
@@ -33,7 +35,7 @@ public void runFunction(RunFunctionRequest request, StreamObserver<RunFunctionRe
             desiredBuilder.putAllResources(desired.getResourcesMap());
 
             CrossplaneFunctionRequest crossplaneFunctionRequest = new CrossplaneFunctionRequest(request.getObserved(),
-                    request.getExtraResourcesMap(), request.getCredentialsMap(),  request.getDesired());
+                    request.getRequiredResourcesMap(), request.getCredentialsMap(),  request.getDesired());
 
 
             logger.debug("Calling method with implemented logic");
@@ -49,7 +51,7 @@ public void runFunction(RunFunctionRequest request, StreamObserver<RunFunctionRe
 
             if (! crossplaneFunctionResponse.resourceSelectors().isEmpty()) {
                 Requirements requirements = Requirements.newBuilder()
-                        .putAllExtraResources(crossplaneFunctionResponse.resourceSelectors())
+                        .putAllResources(crossplaneFunctionResponse.resourceSelectors())
                         .build();
                 responseBuilder.setRequirements(requirements);
             }
@@ -62,6 +64,14 @@ public void runFunction(RunFunctionRequest request, StreamObserver<RunFunctionRe
                 responseBuilder.addAllConditions(crossplaneFunctionResponse.conditions());
             }
 
+            if (crossplaneFunctionResponse.ttl() > 0) {
+                ResponseMeta.Builder responseMetaBuilder = ResponseMeta.newBuilder();
+                Duration.Builder durationBuilder = Duration.newBuilder();
+                durationBuilder.setSeconds(crossplaneFunctionResponse.ttl());
+                responseMetaBuilder.setTtl(durationBuilder);
+                responseBuilder.setMeta(responseMetaBuilder);
+            }
+
             if (desiredBuilder.getResourcesCount() > 0) {
                 responseBuilder.setDesired(desiredBuilder.build());
             }

crossplane-function-base/src/main/java/io/crossplane/compositefunctions/base/CrossplaneFunctionResponse.java

@@ -14,10 +14,13 @@
  * @param desiredResources Map of the desired resources
  * @param resourceSelectors Map of the resource selectors for any extra resources
  * @param results List of the results
+ * @param conditions List of the conditions of the function response
+ * @param ttl Time to live for the response in positive seconds. This is an alpha feature, and needs to be explicitly enabled in Crossplane.
  */
 public record CrossplaneFunctionResponse(Map<String, Object> desiredResources,
                                          Map<String, ResourceSelector> resourceSelectors,
-                                         List<Result> results, List<Condition> conditions) {
+                                         List<Result> results, List<Condition> conditions,
+                                         long ttl) {
 
     //
     //
@@ -27,6 +30,6 @@ public record CrossplaneFunctionResponse(Map<String, Object> desiredResources,
      * Create an empty response with all fields initiated
       */
     public CrossplaneFunctionResponse() {
-        this(new HashMap<>(), new HashMap<>(), new ArrayList<>(), new ArrayList<>());
+        this(new HashMap<>(), new HashMap<>(), new ArrayList<>(), new ArrayList<>(), 0);
     }
 }

crossplane-function-springboot-starter/src/main/java/io/crossplane/compositefunctions/starter/conversion/CrossplaneExtraResourcesService.java

@@ -24,6 +24,7 @@
  * Commented out in 1.14
  *
  * @since 1.15
+ * @deprecated Use CrossplaneRequiredResourcesService instead since resource has been renamed from extra to required
  */
 public class CrossplaneExtraResourcesService {