From e2726f56356b7e9906772bd54690c28d42258af9 Mon Sep 17 00:00:00 2001 From: Hasan Turken <turkenh@gmail.com> Date: Tue, 22 Nov 2022 10:05:42 +0300 Subject: [PATCH] Use upbound.io in the API group Signed-off-by: Hasan Turken <turkenh@gmail.com> --- README.md | 4 ++-- apis/v1beta1/doc.go | 2 +- apis/v1beta1/register.go | 2 +- docs/Configuration.md | 12 ++++++------ docs/Quickstart.md | 6 +++--- examples/aws-eks-irsa-seup.yaml | 2 +- examples/observe-only-composition/composition.yaml | 2 +- examples/providerconfig-aws.yaml | 2 +- examples/providerconfig.yaml | 2 +- examples/workspace-inline.yaml | 2 +- examples/workspace-remote.yaml | 2 +- ...nfigs.yaml => tf.upbound.io_providerconfigs.yaml} | 4 ++-- ....yaml => tf.upbound.io_providerconfigusages.yaml} | 4 ++-- ...econfigs.yaml => tf.upbound.io_storeconfigs.yaml} | 4 ++-- ...workspaces.yaml => tf.upbound.io_workspaces.yaml} | 4 ++-- scripts/check-examples.py | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) rename package/crds/{tf.crossplane.io_providerconfigs.yaml => tf.upbound.io_providerconfigs.yaml} (99%) rename package/crds/{tf.crossplane.io_providerconfigusages.yaml => tf.upbound.io_providerconfigusages.yaml} (98%) rename package/crds/{tf.crossplane.io_storeconfigs.yaml => tf.upbound.io_storeconfigs.yaml} (99%) rename package/crds/{tf.crossplane.io_workspaces.yaml => tf.upbound.io_workspaces.yaml} (99%) diff --git a/README.md b/README.md index 537ed86..38aff47 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ represents a Terraform workspace. The configuration of each workspace may be either fetched from a remote source (e.g. git), or simply specified inline. ```yaml -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: Workspace metadata: name: example-inline @@ -51,7 +51,7 @@ spec: ``` ```yaml -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: Workspace metadata: name: example-remote diff --git a/apis/v1beta1/doc.go b/apis/v1beta1/doc.go index 0e5f463..9d22819 100644 --- a/apis/v1beta1/doc.go +++ b/apis/v1beta1/doc.go @@ -16,6 +16,6 @@ limitations under the License. // Package v1beta1 contains the core resources of the Terraform provider. // +kubebuilder:object:generate=true -// +groupName=tf.crossplane.io +// +groupName=tf.upbound.io // +versionName=v1beta1 package v1beta1 diff --git a/apis/v1beta1/register.go b/apis/v1beta1/register.go index cfe6262..354aa58 100644 --- a/apis/v1beta1/register.go +++ b/apis/v1beta1/register.go @@ -25,7 +25,7 @@ import ( // Package type metadata. const ( - Group = "tf.crossplane.io" + Group = "tf.upbound.io" Version = "v1beta1" ) diff --git a/docs/Configuration.md b/docs/Configuration.md index 84398c2..bf8260e 100644 --- a/docs/Configuration.md +++ b/docs/Configuration.md @@ -24,7 +24,7 @@ kubectl create secret generic git-credentials --from-file=.git-credentials Reference it in ProviderConfig. ```yaml -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: ProviderConfig metadata: name: default @@ -103,7 +103,7 @@ the planArgs, applyArgs and destroyArgs options. For example: ```yaml -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: Workspace metadata: name: example-args @@ -151,7 +151,7 @@ To enable it, the `Workspace` spec has an **optional** `Entrypoint` field. Consider this example: ```yml -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: Workspace metadata: name: relative-path-test @@ -187,7 +187,7 @@ In case you need to disable it, set optional `pluginCache` to `false` in `ProviderConfig`: ```console -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: ProviderConfig metadata: name: default @@ -223,7 +223,7 @@ spec: Prepare a `StoreConfig` for Vault: ```yaml -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: StoreConfig metadata: name: vault @@ -257,7 +257,7 @@ spec: resources: - name: foo base: - apiVersion: tf.crossplane.io/v1beta1 + apiVersion: tf.upbound.io/v1beta1 kind: Workspace metadata: name: foo diff --git a/docs/Quickstart.md b/docs/Quickstart.md index 5b79433..049ed19 100644 --- a/docs/Quickstart.md +++ b/docs/Quickstart.md @@ -123,7 +123,7 @@ Create a `ProviderConfig` Kubernetes configuration file to attach the GCP creden **Note:** the `ProviderConfig` must contain the correct GCP project ID. The project ID must match the `project_id` from the JSON key file. ```yaml -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: ProviderConfig metadata: name: default @@ -168,7 +168,7 @@ Verify the `ProviderConfig` with `kubectl describe providerconfigs`. $ kubectl describe providerconfigs Name: default Namespace: -API Version: tf.crossplane.io/v1beta1 +API Version: tf.upbound.io/v1beta1 Kind: ProviderConfig # Output truncated Spec: @@ -201,7 +201,7 @@ Create a managed resource of type `Workspace` to verify the provider is function This example creates a GCP storage bucket with a globally unique name. ```yaml -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: Workspace metadata: name: example-inline diff --git a/examples/aws-eks-irsa-seup.yaml b/examples/aws-eks-irsa-seup.yaml index 0aebce4..69d1366 100644 --- a/examples/aws-eks-irsa-seup.yaml +++ b/examples/aws-eks-irsa-seup.yaml @@ -45,7 +45,7 @@ spec: controllerConfigRef: name: terraform-config --- -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: ProviderConfig metadata: annotations: {} diff --git a/examples/observe-only-composition/composition.yaml b/examples/observe-only-composition/composition.yaml index b9df673..a604be2 100644 --- a/examples/observe-only-composition/composition.yaml +++ b/examples/observe-only-composition/composition.yaml @@ -11,7 +11,7 @@ spec: resources: - name: observe-only-vpc base: - apiVersion: tf.crossplane.io/v1beta1 + apiVersion: tf.upbound.io/v1beta1 kind: Workspace metadata: name: observe-only-vpc diff --git a/examples/providerconfig-aws.yaml b/examples/providerconfig-aws.yaml index d704de3..4ce0a82 100644 --- a/examples/providerconfig-aws.yaml +++ b/examples/providerconfig-aws.yaml @@ -1,5 +1,5 @@ --- -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: ProviderConfig metadata: name: aws-eu-west-1 diff --git a/examples/providerconfig.yaml b/examples/providerconfig.yaml index 7d65e77..44e5568 100644 --- a/examples/providerconfig.yaml +++ b/examples/providerconfig.yaml @@ -1,4 +1,4 @@ -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: ProviderConfig metadata: name: default diff --git a/examples/workspace-inline.yaml b/examples/workspace-inline.yaml index c4c5212..9ddfa7a 100644 --- a/examples/workspace-inline.yaml +++ b/examples/workspace-inline.yaml @@ -1,4 +1,4 @@ -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: Workspace metadata: name: example-inline diff --git a/examples/workspace-remote.yaml b/examples/workspace-remote.yaml index 27dd0cf..4fb7890 100644 --- a/examples/workspace-remote.yaml +++ b/examples/workspace-remote.yaml @@ -1,4 +1,4 @@ -apiVersion: tf.crossplane.io/v1beta1 +apiVersion: tf.upbound.io/v1beta1 kind: Workspace metadata: name: example-remote diff --git a/package/crds/tf.crossplane.io_providerconfigs.yaml b/package/crds/tf.upbound.io_providerconfigs.yaml similarity index 99% rename from package/crds/tf.crossplane.io_providerconfigs.yaml rename to package/crds/tf.upbound.io_providerconfigs.yaml index 6e1a3ec..7248903 100644 --- a/package/crds/tf.crossplane.io_providerconfigs.yaml +++ b/package/crds/tf.upbound.io_providerconfigs.yaml @@ -5,9 +5,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null - name: providerconfigs.tf.crossplane.io + name: providerconfigs.tf.upbound.io spec: - group: tf.crossplane.io + group: tf.upbound.io names: categories: - crossplane diff --git a/package/crds/tf.crossplane.io_providerconfigusages.yaml b/package/crds/tf.upbound.io_providerconfigusages.yaml similarity index 98% rename from package/crds/tf.crossplane.io_providerconfigusages.yaml rename to package/crds/tf.upbound.io_providerconfigusages.yaml index 1d6e037..bdcfcf6 100644 --- a/package/crds/tf.crossplane.io_providerconfigusages.yaml +++ b/package/crds/tf.upbound.io_providerconfigusages.yaml @@ -5,9 +5,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null - name: providerconfigusages.tf.crossplane.io + name: providerconfigusages.tf.upbound.io spec: - group: tf.crossplane.io + group: tf.upbound.io names: categories: - crossplane diff --git a/package/crds/tf.crossplane.io_storeconfigs.yaml b/package/crds/tf.upbound.io_storeconfigs.yaml similarity index 99% rename from package/crds/tf.crossplane.io_storeconfigs.yaml rename to package/crds/tf.upbound.io_storeconfigs.yaml index 5e71a59..a320bc0 100644 --- a/package/crds/tf.crossplane.io_storeconfigs.yaml +++ b/package/crds/tf.upbound.io_storeconfigs.yaml @@ -5,9 +5,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null - name: storeconfigs.tf.crossplane.io + name: storeconfigs.tf.upbound.io spec: - group: tf.crossplane.io + group: tf.upbound.io names: categories: - crossplane diff --git a/package/crds/tf.crossplane.io_workspaces.yaml b/package/crds/tf.upbound.io_workspaces.yaml similarity index 99% rename from package/crds/tf.crossplane.io_workspaces.yaml rename to package/crds/tf.upbound.io_workspaces.yaml index 6ba1369..c05bbcd 100644 --- a/package/crds/tf.crossplane.io_workspaces.yaml +++ b/package/crds/tf.upbound.io_workspaces.yaml @@ -5,9 +5,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null - name: workspaces.tf.crossplane.io + name: workspaces.tf.upbound.io spec: - group: tf.crossplane.io + group: tf.upbound.io names: categories: - crossplane diff --git a/scripts/check-examples.py b/scripts/check-examples.py index 428e405..01ece8e 100755 --- a/scripts/check-examples.py +++ b/scripts/check-examples.py @@ -25,7 +25,7 @@ def load_crd_type(t): exception_set = { - 'ProviderConfigUsage.tf.crossplane.io/v1beta1' + 'ProviderConfigUsage.tf.upbound.io/v1beta1' }