fix: up crossplane to v2

Author: devthejo

README.md

@@ -52,7 +52,7 @@ graph TD
 
 ### Prerequisites
 
-- Kubernetes cluster with Crossplane installed
+- Kubernetes cluster with Crossplane v2.0.0 or later installed
 - Helm 3+
 
 ### Installing the Helm Chart
@@ -193,7 +193,7 @@ task clean-test-env
 The tests:
 
 1. Set up a Kind cluster with a local registry
-2. Install Crossplane
+2. Install Crossplane v2.x
 3. Deploy the XFuncJS server
 4. Apply test compositions and resources
 5. Verify that the resources are created correctly

charts/crossplane-function-js/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: crossplane-function-js
-description: A Helm chart for Crossplane Function JS
+description: A Helm chart for Crossplane Function JS with Crossplane v2 compatibility
 type: application
 version: 0.0.29
 appVersion: 0.0.29

charts/crossplane-function-js/templates/deploymentruntimeconfig.yaml

@@ -7,17 +7,31 @@ spec:
     spec:
       selector:
         matchLabels:
-          pkg.crossplane.io/function: function-xfuncjs
+          pkg.crossplane.io/function: {{ .Values.function.name }}
       template:
         metadata:
           labels:
-            pkg.crossplane.io/function: function-xfuncjs
+            pkg.crossplane.io/function: {{ .Values.function.name }}
         spec:
+          serviceAccountName: {{ .Values.function.name }}
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 65532
           volumes:
             - name: tmp
               emptyDir: {}
           containers:
             - name: package-runtime
+              image: {{ .Values.function.package.repository }}/{{ .Values.function.package.name }}:{{ if .Values.function.package.tag }}{{ .Values.function.package.tag | toString }}{{ else }}v{{ .Chart.AppVersion }}{{ end }}
+              imagePullPolicy: {{ .Values.function.pullPolicy }}
+              securityContext:
+                runAsNonRoot: true
+                runAsUser: 65532
+                allowPrivilegeEscalation: false
+                readOnlyRootFilesystem: true
+                capabilities:
+                  drop:
+                  - ALL
               volumeMounts:
                 - name: tmp
                   mountPath: /tmp

charts/crossplane-function-js/templates/function.yaml

@@ -5,10 +5,13 @@ metadata:
   labels:
     {{- include "xfuncjs.labels" . | nindent 4 }}
 spec:
-  package: {{ .Values.function.package.repository }}/{{ .Values.function.package.name }}:{{ if .Values.function.package.tag }}{{ .Values.function.package.tag }}{{ else }}v{{ .Chart.AppVersion }}{{ end }}
+  package: {{ .Values.function.package.repository }}/{{ .Values.function.package.name }}:{{ if .Values.function.package.tag }}{{ .Values.function.package.tag | toString }}{{ else }}v{{ .Chart.AppVersion }}{{ end }}
   packagePullPolicy: {{ .Values.function.pullPolicy }}
   runtimeConfigRef:
     apiVersion: pkg.crossplane.io/v1beta1
     kind: DeploymentRuntimeConfig
     name: {{ .Values.runtimeConfig.name }}
+  revisionActivationPolicy: Automatic
+  revisionHistoryLimit: 1
+  skipDependencyResolution: false
 

charts/crossplane-function-js/templates/serviceaccount.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Values.function.name }}
+  namespace: crossplane-system
+  labels:
+    {{- include "xfuncjs.labels" . | nindent 4 }}

crossplane.yaml

@@ -1,4 +1,4 @@
-apiVersion: meta.pkg.crossplane.io/v1alpha1
+apiVersion: meta.pkg.crossplane.io/v1
 kind: Function
 metadata:
   name: function-xfuncjs

go.mod

@@ -1,6 +1,8 @@
 module github.com/socialgouv/xfuncjs-server
 
-go 1.23.7
+go 1.24.0
+
+toolchain go1.24.7
 
 require (
 	github.com/crossplane/crossplane-runtime v1.18.0
@@ -10,8 +12,8 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	google.golang.org/grpc v1.71.1
 	google.golang.org/protobuf v1.36.6
-	k8s.io/apimachinery v0.32.3
-	k8s.io/client-go v0.32.3
+	k8s.io/apimachinery v0.33.0
+	k8s.io/client-go v0.33.0
 	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
 	sigs.k8s.io/yaml v1.4.0
 )
@@ -20,20 +22,19 @@ require (
 	dario.cat/mergo v1.0.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch v5.9.11+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
-	github.com/fatih/color v1.17.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-json-experiment/json v0.0.0-20240815175050-ebd3a8989ca1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/gobuffalo/flect v1.0.2 // indirect
+	github.com/gobuffalo/flect v1.0.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -45,28 +46,31 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cobra v1.8.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/cobra v1.9.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/oauth2 v0.25.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/term v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.7.0 // indirect
-	golang.org/x/tools v0.26.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/oauth2 v0.27.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/term v0.31.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
+	golang.org/x/time v0.9.0 // indirect
+	golang.org/x/tools v0.32.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.32.3 // indirect
-	k8s.io/apiextensions-apiserver v0.31.0 // indirect
+	k8s.io/api v0.33.0 // indirect
+	k8s.io/apiextensions-apiserver v0.33.0 // indirect
+	k8s.io/code-generator v0.33.0 // indirect
+	k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
 	sigs.k8s.io/controller-runtime v0.19.0 // indirect
-	sigs.k8s.io/controller-tools v0.16.0 // indirect
+	sigs.k8s.io/controller-tools v0.18.0 // indirect
 	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
 )