Crossplane v2

.golangci.yml

@@ -38,7 +38,7 @@ linters-settings:
   goimports:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
-    local-prefixes: github.com/mistermx/crossbuilder
+    local-prefixes: github.com/mistermx/crossbuilder/v2
 
   gocyclo:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)

Makefile

@@ -54,7 +54,7 @@ LD_FLAGS=-ldflags " \
     "
 .PHONY: build
 build: ## Build the project locally
-	go build $(LD_FLAGS) -o bin/kubebuilder ./cmd
+	go build $(LD_FLAGS) -o bin/xrd-gen ./cmd/xrd-gen/main.go
 
 .PHONY: install
 install: build ## Build and install the binary with the current source code. Use it to test your changes locally.

cmd/xrd-gen/main.go

@@ -30,7 +30,7 @@ import (
 	"sigs.k8s.io/controller-tools/pkg/markers"
 	"sigs.k8s.io/controller-tools/pkg/version"
 
-	"github.com/mistermx/crossbuilder/pkg/generate/xrd"
+	"github.com/mistermx/crossbuilder/v2/pkg/generate/xrd"
 )
 
 //go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen/ generate paths=../../pkg/... generate:headerFile=../../hack/boilerplate.go.txt,year=2022

examples/composition-gen/cmd/generate/generate.go

@@ -3,8 +3,8 @@ package main
 import (
 	"log"
 
-	"github.com/mistermx/crossbuilder/examples/composition-gen/compositions/example"
-	"github.com/mistermx/crossbuilder/pkg/generate/composition/build"
+	"github.com/mistermx/crossbuilder/v2/examples/composition-gen/compositions/example"
+	"github.com/mistermx/crossbuilder/v2/pkg/generate/composition/build"
 )
 
 func main() {

examples/composition-gen/compositions/example/example.go

@@ -1,13 +1,10 @@
 package example
 
 import (
-	"reflect"
-
-	xv1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
-
-	"github.com/mistermx/crossbuilder/examples/xrd-gen/apis/v1alpha1"
-	"github.com/mistermx/crossbuilder/pkg/generate/composition/build"
+	"github.com/crossplane/crossplane/v2/apis/apiextensions/v1"
+	"github.com/mistermx/crossbuilder/v2/examples/xrd-gen/apis/v1alpha1"
+	"github.com/mistermx/crossbuilder/v2/pkg/generate/composition/build"
+	"k8s.io/utils/ptr"
 )
 
 type ExampleBuilder struct{}
@@ -20,54 +17,14 @@ func (b *ExampleBuilder) GetCompositeTypeRef() build.ObjectKindReference {
 }
 
 func (b *ExampleBuilder) Build(c build.CompositionSkeleton) {
-	c.WithName("example")
-
 	c.
-		NewResource(build.ObjectKindReference{
-			GroupVersionKind: rbacv1.SchemeGroupVersion.WithKind(reflect.TypeOf(rbacv1.ClusterRole{}).Name()),
-			Object: &rbacv1.ClusterRole{
-				Rules: []rbacv1.PolicyRule{
-					{
-						Verbs:     []string{"GET"},
-						APIGroups: []string{"v1"},
-						Resources: []string{""}, // patched
-					},
-					{
-						Verbs:         []string{"GET"},
-						APIGroups:     []string{"v1"},
-						ResourceNames: []string{""}, // patched
-					},
-				},
-			},
-		}).
-		RegisterLabels(
-			"crossplane.io/claim-namespace",
-			"crossplane.io/claim-name",
-		).
 		WithName("cluster-role").
-		WithPatches(
-			simplePatch(
-				"spec.parameters.exampleField",
-				"rules[0].resources[0]",
-			),
-			simplePatch(
-				"spec.providerConfigRef.name",
-				"rules[1].resourceNames[0]",
-			),
-			simplePatch(
-				"metadata.labels[crossplane.io/claim-namespace]",
-				"metadata.labels[crossplane.io/claim-namespace]",
-			),
-			simplePatch(
-				"metadata.labels[crossplane.io/claim-name]",
-				"metadata.labels[crossplane.io/claim-name]",
-			),
-		)
-}
-
-func simplePatch(from, to string) xv1.Patch {
-	return xv1.Patch{
-		FromFieldPath: &from,
-		ToFieldPath:   &to,
-	}
+		WithWriteConnectionSecretsToNamespace(ptr.To("example-namespace")).
+		WithPipelineSteps(
+			v1.PipelineStep{
+				Step: "example-step",
+				FunctionRef: v1.FunctionReference{
+					Name: "example-function",
+				},
+		})
 }

examples/composition-gen/package/compositions/cluster-role.yaml

@@ -0,0 +1,14 @@
+apiVersion: apiextensions.crossplane.io/v1
+kind: Composition
+metadata:
+  name: cluster-role
+spec:
+  compositeTypeRef:
+    apiVersion: test.example.com/v1alpha1
+    kind: XExample
+  mode: Pipeline
+  pipeline:
+  - functionRef:
+      name: example-function
+    step: example-step
+  writeConnectionSecretsToNamespace: example-namespace

examples/xrd-gen/apis/v1alpha1/example_types.go

@@ -1,7 +1,7 @@
 package v1alpha1
 
 import (
-	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
+	xpv1 "github.com/crossplane/crossplane-runtime/v2/apis/common/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -24,9 +24,8 @@ type XExampleStatus struct {
 // +genclient
 // +genclient:nonNamespaced
 
-// +kubebuilder:resource:scope=Cluster,categories=crossplane
+// +kubebuilder:resource:scope=Namespaced,categories=crossplane
 // +kubebuilder:subresource:status
-// +crossbuilder:generate:xrd:claimNames:kind=Example,plural=examples
 // +crossbuilder:generate:xrd:defaultCompositionRef:name=example-composition
 // +crossbuilder:generate:xrd:enforcedCompositionRef:name=example-composition-2
 // +crossbuilder:generate:xrd:connectionSecretKeys={username,password}