diff --git a/class/capi-provider-cloudscale.yml b/class/capi-provider-cloudscale.yml index af0a140..21bb0dd 100644 --- a/class/capi-provider-cloudscale.yml +++ b/class/capi-provider-cloudscale.yml @@ -6,7 +6,7 @@ parameters: input_type: jsonnet output_path: . - input_paths: - - ${_base_directory}/component/main.jsonnet + - ${_base_directory}/component/cloudscale-provider.jsonnet input_type: jsonnet output_path: ${_base_directory}/manifests/capi-provider-cloudscale/ - input_type: external diff --git a/component/main.jsonnet b/component/cloudscale-provider.jsonnet similarity index 95% rename from component/main.jsonnet rename to component/cloudscale-provider.jsonnet index 5275d50..76c8486 100644 --- a/component/main.jsonnet +++ b/component/cloudscale-provider.jsonnet @@ -1,6 +1,9 @@ local com = import 'lib/commodore.libjsonnet'; local kap = import 'lib/kapitan.libjsonnet'; local kube = import 'lib/kube.libjsonnet'; + +local capi = import 'lib/capi-core.libsonnet'; + local inv = kap.inventory(); // The hiera parameters for the component local params = inv.parameters.capi_provider_cloudscale; @@ -30,6 +33,7 @@ com.Kustomization( }, ], patchesStrategicMerge: [ 'rm-namespace.yaml' ], + patches: [ capi.kustomize_patch_crd_clusterctl_label.patch ], replacements: [ { source: { @@ -146,4 +150,4 @@ com.Kustomization( }, }, ], -} +} + capi.kustomize_patch_crd_clusterctl_label.patch_file diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 1d0adb9..dc616af 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -2,4 +2,9 @@ capi-provider-cloudscale is a Commodore component to manage capi-provider-cloudscale. +[TIP] +==== +The component labels all CRDs with `clusterctl.cluster.x-k8s.io=""` which is used by the cluster API `clusterctl` CLI when discovering cluster API resources on a cluster. +==== + See the xref:references/parameters.adoc[parameters] reference for further details. diff --git a/tests/defaults.yml b/tests/defaults.yml index 51ceae8..cf4d72d 100644 --- a/tests/defaults.yml +++ b/tests/defaults.yml @@ -3,4 +3,12 @@ applications: - capi-core -parameters: {} +parameters: + kapitan: + dependencies: + - type: https + source: https://raw.githubusercontent.com/projectsyn/component-capi-core/feat/enable-clusterctl/lib/capi-core.libsonnet + output_path: vendor/lib/capi-core.libsonnet + + capi_core: + namespace: syn-cluster-api diff --git a/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscaleclusters.infrastructure.cluster.x-k8s.io.yaml b/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscaleclusters.infrastructure.cluster.x-k8s.io.yaml index 47b3d6c..77ce4df 100644 --- a/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscaleclusters.infrastructure.cluster.x-k8s.io.yaml +++ b/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscaleclusters.infrastructure.cluster.x-k8s.io.yaml @@ -7,6 +7,7 @@ metadata: app.kubernetes.io/managed-by: commodore cluster.x-k8s.io/provider: infrastructure-cloudscale-ch-cloudscale cluster.x-k8s.io/v1beta2: v1beta2 + clusterctl.cluster.x-k8s.io: "" name: cloudscaleclusters.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io diff --git a/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscaleclustertemplates.infrastructure.cluster.x-k8s.io.yaml b/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscaleclustertemplates.infrastructure.cluster.x-k8s.io.yaml index 43a7cc0..1b6798e 100644 --- a/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscaleclustertemplates.infrastructure.cluster.x-k8s.io.yaml +++ b/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscaleclustertemplates.infrastructure.cluster.x-k8s.io.yaml @@ -7,6 +7,7 @@ metadata: app.kubernetes.io/managed-by: commodore cluster.x-k8s.io/provider: infrastructure-cloudscale-ch-cloudscale cluster.x-k8s.io/v1beta2: v1beta2 + clusterctl.cluster.x-k8s.io: "" name: cloudscaleclustertemplates.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io diff --git a/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscalemachines.infrastructure.cluster.x-k8s.io.yaml b/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscalemachines.infrastructure.cluster.x-k8s.io.yaml index 4d8d4da..234b07c 100644 --- a/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscalemachines.infrastructure.cluster.x-k8s.io.yaml +++ b/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscalemachines.infrastructure.cluster.x-k8s.io.yaml @@ -7,6 +7,7 @@ metadata: app.kubernetes.io/managed-by: commodore cluster.x-k8s.io/provider: infrastructure-cloudscale-ch-cloudscale cluster.x-k8s.io/v1beta2: v1beta2 + clusterctl.cluster.x-k8s.io: "" name: cloudscalemachines.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io diff --git a/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscalemachinetemplates.infrastructure.cluster.x-k8s.io.yaml b/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscalemachinetemplates.infrastructure.cluster.x-k8s.io.yaml index b33a40b..3ec7ddf 100644 --- a/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscalemachinetemplates.infrastructure.cluster.x-k8s.io.yaml +++ b/tests/golden/defaults/capi-provider-cloudscale/capi-provider-cloudscale/10_kustomize/apiextensions.k8s.io_v1_customresourcedefinition_cloudscalemachinetemplates.infrastructure.cluster.x-k8s.io.yaml @@ -7,6 +7,7 @@ metadata: app.kubernetes.io/managed-by: commodore cluster.x-k8s.io/provider: infrastructure-cloudscale-ch-cloudscale cluster.x-k8s.io/v1beta2: v1beta2 + clusterctl.cluster.x-k8s.io: "" name: cloudscalemachinetemplates.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io