From 7f69a5409ba34057aa2244a1f45f19ef1972e73f Mon Sep 17 00:00:00 2001 From: Bassam Tabbara Date: Mon, 19 Nov 2018 12:53:07 -0800 Subject: [PATCH] rename to crossplane make build and make test now work. --- CONTRIBUTING.md | 16 +++++------ INSTALL.md | 14 +++++----- LICENSE | 2 +- Makefile | 16 +++++------ PROJECT | 4 +-- README.md | 26 ++++++++--------- ROADMAP.md | 8 +++--- .../{conductor => crossplane}/Dockerfile | 4 +-- .../images/{conductor => crossplane}/Makefile | 4 +-- cmd/{conductor => crossplane}/main.go | 6 ++-- hack/boilerplate.go.txt | 2 +- pkg/apis/apis.go | 14 +++++----- pkg/apis/aws/aws.go | 8 +++--- pkg/apis/aws/compute/container.go | 2 +- pkg/apis/aws/compute/v1alpha1/doc.go | 6 ++-- pkg/apis/aws/compute/v1alpha1/register.go | 8 +++--- pkg/apis/aws/compute/v1alpha1/types.go | 6 ++-- pkg/apis/aws/compute/v1alpha1/types_test.go | 6 ++-- .../compute/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/aws/database/database.go | 2 +- pkg/apis/aws/database/v1alpha1/doc.go | 6 ++-- .../database/v1alpha1/rdsinstance_types.go | 6 ++-- .../v1alpha1/rdsinstance_types_test.go | 4 +-- pkg/apis/aws/database/v1alpha1/register.go | 8 +++--- .../database/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../v1alpha1/zz_generated.deepcopy.go | 28 +++++++++---------- pkg/apis/aws/storage/storage.go | 2 +- pkg/apis/aws/storage/v1alpha1/bucket_types.go | 4 +-- .../aws/storage/v1alpha1/bucket_types_test.go | 2 +- pkg/apis/aws/storage/v1alpha1/doc.go | 6 ++-- pkg/apis/aws/storage/v1alpha1/register.go | 8 +++--- .../storage/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../storage/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/aws/v1alpha1/doc.go | 6 ++-- pkg/apis/aws/v1alpha1/register.go | 8 +++--- pkg/apis/aws/v1alpha1/types.go | 4 +-- pkg/apis/aws/v1alpha1/types_test.go | 2 +- pkg/apis/aws/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../aws/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/azure/azure.go | 6 ++-- pkg/apis/azure/database/database.go | 2 +- pkg/apis/azure/database/v1alpha1/doc.go | 6 ++-- .../database/v1alpha1/mysql_server_types.go | 6 ++-- .../v1alpha1/mysql_server_types_test.go | 4 +-- pkg/apis/azure/database/v1alpha1/register.go | 8 +++--- .../database/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../v1alpha1/zz_generated.deepcopy.go | 28 +++++++++---------- pkg/apis/azure/storage/storage.go | 2 +- .../azure/storage/v1alpha1/bucket_type.go | 4 +-- .../storage/v1alpha1/bucket_type_test.go | 2 +- pkg/apis/azure/storage/v1alpha1/doc.go | 6 ++-- pkg/apis/azure/storage/v1alpha1/register.go | 8 +++--- .../storage/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../storage/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/azure/v1alpha1/doc.go | 6 ++-- pkg/apis/azure/v1alpha1/register.go | 8 +++--- pkg/apis/azure/v1alpha1/types.go | 4 +-- pkg/apis/azure/v1alpha1/types_test.go | 2 +- .../azure/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../azure/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/compute/compute.go | 4 +-- pkg/apis/compute/v1alpha1/doc.go | 8 +++--- pkg/apis/compute/v1alpha1/register.go | 10 +++---- pkg/apis/compute/v1alpha1/types.go | 10 +++---- pkg/apis/compute/v1alpha1/types_test.go | 4 +-- .../compute/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/core/core.go | 4 +-- pkg/apis/core/v1alpha1/bindingphase.go | 2 +- pkg/apis/core/v1alpha1/condition.go | 2 +- pkg/apis/core/v1alpha1/condition_testing.go | 2 +- pkg/apis/core/v1alpha1/doc.go | 8 +++--- pkg/apis/core/v1alpha1/policies.go | 2 +- pkg/apis/core/v1alpha1/register.go | 10 +++---- pkg/apis/core/v1alpha1/resource.go | 2 +- pkg/apis/core/v1alpha1/types.go | 6 ++-- pkg/apis/core/v1alpha1/types_test.go | 2 +- pkg/apis/core/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../core/v1alpha1/zz_generated.deepcopy.go | 28 +++++++++---------- pkg/apis/gcp/compute/compute.go | 2 +- pkg/apis/gcp/compute/v1alpha1/doc.go | 6 ++-- pkg/apis/gcp/compute/v1alpha1/register.go | 8 +++--- pkg/apis/gcp/compute/v1alpha1/types.go | 6 ++-- pkg/apis/gcp/compute/v1alpha1/types_test.go | 4 +-- .../compute/v1alpha1/zz_generated.deepcopy.go | 28 +++++++++---------- pkg/apis/gcp/database/database.go | 2 +- .../v1alpha1/cloudsql_instance_types.go | 6 ++-- .../v1alpha1/cloudsql_instance_types_test.go | 4 +-- pkg/apis/gcp/database/v1alpha1/doc.go | 6 ++-- pkg/apis/gcp/database/v1alpha1/register.go | 8 +++--- .../database/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../v1alpha1/zz_generated.deepcopy.go | 28 +++++++++---------- pkg/apis/gcp/gcp.go | 8 +++--- pkg/apis/gcp/storage/storage.go | 2 +- pkg/apis/gcp/storage/v1alpha1/bucket_types.go | 4 +-- .../gcp/storage/v1alpha1/bucket_types_test.go | 2 +- pkg/apis/gcp/storage/v1alpha1/doc.go | 6 ++-- pkg/apis/gcp/storage/v1alpha1/register.go | 8 +++--- .../storage/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../storage/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/gcp/v1alpha1/doc.go | 6 ++-- pkg/apis/gcp/v1alpha1/register.go | 8 +++--- pkg/apis/gcp/v1alpha1/types.go | 4 +-- pkg/apis/gcp/v1alpha1/types_test.go | 2 +- pkg/apis/gcp/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../gcp/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/storage/storage.go | 4 +-- pkg/apis/storage/v1alpha1/doc.go | 8 +++--- pkg/apis/storage/v1alpha1/register.go | 10 +++---- pkg/apis/storage/v1alpha1/types.go | 10 +++---- pkg/apis/storage/v1alpha1/types_test.go | 2 +- .../storage/v1alpha1/v1alpha1_suite_test.go | 4 +-- .../storage/v1alpha1/zz_generated.deepcopy.go | 28 +++++++++---------- pkg/clients/aws/aws.go | 6 ++-- pkg/clients/aws/aws_test.go | 2 +- pkg/clients/aws/eks/eks.go | 10 +++---- pkg/clients/aws/eks/fake/fake.go | 6 ++-- pkg/clients/aws/rds/fake/fake.go | 6 ++-- pkg/clients/aws/rds/rds.go | 6 ++-- pkg/controller/aws/aws.go | 8 +++--- pkg/controller/aws/compute/eks.go | 16 +++++------ pkg/controller/aws/compute/eks_test.go | 12 ++++---- pkg/controller/aws/provider/provider.go | 10 +++---- pkg/controller/aws/provider/provider_test.go | 8 +++--- pkg/controller/aws/rds/rdsinstance.go | 18 ++++++------ pkg/controller/aws/rds/rdsinstance_test.go | 14 +++++----- pkg/controller/compute/compute.go | 4 +-- pkg/controller/compute/kubernetes/cluster.go | 12 ++++---- .../compute/kubernetes/gcp_handler.go | 12 ++++---- pkg/controller/controller.go | 12 ++++---- pkg/controller/storage/mysql/aws_handler.go | 8 +++--- .../storage/mysql/aws_handler_test.go | 6 ++-- pkg/controller/storage/mysql/azure_handler.go | 10 +++---- .../storage/mysql/azure_handler_test.go | 6 ++-- pkg/controller/storage/mysql/gcp_handler.go | 10 +++---- .../storage/mysql/gcp_handler_test.go | 6 ++-- pkg/controller/storage/mysql/mysqlinstance.go | 16 +++++------ .../storage/mysql/mysqlinstance_suite_test.go | 10 +++---- .../storage/mysql/mysqlinstance_test.go | 4 +-- pkg/controller/storage/storage.go | 4 +-- 139 files changed, 488 insertions(+), 488 deletions(-) rename cluster/images/{conductor => crossplane}/Dockerfile (69%) rename cluster/images/{conductor => crossplane}/Makefile (86%) rename cmd/{conductor => crossplane}/main.go (91%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3e128cdea9..dddc350834 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ ## How to Contribute -The Conductor project is under [Apache 2.0 license](LICENSE). We accept contributions via +The Crossplane project is under [Apache 2.0 license](LICENSE). We accept contributions via GitHub pull requests. This document outlines some of the conventions related to development workflow, commit message formatting, contact points and other resources to make it easier to get your contribution accepted. @@ -57,11 +57,11 @@ This is a rough outline of what a contributor's workflow looks like: ## Building -Details about building conductor can be found in [INSTALL.md](INSTALL.md). +Details about building crossplane can be found in [INSTALL.md](INSTALL.md). ## Coding Style -Conductor projects are written in golang and follows the style guidelines dictated by +Crossplane projects are written in golang and follows the style guidelines dictated by the go fmt as well as go vet tools. ## Comments @@ -72,13 +72,13 @@ be created if they do not yet exist and updated if they do. The goal of comments is to make the code more readable and grokkable by future developers. Once you have made your code as understandable as possible, add comments to make sure future developers can -understand (A) what this piece of code's responsibility is within Conductor's architecture and (B) why it +understand (A) what this piece of code's responsibility is within Crossplane's architecture and (B) why it was written as it was. The below blog entry explains more the why's and how's of this guideline. https://blog.codinghorror.com/code-tells-you-how-comments-tell-you-why/ -For Go, Conductor follows standard godoc guidelines. +For Go, Crossplane follows standard godoc guidelines. A concise godoc guideline can be found here: https://blog.golang.org/godoc-documenting-go-code ## Commit Messages @@ -112,9 +112,9 @@ git tools. ## Adding New Resources ### Project Organization -The Conductor project is based on and intially created by using [Kubebuilder is a framework for building Kubernetes APIs](https://github.com/kubernetes-sigs/kubebuilder). +The Crossplane project is based on and intially created by using [Kubebuilder is a framework for building Kubernetes APIs](https://github.com/kubernetes-sigs/kubebuilder). -The Conductor project organizes resources (api types and controllers) by grouping them by Cloud Provider with further sub-group by resource type +The Crossplane project organizes resources (api types and controllers) by grouping them by Cloud Provider with further sub-group by resource type The Kubebuilder framework does not provide good support for projects with multiple groups and group tiers which contain resources with overlapping names. For example: @@ -168,7 +168,7 @@ There are several different ways you can approach the creation of the new resour Good ol' copy & paste of existing resource for both apis and controller (if new controller is needed) and update to tailor your needs. #### Kubebuilder With New Project -Create and Initialize a new (temporary) kubebuilder project and create new resources: apis and controller(s), then copy them into Conductor project following the established project organization. +Create and Initialize a new (temporary) kubebuilder project and create new resources: apis and controller(s), then copy them into Crossplane project following the established project organization. To verify that new artifacts run: ```bash diff --git a/INSTALL.md b/INSTALL.md index d3ab7493cf..ec5b67bc00 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,6 +1,6 @@ -# Building and Installing Conductor +# Building and Installing Crossplane -Conductor is composed of golang project and can be built directly with standard `golang` tools. We currently support +Crossplane is composed of golang project and can be built directly with standard `golang` tools. We currently support two different platforms for building: * Linux: most modern distros should work although most testing has been done on Ubuntu @@ -28,7 +28,7 @@ First ensure that you have the build submodule synced and updated: git submodule sync && git submodule update --init --recursive ``` -You can then build the Conductor binaries and all container images for the host platform by simply running the +You can then build the Crossplane binaries and all container images for the host platform by simply running the command below. Building in parallel with the `-j` option is recommended. ``` @@ -39,7 +39,7 @@ Run `make help` for more options. ## Building inside the cross container -Official Conductor builds are done inside a build container. This ensures that we get a consistent build, test and release environment. To run the build inside the cross container run: +Official Crossplane builds are done inside a build container. This ensures that we get a consistent build, test and release environment. To run the build inside the cross container run: ``` > build/run make -j4 @@ -130,13 +130,13 @@ systemctl enable update-binfmt.service # Install ## Local -Please refer to [Local Build & Install](/cluster/local/README.md) documentation on how to deploy locally built Conductor image onto Kubernetes cluster running on Minikube +Please refer to [Local Build & Install](/cluster/local/README.md) documentation on how to deploy locally built Crossplane image onto Kubernetes cluster running on Minikube # Improving Build Speed ## Image Caching and Pruning -Doing a complete build of Conductor and the dependent packages can take a long time (more than an hour on a typical macbook). To speed things up we rely heavily on image caching in docker. Docker support content-addressable images by default and we use that effectively when building images. Images are factored to increase reusability across builds. We also tag and timestamp images that should remain in the cache to help future builds. +Doing a complete build of Crossplane and the dependent packages can take a long time (more than an hour on a typical macbook). To speed things up we rely heavily on image caching in docker. Docker support content-addressable images by default and we use that effectively when building images. Images are factored to increase reusability across builds. We also tag and timestamp images that should remain in the cache to help future builds. ### Pruning the cache @@ -149,5 +149,5 @@ To prune the number of cached images run `make prune`. There are two options tha Every PR and every merge to master triggers the CI process in [TBD](http://TBD). The Jenkins CI will build, run unit tests, run integration tests and Publish artifacts- On every commit to PR and master. If any of the CI stages fail, then the process is aborted and no artifacts are published. -On every successful build Artifacts are pushed to a [s3 bucket](https://release.conductor.io/). On every successful master build, +On every successful build Artifacts are pushed to a [s3 bucket](https://release.crossplane.io/). On every successful master build, images are uploaded to docker hub in addition. diff --git a/LICENSE b/LICENSE index 95cff3b6f0..ef10385ccd 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2016 The Conductor Authors. All rights reserved. + Copyright 2016 The Crossplane Authors. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/Makefile b/Makefile index c105d9b7e2..8149bcddaa 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ # ==================================================================================== # Setup Project -PROJECT_NAME := conductor -PROJECT_REPO := github.com/upbound/$(PROJECT_NAME) +PROJECT_NAME := crossplane +PROJECT_REPO := github.com/crossplaneio/$(PROJECT_NAME) PLATFORMS ?= linux_amd64 include build/makelib/common.mk @@ -10,7 +10,7 @@ include build/makelib/common.mk # ==================================================================================== # Setup Output -S3_BUCKET ?= upbound.releases/conductor +S3_BUCKET ?= upbound.releases/crossplane include build/makelib/output.mk # ==================================================================================== @@ -21,7 +21,7 @@ include build/makelib/output.mk # to half the number of CPU cores. GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 ))) -GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/conductor +GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/crossplane GO_LDFLAGS += -X $(GO_PROJECT)/pkg/version.Version=$(VERSION) include build/makelib/golang.mk @@ -30,8 +30,8 @@ include build/makelib/golang.mk HELM_BASE_URL = https://charts.upbound.io HELM_S3_BUCKET = upbound.charts -HELM_CHARTS = conductor -HELM_CHART_LINT_ARGS_conductor = --set nameOverride='',imagePullSecrets='' +HELM_CHARTS = crossplane +HELM_CHART_LINT_ARGS_crossplane = --set nameOverride='',imagePullSecrets='' include build/makelib/helm.mk # ==================================================================================== @@ -43,7 +43,7 @@ include build/makelib/kubebuilder.mk # Setup Images DOCKER_REGISTRY = upbound -IMAGES = conductor +IMAGES = crossplane include build/makelib/image.mk # ==================================================================================== @@ -53,4 +53,4 @@ include build/makelib/image.mk # Generate manifests e.g. CRD, RBAC etc. manifests: - go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd --output-dir cluster/charts/conductor/crds --nested + go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd --output-dir cluster/charts/crossplane/crds --nested diff --git a/PROJECT b/PROJECT index 5df28c3e82..bb1dd9a86a 100644 --- a/PROJECT +++ b/PROJECT @@ -1,3 +1,3 @@ version: "1" -domain: conductor.io -repo: github.com/upbound/conductor +domain: crossplane.io +repo: github.com/crossplaneio/crossplane diff --git a/README.md b/README.md index 0813718e98..9911edb8eb 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# Project Conductor (codename) +# Project Crossplane (codename) -## What is Conductor? +## What is Crossplane? -Conductor is an open source **external-resource-definition** for Kubernetes , providing the platform, framework, and support for a diverse set of the managed resources offered by major cloud providers (Currently focused on AWS and GCP) +Crossplane is an open source **external-resource-definition** for Kubernetes , providing the platform, framework, and support for a diverse set of the managed resources offered by major cloud providers (Currently focused on AWS and GCP) -Conductor turns storage software into self-managing, self-scaling, and self-healing of managed cloud resources. Conductor extends the facilities provided by Kubernetes such container management, scheduling and orchestration to the external resources. +Crossplane turns storage software into self-managing, self-scaling, and self-healing of managed cloud resources. Crossplane extends the facilities provided by Kubernetes such container management, scheduling and orchestration to the external resources. -Conductor integrates deeply into cloud native environments leveraging extension points and providing a seamless experience for scheduling, lifecycle management, resource management, security, monitoring, and user experience. +Crossplane integrates deeply into cloud native environments leveraging extension points and providing a seamless experience for scheduling, lifecycle management, resource management, security, monitoring, and user experience. -For more details about the cloud providers and resources currently supported by Conductor, please refer to the [project status section](#project-status) below. +For more details about the cloud providers and resources currently supported by Crossplane, please refer to the [project status section](#project-status) below. We plan to continue adding support for other cloud providers and resource based on community demand and engagement in future releases. See our [roadmap](ROADMAP.md) for more details. ## Contributing @@ -17,11 +17,11 @@ We welcome contributions. See [Contributing](CONTRIBUTING.md) to get started. ## Report a Bug -For filing bugs, suggesting improvements, or requesting new features, please open an [issue](https://github.com/upbound/conductor/issues). +For filing bugs, suggesting improvements, or requesting new features, please open an [issue](https://github.com/crossplaneio/crossplane/issues). ## Project Status -The status of each storage provider supported by Conductor can be found in the table below. +The status of each storage provider supported by Crossplane can be found in the table below. Each API group is assigned its own individual status to reflect their varying maturity and stability. More details about API versioning and status in Kubernetes can be found on the Kubernetes [API versioning page](https://kubernetes.io/docs/concepts/overview/kubernetes-api/#api-versioning), but the key difference between the statuses are summarized below: @@ -32,15 +32,15 @@ More details about API versioning and status in Kubernetes can be found on the K | Name | Details | API Group | Status | | ----- | --------- | ----------- | -------- | -| AWS Database | Database storage services in AWS | database.aws.conductor.io/v1alpha1 | Alpha | -| GCP Database | Database storage services in GCP | database.gcp.conductor.io/v1alpha1 | Alpha | +| AWS Database | Database storage services in AWS | database.aws.crossplane.io/v1alpha1 | Alpha | +| GCP Database | Database storage services in GCP | database.gcp.crossplane.io/v1alpha1 | Alpha | ### Official Releases -Official releases of Conductor can be found on the [releases page](https://github.com/upbound/conductor/releases). -Please note that it is **strongly recommended** that you use [official releases](https://github.com/upbound/conductor/releases) of Conductor, as unreleased versions from the master branch are subject to changes and incompatibilities that will not be supported in the official releases. +Official releases of Crossplane can be found on the [releases page](https://github.com/crossplaneio/crossplane/releases). +Please note that it is **strongly recommended** that you use [official releases](https://github.com/crossplaneio/crossplane/releases) of Crossplane, as unreleased versions from the master branch are subject to changes and incompatibilities that will not be supported in the official releases. Builds from the master branch can have functionality changed and even removed at any time without compatibility support and without prior notice. ## Licensing -Conductor is under the Apache 2.0 license. +Crossplane is under the Apache 2.0 license. diff --git a/ROADMAP.md b/ROADMAP.md index 4e2fe3e75c..9e985cd842 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,12 +1,12 @@ # Roadmap -This document defines a high level roadmap for Conductor development and upcoming releases. +This document defines a high level roadmap for Crossplane development and upcoming releases. The features and themes included in each milestone are optimistic in the sense that many do not have clear owners yet. Community and contributor involvement is vital for successfully implementing all desired items for each release. -We hope that the items listed below will inspire further engagement from the community to keep Conductor progressing and shipping exciting and valuable features. +We hope that the items listed below will inspire further engagement from the community to keep Crossplane progressing and shipping exciting and valuable features. Any dates listed below and the specific issues that will ship in a given milestone are subject to change but should give a general idea of what we are planning. -We use the [milestone](https://github.com/upbound/conductor/milestones) feature in Github so look there for the most up-to-date and issue plan. +We use the [milestone](https://github.com/crossplaneio/crossplane/milestones) feature in Github so look there for the most up-to-date and issue plan. ## v0.1 @@ -26,7 +26,7 @@ We use the [milestone](https://github.com/upbound/conductor/milestones) feature * New isolated jenkins instance (similar to Rook's jenkins) * Developer unit testing with high code coverage * Integration testing pipeline - * Artifact publishing (container images, conductor helm chart, etc.) + * Artifact publishing (container images, crossplane helm chart, etc.) * Documentation * User guides, quick-starts, walkthroughs * Godocs developer docs for source code/packages/libraries diff --git a/cluster/images/conductor/Dockerfile b/cluster/images/crossplane/Dockerfile similarity index 69% rename from cluster/images/conductor/Dockerfile rename to cluster/images/crossplane/Dockerfile index bbb8e4773d..7e57863b8e 100644 --- a/cluster/images/conductor/Dockerfile +++ b/cluster/images/crossplane/Dockerfile @@ -4,7 +4,7 @@ RUN apk --no-cache add ca-certificates bash ARG ARCH ARG TINI_VERSION -ADD conductor /usr/local/bin/ +ADD crossplane /usr/local/bin/ EXPOSE 8080 -ENTRYPOINT ["conductor"] +ENTRYPOINT ["crossplane"] CMD ["--install-crds=false"] \ No newline at end of file diff --git a/cluster/images/conductor/Makefile b/cluster/images/crossplane/Makefile similarity index 86% rename from cluster/images/conductor/Makefile rename to cluster/images/crossplane/Makefile index e5c6e15dc7..d39279a207 100755 --- a/cluster/images/conductor/Makefile +++ b/cluster/images/crossplane/Makefile @@ -6,7 +6,7 @@ include ../../../build/makelib/common.mk # ==================================================================================== # Options -IMAGE = $(BUILD_REGISTRY)/conductor-$(ARCH) +IMAGE = $(BUILD_REGISTRY)/crossplane-$(ARCH) include ../../../build/makelib/image.mk # ==================================================================================== @@ -15,7 +15,7 @@ include ../../../build/makelib/image.mk img.build: @$(INFO) docker build $(IMAGE) @cp Dockerfile $(IMAGE_TEMP_DIR) || $(FAIL) - @cp $(OUTPUT_DIR)/bin/$(OS)_$(ARCH)/conductor $(IMAGE_TEMP_DIR) || $(FAIL) + @cp $(OUTPUT_DIR)/bin/$(OS)_$(ARCH)/crossplane $(IMAGE_TEMP_DIR) || $(FAIL) @cd $(IMAGE_TEMP_DIR) && $(SED_CMD) 's|BASEIMAGE|$(OSBASEIMAGE)|g' Dockerfile || $(FAIL) @docker build $(BUILD_ARGS) \ --build-arg ARCH=$(ARCH) \ diff --git a/cmd/conductor/main.go b/cmd/crossplane/main.go similarity index 91% rename from cmd/conductor/main.go rename to cmd/crossplane/main.go index 835044597e..e8368f5e2d 100644 --- a/cmd/conductor/main.go +++ b/cmd/crossplane/main.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ import ( "log" "time" - "github.com/upbound/conductor/pkg/apis" - "github.com/upbound/conductor/pkg/controller" + "github.com/crossplaneio/crossplane/pkg/apis" + "github.com/crossplaneio/crossplane/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/runtime/signals" diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt index a7349e2e29..db5f6bd4b4 100644 --- a/hack/boilerplate.go.txt +++ b/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/apis.go b/pkg/apis/apis.go index 1d9f47aa19..471dd96f2d 100644 --- a/pkg/apis/apis.go +++ b/pkg/apis/apis.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,12 +21,12 @@ limitations under the License. package apis import ( - "github.com/upbound/conductor/pkg/apis/aws" - "github.com/upbound/conductor/pkg/apis/azure" - "github.com/upbound/conductor/pkg/apis/compute" - "github.com/upbound/conductor/pkg/apis/core" - "github.com/upbound/conductor/pkg/apis/gcp" - "github.com/upbound/conductor/pkg/apis/storage" + "github.com/crossplaneio/crossplane/pkg/apis/aws" + "github.com/crossplaneio/crossplane/pkg/apis/azure" + "github.com/crossplaneio/crossplane/pkg/apis/compute" + "github.com/crossplaneio/crossplane/pkg/apis/core" + "github.com/crossplaneio/crossplane/pkg/apis/gcp" + "github.com/crossplaneio/crossplane/pkg/apis/storage" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/aws/aws.go b/pkg/apis/aws/aws.go index 926aecab9b..0e6c00cfb3 100644 --- a/pkg/apis/aws/aws.go +++ b/pkg/apis/aws/aws.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,9 +18,9 @@ limitations under the License. package aws import ( - compute "github.com/upbound/conductor/pkg/apis/aws/compute/v1alpha1" - database "github.com/upbound/conductor/pkg/apis/aws/database/v1alpha1" - aws "github.com/upbound/conductor/pkg/apis/aws/v1alpha1" + compute "github.com/crossplaneio/crossplane/pkg/apis/aws/compute/v1alpha1" + database "github.com/crossplaneio/crossplane/pkg/apis/aws/database/v1alpha1" + aws "github.com/crossplaneio/crossplane/pkg/apis/aws/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/aws/compute/container.go b/pkg/apis/aws/compute/container.go index 2754f88bff..c061ddc8bd 100644 --- a/pkg/apis/aws/compute/container.go +++ b/pkg/apis/aws/compute/container.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/aws/compute/v1alpha1/doc.go b/pkg/apis/aws/compute/v1alpha1/doc.go index d36fdf7ee4..ff081a6ae0 100644 --- a/pkg/apis/aws/compute/v1alpha1/doc.go +++ b/pkg/apis/aws/compute/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the compute v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/aws/compute +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/aws/compute // +k8s:defaulter-gen=TypeMeta -// +groupName=compute.aws.conductor.io +// +groupName=compute.aws.crossplane.io package v1alpha1 diff --git a/pkg/apis/aws/compute/v1alpha1/register.go b/pkg/apis/aws/compute/v1alpha1/register.go index c49acfd1b1..4f67fb2260 100644 --- a/pkg/apis/aws/compute/v1alpha1/register.go +++ b/pkg/apis/aws/compute/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the compute v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/aws/apis/aws/compute +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/aws/apis/aws/compute // +k8s:defaulter-gen=TypeMeta -// +groupName=compute.aws.conductor.io +// +groupName=compute.aws.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "compute.aws.conductor.io" + Group = "compute.aws.crossplane.io" Version = "v1alpha1" APIVersion = Group + "/" + Version EKSClusterKind = "eksclusters" diff --git a/pkg/apis/aws/compute/v1alpha1/types.go b/pkg/apis/aws/compute/v1alpha1/types.go index 2cd3098b9a..3de16a3135 100644 --- a/pkg/apis/aws/compute/v1alpha1/types.go +++ b/pkg/apis/aws/compute/v1alpha1/types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/util" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/aws/compute/v1alpha1/types_test.go b/pkg/apis/aws/compute/v1alpha1/types_test.go index 1703609b10..97b99d5e05 100644 --- a/pkg/apis/aws/compute/v1alpha1/types_test.go +++ b/pkg/apis/aws/compute/v1alpha1/types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import ( "log" "testing" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/test" . "github.com/onsi/gomega" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/test" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" diff --git a/pkg/apis/aws/compute/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/aws/compute/v1alpha1/zz_generated.deepcopy.go index 5ab3688591..2799a3cc9a 100644 --- a/pkg/apis/aws/compute/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/aws/compute/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/aws/database/database.go b/pkg/apis/aws/database/database.go index f8e9ca34e7..1feeb0a57b 100644 --- a/pkg/apis/aws/database/database.go +++ b/pkg/apis/aws/database/database.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/aws/database/v1alpha1/doc.go b/pkg/apis/aws/database/v1alpha1/doc.go index 0193f8dbd5..75e36ea1d4 100644 --- a/pkg/apis/aws/database/v1alpha1/doc.go +++ b/pkg/apis/aws/database/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the database v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/aws/database +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/aws/database // +k8s:defaulter-gen=TypeMeta -// +groupName=database.aws.conductor.io +// +groupName=database.aws.crossplane.io package v1alpha1 diff --git a/pkg/apis/aws/database/v1alpha1/rdsinstance_types.go b/pkg/apis/aws/database/v1alpha1/rdsinstance_types.go index f8e664452d..83c01b0506 100644 --- a/pkg/apis/aws/database/v1alpha1/rdsinstance_types.go +++ b/pkg/apis/aws/database/v1alpha1/rdsinstance_types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ import ( "strconv" "strings" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/util" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/aws/database/v1alpha1/rdsinstance_types_test.go b/pkg/apis/aws/database/v1alpha1/rdsinstance_types_test.go index 62bc4e7a61..44ab72f63d 100644 --- a/pkg/apis/aws/database/v1alpha1/rdsinstance_types_test.go +++ b/pkg/apis/aws/database/v1alpha1/rdsinstance_types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ package v1alpha1 import ( "testing" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" . "github.com/onsi/gomega" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/apis/aws/database/v1alpha1/register.go b/pkg/apis/aws/database/v1alpha1/register.go index f76ae2cc84..916acf7a40 100644 --- a/pkg/apis/aws/database/v1alpha1/register.go +++ b/pkg/apis/aws/database/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the database v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/aws/database +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/aws/database // +k8s:defaulter-gen=TypeMeta -// +groupName=database.aws.conductor.io +// +groupName=database.aws.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "database.aws.conductor.io" + Group = "database.aws.crossplane.io" Version = "v1alpha1" APIVersion = Group + "/" + Version RDSInstanceKind = "rdsinstance" diff --git a/pkg/apis/aws/database/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/aws/database/v1alpha1/v1alpha1_suite_test.go index fd716dd39a..4e014a6f4b 100644 --- a/pkg/apis/aws/database/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/aws/database/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "log" "testing" - "github.com/upbound/conductor/pkg/test" + "github.com/crossplaneio/crossplane/pkg/test" "golang.org/x/net/context" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" diff --git a/pkg/apis/aws/database/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/aws/database/v1alpha1/zz_generated.deepcopy.go index 1a17013070..1006f6f05c 100644 --- a/pkg/apis/aws/database/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/aws/database/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,33 +20,33 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" + v1 "k8s.io/api/core/v1" + runtime "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (r *RDSInstance) DeepCopyInto(out *RDSInstance) { - *out = *r - out.TypeMeta = r.TypeMeta - r.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - r.Spec.DeepCopyInto(&out.Spec) - r.Status.DeepCopyInto(&out.Status) +func (in *RDSInstance) DeepCopyInto(out *RDSInstance) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RDSInstance. -func (r *RDSInstance) DeepCopy() *RDSInstance { - if r == nil { +func (in *RDSInstance) DeepCopy() *RDSInstance { + if in == nil { return nil } out := new(RDSInstance) - r.DeepCopyInto(out) + in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (r *RDSInstance) DeepCopyObject() runtime.Object { - if c := r.DeepCopy(); c != nil { +func (in *RDSInstance) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { return c } return nil diff --git a/pkg/apis/aws/storage/storage.go b/pkg/apis/aws/storage/storage.go index 92754ccb06..18bbf5d7c8 100644 --- a/pkg/apis/aws/storage/storage.go +++ b/pkg/apis/aws/storage/storage.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/aws/storage/v1alpha1/bucket_types.go b/pkg/apis/aws/storage/v1alpha1/bucket_types.go index 1a65457bd7..7ea8f631d5 100644 --- a/pkg/apis/aws/storage/v1alpha1/bucket_types.go +++ b/pkg/apis/aws/storage/v1alpha1/bucket_types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/aws/storage/v1alpha1/bucket_types_test.go b/pkg/apis/aws/storage/v1alpha1/bucket_types_test.go index 1ec67cae92..17cb703fba 100644 --- a/pkg/apis/aws/storage/v1alpha1/bucket_types_test.go +++ b/pkg/apis/aws/storage/v1alpha1/bucket_types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/aws/storage/v1alpha1/doc.go b/pkg/apis/aws/storage/v1alpha1/doc.go index 84798d55e0..a0fb92eaf7 100644 --- a/pkg/apis/aws/storage/v1alpha1/doc.go +++ b/pkg/apis/aws/storage/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the storage v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/aws/storage +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/aws/storage // +k8s:defaulter-gen=TypeMeta -// +groupName=storage.aws.conductor.io +// +groupName=storage.aws.crossplane.io package v1alpha1 diff --git a/pkg/apis/aws/storage/v1alpha1/register.go b/pkg/apis/aws/storage/v1alpha1/register.go index 9752666fff..0450ab299f 100644 --- a/pkg/apis/aws/storage/v1alpha1/register.go +++ b/pkg/apis/aws/storage/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the storage v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/aws/storage +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/aws/storage // +k8s:defaulter-gen=TypeMeta -// +groupName=storage.aws.conductor.io +// +groupName=storage.aws.crossplane.io package v1alpha1 import ( @@ -31,7 +31,7 @@ import ( var ( // SchemeGroupVersion is group version used to register these objects - SchemeGroupVersion = schema.GroupVersion{Group: "storage.aws.conductor.io", Version: "v1alpha1"} + SchemeGroupVersion = schema.GroupVersion{Group: "storage.aws.crossplane.io", Version: "v1alpha1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} diff --git a/pkg/apis/aws/storage/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/aws/storage/v1alpha1/v1alpha1_suite_test.go index 16274513ad..651b371f4c 100644 --- a/pkg/apis/aws/storage/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/aws/storage/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ var c client.Client func TestMain(m *testing.M) { t := &envtest.Environment{ CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "..", - "cluster", "charts", "conductor", "crds", "aws", "storage", "v1alpha1")}, + "cluster", "charts", "crossplane", "crds", "aws", "storage", "v1alpha1")}, } err := SchemeBuilder.AddToScheme(scheme.Scheme) diff --git a/pkg/apis/aws/storage/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/aws/storage/v1alpha1/zz_generated.deepcopy.go index 5cf5671984..3758821738 100644 --- a/pkg/apis/aws/storage/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/aws/storage/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/aws/v1alpha1/doc.go b/pkg/apis/aws/v1alpha1/doc.go index a03500cd40..4c5c5e130f 100644 --- a/pkg/apis/aws/v1alpha1/doc.go +++ b/pkg/apis/aws/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the aws v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/aws +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/aws // +k8s:defaulter-gen=TypeMeta -// +groupName=aws.conductor.io +// +groupName=aws.crossplane.io package v1alpha1 diff --git a/pkg/apis/aws/v1alpha1/register.go b/pkg/apis/aws/v1alpha1/register.go index e6f41fea6f..6bae9fa93a 100644 --- a/pkg/apis/aws/v1alpha1/register.go +++ b/pkg/apis/aws/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the aws v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/aws/apis/aws +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/aws/apis/aws // +k8s:defaulter-gen=TypeMeta -// +groupName=aws.conductor.io +// +groupName=aws.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "aws.conductor.io" + Group = "aws.crossplane.io" Version = "v1alpha1" APIVersion = Group + "/" + Version ProviderKind = "provider" diff --git a/pkg/apis/aws/v1alpha1/types.go b/pkg/apis/aws/v1alpha1/types.go index 724b63fe63..f45ae253a2 100644 --- a/pkg/apis/aws/v1alpha1/types.go +++ b/pkg/apis/aws/v1alpha1/types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/aws/v1alpha1/types_test.go b/pkg/apis/aws/v1alpha1/types_test.go index 45f77ac8b7..a926c07189 100644 --- a/pkg/apis/aws/v1alpha1/types_test.go +++ b/pkg/apis/aws/v1alpha1/types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/aws/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/aws/v1alpha1/v1alpha1_suite_test.go index 08c8635cbc..e6e09f8f63 100644 --- a/pkg/apis/aws/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/aws/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "log" "testing" - "github.com/upbound/conductor/pkg/test" + "github.com/crossplaneio/crossplane/pkg/test" "golang.org/x/net/context" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" diff --git a/pkg/apis/aws/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/aws/v1alpha1/zz_generated.deepcopy.go index 1ece1500d2..8074567422 100644 --- a/pkg/apis/aws/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/aws/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/azure/azure.go b/pkg/apis/azure/azure.go index 489cd0dbe0..678b3dd1a9 100644 --- a/pkg/apis/azure/azure.go +++ b/pkg/apis/azure/azure.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ limitations under the License. package azure import ( - databasev1alpha1 "github.com/upbound/conductor/pkg/apis/azure/database/v1alpha1" - azure "github.com/upbound/conductor/pkg/apis/azure/v1alpha1" + databasev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/azure/database/v1alpha1" + azure "github.com/crossplaneio/crossplane/pkg/apis/azure/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/azure/database/database.go b/pkg/apis/azure/database/database.go index db3dcd6679..bea54b6a31 100644 --- a/pkg/apis/azure/database/database.go +++ b/pkg/apis/azure/database/database.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/azure/database/v1alpha1/doc.go b/pkg/apis/azure/database/v1alpha1/doc.go index 64e8933586..10cf43133b 100644 --- a/pkg/apis/azure/database/v1alpha1/doc.go +++ b/pkg/apis/azure/database/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the database v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/azure/database +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/azure/database // +k8s:defaulter-gen=TypeMeta -// +groupName=database.azure.conductor.io +// +groupName=database.azure.crossplane.io package v1alpha1 diff --git a/pkg/apis/azure/database/v1alpha1/mysql_server_types.go b/pkg/apis/azure/database/v1alpha1/mysql_server_types.go index 0e12c70231..b36df88881 100644 --- a/pkg/apis/azure/database/v1alpha1/mysql_server_types.go +++ b/pkg/apis/azure/database/v1alpha1/mysql_server_types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ import ( "strconv" "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/util" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/azure/database/v1alpha1/mysql_server_types_test.go b/pkg/apis/azure/database/v1alpha1/mysql_server_types_test.go index 2f1cf340f4..8596d7ce48 100644 --- a/pkg/apis/azure/database/v1alpha1/mysql_server_types_test.go +++ b/pkg/apis/azure/database/v1alpha1/mysql_server_types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ package v1alpha1 import ( "testing" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" "github.com/onsi/gomega" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/apis/azure/database/v1alpha1/register.go b/pkg/apis/azure/database/v1alpha1/register.go index 977a8e9e21..e3d701dfd9 100644 --- a/pkg/apis/azure/database/v1alpha1/register.go +++ b/pkg/apis/azure/database/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the database v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/azure/apis/azure/database +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/azure/apis/azure/database // +k8s:defaulter-gen=TypeMeta -// +groupName=database.azure.conductor.io +// +groupName=database.azure.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "database.azure.conductor.io" + Group = "database.azure.crossplane.io" Version = "v1alpha1" APIVersion = Group + "/" + Version MysqlServerKind = "mysqlserver" diff --git a/pkg/apis/azure/database/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/azure/database/v1alpha1/v1alpha1_suite_test.go index 0a2f890418..429982f74c 100644 --- a/pkg/apis/azure/database/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/azure/database/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import ( "log" "testing" - "github.com/upbound/conductor/pkg/test" + "github.com/crossplaneio/crossplane/pkg/test" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/apis/azure/database/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/azure/database/v1alpha1/zz_generated.deepcopy.go index e5ea46c27a..38ba2c4c5c 100644 --- a/pkg/apis/azure/database/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/azure/database/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,33 +20,33 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" + v1 "k8s.io/api/core/v1" + runtime "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (m *MysqlServer) DeepCopyInto(out *MysqlServer) { - *out = *m - out.TypeMeta = m.TypeMeta - m.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - m.Spec.DeepCopyInto(&out.Spec) - m.Status.DeepCopyInto(&out.Status) +func (in *MysqlServer) DeepCopyInto(out *MysqlServer) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MysqlServer. -func (m *MysqlServer) DeepCopy() *MysqlServer { - if m == nil { +func (in *MysqlServer) DeepCopy() *MysqlServer { + if in == nil { return nil } out := new(MysqlServer) - m.DeepCopyInto(out) + in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (m *MysqlServer) DeepCopyObject() runtime.Object { - if c := m.DeepCopy(); c != nil { +func (in *MysqlServer) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { return c } return nil diff --git a/pkg/apis/azure/storage/storage.go b/pkg/apis/azure/storage/storage.go index cfd178daf6..054a93afc2 100644 --- a/pkg/apis/azure/storage/storage.go +++ b/pkg/apis/azure/storage/storage.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/azure/storage/v1alpha1/bucket_type.go b/pkg/apis/azure/storage/v1alpha1/bucket_type.go index 3352baf046..8aade9ee6e 100644 --- a/pkg/apis/azure/storage/v1alpha1/bucket_type.go +++ b/pkg/apis/azure/storage/v1alpha1/bucket_type.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/azure/storage/v1alpha1/bucket_type_test.go b/pkg/apis/azure/storage/v1alpha1/bucket_type_test.go index 89090abba2..d3d1279f52 100644 --- a/pkg/apis/azure/storage/v1alpha1/bucket_type_test.go +++ b/pkg/apis/azure/storage/v1alpha1/bucket_type_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/azure/storage/v1alpha1/doc.go b/pkg/apis/azure/storage/v1alpha1/doc.go index 3ce83214de..06bff9b937 100644 --- a/pkg/apis/azure/storage/v1alpha1/doc.go +++ b/pkg/apis/azure/storage/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the storage v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/azure/database +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/azure/database // +k8s:defaulter-gen=TypeMeta -// +groupName=storage.azure.conductor.io +// +groupName=storage.azure.crossplane.io package v1alpha1 diff --git a/pkg/apis/azure/storage/v1alpha1/register.go b/pkg/apis/azure/storage/v1alpha1/register.go index fd9e789ae3..4cc0392bd5 100644 --- a/pkg/apis/azure/storage/v1alpha1/register.go +++ b/pkg/apis/azure/storage/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the storage v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/azure/storage +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/azure/storage // +k8s:defaulter-gen=TypeMeta -// +groupName=storage.azure.conductor.io +// +groupName=storage.azure.crossplane.io package v1alpha1 import ( @@ -31,7 +31,7 @@ import ( var ( // SchemeGroupVersion is group version used to register these objects - SchemeGroupVersion = schema.GroupVersion{Group: "storage.azure.conductor.io", Version: "v1alpha1"} + SchemeGroupVersion = schema.GroupVersion{Group: "storage.azure.crossplane.io", Version: "v1alpha1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} diff --git a/pkg/apis/azure/storage/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/azure/storage/v1alpha1/v1alpha1_suite_test.go index 1ac195e38e..84b937ef93 100644 --- a/pkg/apis/azure/storage/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/azure/storage/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ var c client.Client func TestMain(m *testing.M) { t := &envtest.Environment{ CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "..", - "cluster", "charts", "conductor", "crds", "azure", "storage", "v1alpha1")}, + "cluster", "charts", "crossplane", "crds", "azure", "storage", "v1alpha1")}, } err := SchemeBuilder.AddToScheme(scheme.Scheme) diff --git a/pkg/apis/azure/storage/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/azure/storage/v1alpha1/zz_generated.deepcopy.go index 2b38999d55..695a793cfd 100644 --- a/pkg/apis/azure/storage/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/azure/storage/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/azure/v1alpha1/doc.go b/pkg/apis/azure/v1alpha1/doc.go index f215263211..45c3f0c25e 100644 --- a/pkg/apis/azure/v1alpha1/doc.go +++ b/pkg/apis/azure/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the azure v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/azure +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/azure // +k8s:defaulter-gen=TypeMeta -// +groupName=azure.conductor.io +// +groupName=azure.crossplane.io package v1alpha1 diff --git a/pkg/apis/azure/v1alpha1/register.go b/pkg/apis/azure/v1alpha1/register.go index d1919df1a3..576ba80a52 100644 --- a/pkg/apis/azure/v1alpha1/register.go +++ b/pkg/apis/azure/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the azure v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/azure/apis/azure +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/azure/apis/azure // +k8s:defaulter-gen=TypeMeta -// +groupName=azure.conductor.io +// +groupName=azure.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "azure.conductor.io" + Group = "azure.crossplane.io" Version = "v1alpha1" APIVersion = Group + "/" + Version ) diff --git a/pkg/apis/azure/v1alpha1/types.go b/pkg/apis/azure/v1alpha1/types.go index 9bf4caf447..4c4705ff2b 100644 --- a/pkg/apis/azure/v1alpha1/types.go +++ b/pkg/apis/azure/v1alpha1/types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/azure/v1alpha1/types_test.go b/pkg/apis/azure/v1alpha1/types_test.go index 79249cd0b4..889ac3c715 100644 --- a/pkg/apis/azure/v1alpha1/types_test.go +++ b/pkg/apis/azure/v1alpha1/types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/azure/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/azure/v1alpha1/v1alpha1_suite_test.go index 89c7f802b5..11f334114b 100644 --- a/pkg/apis/azure/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/azure/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import ( "log" "testing" - "github.com/upbound/conductor/pkg/test" + "github.com/crossplaneio/crossplane/pkg/test" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/apis/azure/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/azure/v1alpha1/zz_generated.deepcopy.go index 1ece1500d2..8074567422 100644 --- a/pkg/apis/azure/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/azure/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/compute/compute.go b/pkg/apis/compute/compute.go index eba43d2c38..4a87ef3618 100644 --- a/pkg/apis/compute/compute.go +++ b/pkg/apis/compute/compute.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ limitations under the License. package compute import ( - "github.com/upbound/conductor/pkg/apis/compute/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/apis/compute/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/compute/v1alpha1/doc.go b/pkg/apis/compute/v1alpha1/doc.go index c666ab9202..e4a26a8bf7 100644 --- a/pkg/apis/compute/v1alpha1/doc.go +++ b/pkg/apis/compute/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package v1alpha1 contains API Schema definitions for the conductor core v1alpha1 API group +// Package v1alpha1 contains API Schema definitions for the crossplane core v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/compute +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/compute // +k8s:defaulter-gen=TypeMeta -// +groupName=compute.conductor.io +// +groupName=compute.crossplane.io package v1alpha1 diff --git a/pkg/apis/compute/v1alpha1/register.go b/pkg/apis/compute/v1alpha1/register.go index eb284a8fdd..d5acccb87e 100644 --- a/pkg/apis/compute/v1alpha1/register.go +++ b/pkg/apis/compute/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ limitations under the License. // NOTE: Boilerplate only. Ignore this file. -// Package v1alpha1 contains API Schema definitions for the conductor core v1alpha1 API group +// Package v1alpha1 contains API Schema definitions for the crossplane core v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/compute +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/compute // +k8s:defaulter-gen=TypeMeta -// +groupName=compute.conductor.io +// +groupName=compute.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "compute.conductor.io" + Group = "compute.crossplane.io" Version = "v1alpha1" APIVersion = Group + "/" + Version KubernetesInstanceKind = "kubernetesclusters" diff --git a/pkg/apis/compute/v1alpha1/types.go b/pkg/apis/compute/v1alpha1/types.go index 960fb14075..b4ff9a3c2e 100644 --- a/pkg/apis/compute/v1alpha1/types.go +++ b/pkg/apis/compute/v1alpha1/types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/util" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type KubernetesClusterStatus struct { corev1alpha1.BindingStatusPhase // Provisioner is the driver that was used to provision the concrete resource // This is an optionally-prefixed name, like a label key. - // For example: "EKScluster.compute.aws.conductor.io/v1alpha1" or "GKECluster.compute.gcp.conductor.io/v1alpha1". + // For example: "EKScluster.compute.aws.crossplane.io/v1alpha1" or "GKECluster.compute.gcp.crossplane.io/v1alpha1". Provisioner string `json:"provisioner,omitempty"` } @@ -123,7 +123,7 @@ type WorkloadStatus struct { corev1alpha1.BindingStatusPhase // Provisioner is the driver that was used to provision the concrete resource // This is an optionally-prefixed name, like a label key. - // For example: "EKScluster.compute.aws.conductor.io/v1alpha1" or "GKECluster.compute.gcp.conductor.io/v1alpha1". + // For example: "EKScluster.compute.aws.crossplane.io/v1alpha1" or "GKECluster.compute.gcp.crossplane.io/v1alpha1". Provisioner string `json:"provisioner,omitempty"` } diff --git a/pkg/apis/compute/v1alpha1/types_test.go b/pkg/apis/compute/v1alpha1/types_test.go index 5d58141f4f..f84f3e8766 100644 --- a/pkg/apis/compute/v1alpha1/types_test.go +++ b/pkg/apis/compute/v1alpha1/types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ import ( "log" "testing" + "github.com/crossplaneio/crossplane/pkg/test" . "github.com/onsi/gomega" - "github.com/upbound/conductor/pkg/test" "golang.org/x/net/context" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/apis/compute/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/compute/v1alpha1/zz_generated.deepcopy.go index ff8cf5a0e6..5bd01a88ae 100644 --- a/pkg/apis/compute/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/compute/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/core/core.go b/pkg/apis/core/core.go index fc95e1a024..6e313ed15c 100644 --- a/pkg/apis/core/core.go +++ b/pkg/apis/core/core.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ limitations under the License. package core import ( - "github.com/upbound/conductor/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/core/v1alpha1/bindingphase.go b/pkg/apis/core/v1alpha1/bindingphase.go index b6fc4b16b4..14dd0dad64 100644 --- a/pkg/apis/core/v1alpha1/bindingphase.go +++ b/pkg/apis/core/v1alpha1/bindingphase.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/core/v1alpha1/condition.go b/pkg/apis/core/v1alpha1/condition.go index 82a1d6a894..1ba5726772 100644 --- a/pkg/apis/core/v1alpha1/condition.go +++ b/pkg/apis/core/v1alpha1/condition.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/core/v1alpha1/condition_testing.go b/pkg/apis/core/v1alpha1/condition_testing.go index 82a37eb343..174ea51b9e 100644 --- a/pkg/apis/core/v1alpha1/condition_testing.go +++ b/pkg/apis/core/v1alpha1/condition_testing.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/core/v1alpha1/doc.go b/pkg/apis/core/v1alpha1/doc.go index e83d39614a..281cd57930 100644 --- a/pkg/apis/core/v1alpha1/doc.go +++ b/pkg/apis/core/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package v1alpha1 contains API Schema definitions for the conductor core v1alpha1 API group +// Package v1alpha1 contains API Schema definitions for the crossplane core v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/core +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/core // +k8s:defaulter-gen=TypeMeta -// +groupName=core.conductor.io +// +groupName=core.crossplane.io package v1alpha1 diff --git a/pkg/apis/core/v1alpha1/policies.go b/pkg/apis/core/v1alpha1/policies.go index 9beb323052..407316d84d 100644 --- a/pkg/apis/core/v1alpha1/policies.go +++ b/pkg/apis/core/v1alpha1/policies.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/core/v1alpha1/register.go b/pkg/apis/core/v1alpha1/register.go index 76f859bf8c..b4e9620bea 100644 --- a/pkg/apis/core/v1alpha1/register.go +++ b/pkg/apis/core/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ limitations under the License. // NOTE: Boilerplate only. Ignore this file. -// Package v1alpha1 contains API Schema definitions for the conductor core v1alpha1 API group +// Package v1alpha1 contains API Schema definitions for the crossplane core v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/core +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/core // +k8s:defaulter-gen=TypeMeta -// +groupName=core.conductor.io +// +groupName=core.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "core.conductor.io" + Group = "core.crossplane.io" Version = "v1alpha1" ResourceClassKind = "resourceclass" APIVersion = Group + "/" + Version diff --git a/pkg/apis/core/v1alpha1/resource.go b/pkg/apis/core/v1alpha1/resource.go index 4f41065c16..1aafe497d8 100644 --- a/pkg/apis/core/v1alpha1/resource.go +++ b/pkg/apis/core/v1alpha1/resource.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/core/v1alpha1/types.go b/pkg/apis/core/v1alpha1/types.go index 46761336a0..1405f4156c 100644 --- a/pkg/apis/core/v1alpha1/types.go +++ b/pkg/apis/core/v1alpha1/types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/upbound/conductor/pkg/util" + "github.com/crossplaneio/crossplane/pkg/util" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -62,7 +62,7 @@ type ResourceClass struct { // Provisioner is the driver expected to handle this ResourceClass. // This is an optionally-prefixed name, like a label key. - // For example: "RDSInstance.database.aws.conductor.io/v1alpha1" or "CloudSQLInstance.database.gcp.conductor.io/v1alpha1". + // For example: "RDSInstance.database.aws.crossplane.io/v1alpha1" or "CloudSQLInstance.database.gcp.crossplane.io/v1alpha1". // This value may not be empty. Provisioner string `json:"provisioner"` diff --git a/pkg/apis/core/v1alpha1/types_test.go b/pkg/apis/core/v1alpha1/types_test.go index 168fa8caca..720255e27d 100644 --- a/pkg/apis/core/v1alpha1/types_test.go +++ b/pkg/apis/core/v1alpha1/types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/core/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/core/v1alpha1/v1alpha1_suite_test.go index fd716dd39a..4e014a6f4b 100644 --- a/pkg/apis/core/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/core/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "log" "testing" - "github.com/upbound/conductor/pkg/test" + "github.com/crossplaneio/crossplane/pkg/test" "golang.org/x/net/context" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" diff --git a/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go index 258126b0e4..8d029150c7 100644 --- a/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/apimachinery/pkg/runtime" + runtime "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -80,34 +80,34 @@ func (c *ConditionedStatus) DeepCopy() *ConditionedStatus { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (r *ResourceClass) DeepCopyInto(out *ResourceClass) { - *out = *r - out.TypeMeta = r.TypeMeta - r.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - if r.Parameters != nil { - in, out := &r.Parameters, &out.Parameters +func (in *ResourceClass) DeepCopyInto(out *ResourceClass) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + if in.Parameters != nil { + in, out := &in.Parameters, &out.Parameters *out = make(map[string]string, len(*in)) for key, val := range *in { (*out)[key] = val } } - out.ProviderRef = r.ProviderRef + out.ProviderRef = in.ProviderRef return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceClass. -func (r *ResourceClass) DeepCopy() *ResourceClass { - if r == nil { +func (in *ResourceClass) DeepCopy() *ResourceClass { + if in == nil { return nil } out := new(ResourceClass) - r.DeepCopyInto(out) + in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (r *ResourceClass) DeepCopyObject() runtime.Object { - if c := r.DeepCopy(); c != nil { +func (in *ResourceClass) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { return c } return nil diff --git a/pkg/apis/gcp/compute/compute.go b/pkg/apis/gcp/compute/compute.go index 2754f88bff..c061ddc8bd 100644 --- a/pkg/apis/gcp/compute/compute.go +++ b/pkg/apis/gcp/compute/compute.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/gcp/compute/v1alpha1/doc.go b/pkg/apis/gcp/compute/v1alpha1/doc.go index f44583257a..7f31116739 100644 --- a/pkg/apis/gcp/compute/v1alpha1/doc.go +++ b/pkg/apis/gcp/compute/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the container v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/gcp/compute +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/gcp/compute // +k8s:defaulter-gen=TypeMeta -// +groupName=compute.gcp.conductor.io +// +groupName=compute.gcp.crossplane.io package v1alpha1 diff --git a/pkg/apis/gcp/compute/v1alpha1/register.go b/pkg/apis/gcp/compute/v1alpha1/register.go index 5fe9dc99d9..d1762b4369 100644 --- a/pkg/apis/gcp/compute/v1alpha1/register.go +++ b/pkg/apis/gcp/compute/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the container v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/gcp/apis/gcp/compute +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/gcp/apis/gcp/compute // +k8s:defaulter-gen=TypeMeta -// +groupName=compute.gcp.conductor.io +// +groupName=compute.gcp.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "compute.gcp.conductor.io" + Group = "compute.gcp.crossplane.io" Version = "v1alpha1" APIVersion = Group + "/" + Version GKEClusterKind = "gkecluster" diff --git a/pkg/apis/gcp/compute/v1alpha1/types.go b/pkg/apis/gcp/compute/v1alpha1/types.go index 3b68fbca02..c5cfc07d42 100644 --- a/pkg/apis/gcp/compute/v1alpha1/types.go +++ b/pkg/apis/gcp/compute/v1alpha1/types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ package v1alpha1 import ( "strconv" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/util" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/gcp/compute/v1alpha1/types_test.go b/pkg/apis/gcp/compute/v1alpha1/types_test.go index 01be5f08e0..e84021d2d4 100644 --- a/pkg/apis/gcp/compute/v1alpha1/types_test.go +++ b/pkg/apis/gcp/compute/v1alpha1/types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ import ( "log" "testing" + "github.com/crossplaneio/crossplane/pkg/test" . "github.com/onsi/gomega" - "github.com/upbound/conductor/pkg/test" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" diff --git a/pkg/apis/gcp/compute/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/gcp/compute/v1alpha1/zz_generated.deepcopy.go index 8ed761d5f9..12cff3d911 100644 --- a/pkg/apis/gcp/compute/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/gcp/compute/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,33 +20,33 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" + v1 "k8s.io/api/core/v1" + runtime "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (g *GKECluster) DeepCopyInto(out *GKECluster) { - *out = *g - out.TypeMeta = g.TypeMeta - g.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - g.Spec.DeepCopyInto(&out.Spec) - g.Status.DeepCopyInto(&out.Status) +func (in *GKECluster) DeepCopyInto(out *GKECluster) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GKECluster. -func (g *GKECluster) DeepCopy() *GKECluster { - if g == nil { +func (in *GKECluster) DeepCopy() *GKECluster { + if in == nil { return nil } out := new(GKECluster) - g.DeepCopyInto(out) + in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (g *GKECluster) DeepCopyObject() runtime.Object { - if c := g.DeepCopy(); c != nil { +func (in *GKECluster) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { return c } return nil diff --git a/pkg/apis/gcp/database/database.go b/pkg/apis/gcp/database/database.go index cc324da6ca..d02e45080f 100644 --- a/pkg/apis/gcp/database/database.go +++ b/pkg/apis/gcp/database/database.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/gcp/database/v1alpha1/cloudsql_instance_types.go b/pkg/apis/gcp/database/v1alpha1/cloudsql_instance_types.go index aeae2da462..908de18dfc 100644 --- a/pkg/apis/gcp/database/v1alpha1/cloudsql_instance_types.go +++ b/pkg/apis/gcp/database/v1alpha1/cloudsql_instance_types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/util" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/gcp/database/v1alpha1/cloudsql_instance_types_test.go b/pkg/apis/gcp/database/v1alpha1/cloudsql_instance_types_test.go index 467a594200..5323ee1a27 100644 --- a/pkg/apis/gcp/database/v1alpha1/cloudsql_instance_types_test.go +++ b/pkg/apis/gcp/database/v1alpha1/cloudsql_instance_types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ package v1alpha1 import ( "testing" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" "github.com/onsi/gomega" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/apis/gcp/database/v1alpha1/doc.go b/pkg/apis/gcp/database/v1alpha1/doc.go index 182ee369a2..36036a1b2a 100644 --- a/pkg/apis/gcp/database/v1alpha1/doc.go +++ b/pkg/apis/gcp/database/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the database v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/gcp/database +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/gcp/database // +k8s:defaulter-gen=TypeMeta -// +groupName=database.gcp.conductor.io +// +groupName=database.gcp.crossplane.io package v1alpha1 diff --git a/pkg/apis/gcp/database/v1alpha1/register.go b/pkg/apis/gcp/database/v1alpha1/register.go index 24c4e2c44c..a4ab0bb350 100644 --- a/pkg/apis/gcp/database/v1alpha1/register.go +++ b/pkg/apis/gcp/database/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the database v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/gcp/apis/gcp/database +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/gcp/apis/gcp/database // +k8s:defaulter-gen=TypeMeta -// +groupName=database.gcp.conductor.io +// +groupName=database.gcp.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "database.gcp.conductor.io" + Group = "database.gcp.crossplane.io" Version = "v1alpha1" APIVersion = Group + "/" + Version CloudsqlInstanceKind = "cloudsqlinstance" diff --git a/pkg/apis/gcp/database/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/gcp/database/v1alpha1/v1alpha1_suite_test.go index 0a2f890418..429982f74c 100644 --- a/pkg/apis/gcp/database/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/gcp/database/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import ( "log" "testing" - "github.com/upbound/conductor/pkg/test" + "github.com/crossplaneio/crossplane/pkg/test" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/apis/gcp/database/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/gcp/database/v1alpha1/zz_generated.deepcopy.go index e02e14b0ba..4c6f0854aa 100644 --- a/pkg/apis/gcp/database/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/gcp/database/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,33 +20,33 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" + v1 "k8s.io/api/core/v1" + runtime "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (c *CloudsqlInstance) DeepCopyInto(out *CloudsqlInstance) { - *out = *c - out.TypeMeta = c.TypeMeta - c.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - c.Spec.DeepCopyInto(&out.Spec) - c.Status.DeepCopyInto(&out.Status) +func (in *CloudsqlInstance) DeepCopyInto(out *CloudsqlInstance) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CloudsqlInstance. -func (c *CloudsqlInstance) DeepCopy() *CloudsqlInstance { - if c == nil { +func (in *CloudsqlInstance) DeepCopy() *CloudsqlInstance { + if in == nil { return nil } out := new(CloudsqlInstance) - c.DeepCopyInto(out) + in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (c *CloudsqlInstance) DeepCopyObject() runtime.Object { - if c := c.DeepCopy(); c != nil { +func (in *CloudsqlInstance) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { return c } return nil diff --git a/pkg/apis/gcp/gcp.go b/pkg/apis/gcp/gcp.go index 2fb6f2a0cb..1803f6d701 100644 --- a/pkg/apis/gcp/gcp.go +++ b/pkg/apis/gcp/gcp.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,9 +18,9 @@ limitations under the License. package gcp import ( - computev1alpha1 "github.com/upbound/conductor/pkg/apis/gcp/compute/v1alpha1" - databasev1alpha1 "github.com/upbound/conductor/pkg/apis/gcp/database/v1alpha1" - "github.com/upbound/conductor/pkg/apis/gcp/v1alpha1" + computev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/gcp/compute/v1alpha1" + databasev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/gcp/database/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/apis/gcp/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/gcp/storage/storage.go b/pkg/apis/gcp/storage/storage.go index 58d489667b..310c99e8a6 100644 --- a/pkg/apis/gcp/storage/storage.go +++ b/pkg/apis/gcp/storage/storage.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/gcp/storage/v1alpha1/bucket_types.go b/pkg/apis/gcp/storage/v1alpha1/bucket_types.go index f85e4285b2..f29a072ea9 100644 --- a/pkg/apis/gcp/storage/v1alpha1/bucket_types.go +++ b/pkg/apis/gcp/storage/v1alpha1/bucket_types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/gcp/storage/v1alpha1/bucket_types_test.go b/pkg/apis/gcp/storage/v1alpha1/bucket_types_test.go index aff6e50806..8e7e27110c 100644 --- a/pkg/apis/gcp/storage/v1alpha1/bucket_types_test.go +++ b/pkg/apis/gcp/storage/v1alpha1/bucket_types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/gcp/storage/v1alpha1/doc.go b/pkg/apis/gcp/storage/v1alpha1/doc.go index 3a36b66895..c2b65b7aaa 100644 --- a/pkg/apis/gcp/storage/v1alpha1/doc.go +++ b/pkg/apis/gcp/storage/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the storage v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/gcp/storage +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/gcp/storage // +k8s:defaulter-gen=TypeMeta -// +groupName=storage.gcp.conductor.io +// +groupName=storage.gcp.crossplane.io package v1alpha1 diff --git a/pkg/apis/gcp/storage/v1alpha1/register.go b/pkg/apis/gcp/storage/v1alpha1/register.go index e9e0e584a2..3383a78781 100644 --- a/pkg/apis/gcp/storage/v1alpha1/register.go +++ b/pkg/apis/gcp/storage/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the storage v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/gcp/storage +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/gcp/storage // +k8s:defaulter-gen=TypeMeta -// +groupName=storage.gcp.conductor.io +// +groupName=storage.gcp.crossplane.io package v1alpha1 import ( @@ -31,7 +31,7 @@ import ( var ( // SchemeGroupVersion is group version used to register these objects - SchemeGroupVersion = schema.GroupVersion{Group: "storage.gcp.conductor.io", Version: "v1alpha1"} + SchemeGroupVersion = schema.GroupVersion{Group: "storage.gcp.crossplane.io", Version: "v1alpha1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} diff --git a/pkg/apis/gcp/storage/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/gcp/storage/v1alpha1/v1alpha1_suite_test.go index fca3f22d76..2ec5f6746c 100644 --- a/pkg/apis/gcp/storage/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/gcp/storage/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ var c client.Client func TestMain(m *testing.M) { t := &envtest.Environment{ CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "..", - "cluster", "charts", "conductor", "crds", "gcp", "storage", "v1alpha1")}, + "cluster", "charts", "crossplane", "crds", "gcp", "storage", "v1alpha1")}, } err := SchemeBuilder.AddToScheme(scheme.Scheme) diff --git a/pkg/apis/gcp/storage/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/gcp/storage/v1alpha1/zz_generated.deepcopy.go index a1dfdbdc3a..768d6ef425 100644 --- a/pkg/apis/gcp/storage/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/gcp/storage/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/gcp/v1alpha1/doc.go b/pkg/apis/gcp/v1alpha1/doc.go index 82ca26c485..a074c5339f 100644 --- a/pkg/apis/gcp/v1alpha1/doc.go +++ b/pkg/apis/gcp/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the gcp v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/gcp +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/gcp // +k8s:defaulter-gen=TypeMeta -// +groupName=gcp.conductor.io +// +groupName=gcp.crossplane.io package v1alpha1 diff --git a/pkg/apis/gcp/v1alpha1/register.go b/pkg/apis/gcp/v1alpha1/register.go index 1183c107c1..406c0b62d9 100644 --- a/pkg/apis/gcp/v1alpha1/register.go +++ b/pkg/apis/gcp/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the gcp v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/gcp/apis/gcp +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/gcp/apis/gcp // +k8s:defaulter-gen=TypeMeta -// +groupName=gcp.conductor.io +// +groupName=gcp.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "gcp.conductor.io" + Group = "gcp.crossplane.io" Version = "v1alpha1" APIVersion = Group + "/" + Version ) diff --git a/pkg/apis/gcp/v1alpha1/types.go b/pkg/apis/gcp/v1alpha1/types.go index fd88c26546..c4fc2e31cd 100644 --- a/pkg/apis/gcp/v1alpha1/types.go +++ b/pkg/apis/gcp/v1alpha1/types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/gcp/v1alpha1/types_test.go b/pkg/apis/gcp/v1alpha1/types_test.go index 99b9d37548..e429dca5fd 100644 --- a/pkg/apis/gcp/v1alpha1/types_test.go +++ b/pkg/apis/gcp/v1alpha1/types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/gcp/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/gcp/v1alpha1/v1alpha1_suite_test.go index 89c7f802b5..11f334114b 100644 --- a/pkg/apis/gcp/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/gcp/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import ( "log" "testing" - "github.com/upbound/conductor/pkg/test" + "github.com/crossplaneio/crossplane/pkg/test" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/apis/gcp/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/gcp/v1alpha1/zz_generated.deepcopy.go index 0d7f33f507..7ae61edbda 100644 --- a/pkg/apis/gcp/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/gcp/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/storage/storage.go b/pkg/apis/storage/storage.go index 41184c02bc..2365eb4fb1 100644 --- a/pkg/apis/storage/storage.go +++ b/pkg/apis/storage/storage.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ limitations under the License. package storage import ( - "github.com/upbound/conductor/pkg/apis/storage/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/apis/storage/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/storage/v1alpha1/doc.go b/pkg/apis/storage/v1alpha1/doc.go index 2098d30ddc..a4922e8041 100644 --- a/pkg/apis/storage/v1alpha1/doc.go +++ b/pkg/apis/storage/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package v1alpha1 contains API Schema definitions for the conductor core v1alpha1 API group +// Package v1alpha1 contains API Schema definitions for the crossplane core v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/storage +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/storage // +k8s:defaulter-gen=TypeMeta -// +groupName=storage.conductor.io +// +groupName=storage.crossplane.io package v1alpha1 diff --git a/pkg/apis/storage/v1alpha1/register.go b/pkg/apis/storage/v1alpha1/register.go index 974574f40f..a5ff2144b4 100644 --- a/pkg/apis/storage/v1alpha1/register.go +++ b/pkg/apis/storage/v1alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ limitations under the License. // NOTE: Boilerplate only. Ignore this file. -// Package v1alpha1 contains API Schema definitions for the conductor core v1alpha1 API group +// Package v1alpha1 contains API Schema definitions for the crossplane core v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/upbound/conductor/pkg/apis/storage +// +k8s:conversion-gen=github.com/crossplaneio/crossplane/pkg/apis/storage // +k8s:defaulter-gen=TypeMeta -// +groupName=storage.conductor.io +// +groupName=storage.crossplane.io package v1alpha1 import ( @@ -30,7 +30,7 @@ import ( ) const ( - Group = "storage.conductor.io" + Group = "storage.crossplane.io" Version = "v1alpha1" APIVersion = Group + "/" + Version MySQLInstanceKind = "mysqlinstance" diff --git a/pkg/apis/storage/v1alpha1/types.go b/pkg/apis/storage/v1alpha1/types.go index 5519e9a569..09e61000b5 100644 --- a/pkg/apis/storage/v1alpha1/types.go +++ b/pkg/apis/storage/v1alpha1/types.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/util" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -41,7 +41,7 @@ type MySQLInstanceClaimStatus struct { corev1alpha1.BindingStatusPhase // Provisioner is the driver that was used to provision the concrete resrouce // This is an optionally-prefixed name, like a label key. - // For example: "RDSInstance.database.aws.conductor.io/v1alpha1" or "CloudSQLInstance.database.gcp.conductor.io/v1alpha1". + // For example: "RDSInstance.database.aws.crossplane.io/v1alpha1" or "CloudSQLInstance.database.gcp.crossplane.io/v1alpha1". Provisioner string `json:"provisioner,omitempty"` } @@ -102,7 +102,7 @@ type BucketClaimStatus struct { corev1alpha1.BindingStatusPhase // Provisioner is the driver that was used to provision the concrete resource // This is an optionally-prefixed name, like a label key. - // For example: "S3Bucket.storage.aws.conductor.io/v1alpha1" or "GoogleBucket.storage.gcp.conductor.io/v1alpha1". + // For example: "S3Bucket.storage.aws.crossplane.io/v1alpha1" or "GoogleBucket.storage.gcp.crossplane.io/v1alpha1". Provisioner string `json:"provisioner,omitempty"` } diff --git a/pkg/apis/storage/v1alpha1/types_test.go b/pkg/apis/storage/v1alpha1/types_test.go index c97cf65fa6..4a91dd54e8 100644 --- a/pkg/apis/storage/v1alpha1/types_test.go +++ b/pkg/apis/storage/v1alpha1/types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/storage/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/storage/v1alpha1/v1alpha1_suite_test.go index fd716dd39a..4e014a6f4b 100644 --- a/pkg/apis/storage/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/storage/v1alpha1/v1alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "log" "testing" - "github.com/upbound/conductor/pkg/test" + "github.com/crossplaneio/crossplane/pkg/test" "golang.org/x/net/context" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" diff --git a/pkg/apis/storage/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/storage/v1alpha1/zz_generated.deepcopy.go index 9d9fcbc2b0..ff6eb836c0 100644 --- a/pkg/apis/storage/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/storage/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" + v1 "k8s.io/api/core/v1" + runtime "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -136,28 +136,28 @@ func (in *BucketSpec) DeepCopy() *BucketSpec { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (m *MySQLInstance) DeepCopyInto(out *MySQLInstance) { - *out = *m - out.TypeMeta = m.TypeMeta - m.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - m.Spec.DeepCopyInto(&out.Spec) - m.Status.DeepCopyInto(&out.Status) +func (in *MySQLInstance) DeepCopyInto(out *MySQLInstance) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MySQLInstance. -func (m *MySQLInstance) DeepCopy() *MySQLInstance { - if m == nil { +func (in *MySQLInstance) DeepCopy() *MySQLInstance { + if in == nil { return nil } out := new(MySQLInstance) - m.DeepCopyInto(out) + in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (m *MySQLInstance) DeepCopyObject() runtime.Object { - if c := m.DeepCopy(); c != nil { +func (in *MySQLInstance) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { return c } return nil diff --git a/pkg/clients/aws/aws.go b/pkg/clients/aws/aws.go index afdf5e4c72..07f1b92d72 100644 --- a/pkg/clients/aws/aws.go +++ b/pkg/clients/aws/aws.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,9 +22,9 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/external" "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/crossplaneio/crossplane/pkg/apis/aws/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" "github.com/go-ini/ini" - "github.com/upbound/conductor/pkg/apis/aws/v1alpha1" - "github.com/upbound/conductor/pkg/util" "k8s.io/client-go/kubernetes" ) diff --git a/pkg/clients/aws/aws_test.go b/pkg/clients/aws/aws_test.go index 3bf9f30329..44691ecdca 100644 --- a/pkg/clients/aws/aws_test.go +++ b/pkg/clients/aws/aws_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/clients/aws/eks/eks.go b/pkg/clients/aws/eks/eks.go index 9e421b99f1..0f270640bd 100644 --- a/pkg/clients/aws/eks/eks.go +++ b/pkg/clients/aws/eks/eks.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/eks" "github.com/aws/aws-sdk-go-v2/service/eks/eksiface" - awscomputev1alpha1 "github.com/upbound/conductor/pkg/apis/aws/compute/v1alpha1" + awscomputev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/compute/v1alpha1" ) const ( @@ -34,7 +34,7 @@ const ( v1Prefix = "k8s-aws-v1." ) -// Cluster conductor representation of the to AWS EKS Cluster +// Cluster crossplane representation of the to AWS EKS Cluster type Cluster struct { Name string ARN string @@ -61,13 +61,13 @@ type Client interface { ConnectionToken(string) (string, error) } -// EKSClient conductor eks client +// EKSClient crossplane eks client type EKSClient struct { eks eksiface.EKSAPI sts *sts.STS } -// NewClient return new instance of the conductor client for a specific AWS configuration +// NewClient return new instance of the crossplane client for a specific AWS configuration func NewClient(config *aws.Config) Client { return &EKSClient{eks.New(*config), sts.New(*config)} } diff --git a/pkg/clients/aws/eks/fake/fake.go b/pkg/clients/aws/eks/fake/fake.go index 31fbfbe789..f0e7259f64 100644 --- a/pkg/clients/aws/eks/fake/fake.go +++ b/pkg/clients/aws/eks/fake/fake.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ limitations under the License. package fake import ( - "github.com/upbound/conductor/pkg/apis/aws/compute/v1alpha1" - "github.com/upbound/conductor/pkg/clients/aws/eks" + "github.com/crossplaneio/crossplane/pkg/apis/aws/compute/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/clients/aws/eks" ) type MockEKSClient struct { diff --git a/pkg/clients/aws/rds/fake/fake.go b/pkg/clients/aws/rds/fake/fake.go index 4903146a25..237f6d6639 100644 --- a/pkg/clients/aws/rds/fake/fake.go +++ b/pkg/clients/aws/rds/fake/fake.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ limitations under the License. package fake import ( - "github.com/upbound/conductor/pkg/apis/aws/database/v1alpha1" - "github.com/upbound/conductor/pkg/clients/aws/rds" + "github.com/crossplaneio/crossplane/pkg/apis/aws/database/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/clients/aws/rds" ) type MockRDSClient struct { diff --git a/pkg/clients/aws/rds/rds.go b/pkg/clients/aws/rds/rds.go index 4ab54d4c93..68dc1319a3 100644 --- a/pkg/clients/aws/rds/rds.go +++ b/pkg/clients/aws/rds/rds.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,10 +23,10 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/rds" "github.com/aws/aws-sdk-go-v2/service/rds/rdsiface" - "github.com/upbound/conductor/pkg/apis/aws/database/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/apis/aws/database/v1alpha1" ) -// Instance conductor representation of the to AWS DBInstance +// Instance crossplane representation of the to AWS DBInstance type Instance struct { Name string ARN string diff --git a/pkg/controller/aws/aws.go b/pkg/controller/aws/aws.go index 3fe00b747a..0ec94eaceb 100644 --- a/pkg/controller/aws/aws.go +++ b/pkg/controller/aws/aws.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ limitations under the License. package aws import ( - "github.com/upbound/conductor/pkg/controller/aws/compute" - "github.com/upbound/conductor/pkg/controller/aws/provider" - "github.com/upbound/conductor/pkg/controller/aws/rds" + "github.com/crossplaneio/crossplane/pkg/controller/aws/compute" + "github.com/crossplaneio/crossplane/pkg/controller/aws/provider" + "github.com/crossplaneio/crossplane/pkg/controller/aws/rds" "sigs.k8s.io/controller-runtime/pkg/manager" ) diff --git a/pkg/controller/aws/compute/eks.go b/pkg/controller/aws/compute/eks.go index eea5eac53d..f70f0c5bd5 100644 --- a/pkg/controller/aws/compute/eks.go +++ b/pkg/controller/aws/compute/eks.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,12 +20,12 @@ import ( "context" "fmt" - awscomputev1alpha1 "github.com/upbound/conductor/pkg/apis/aws/compute/v1alpha1" - awsv1alpha1 "github.com/upbound/conductor/pkg/apis/aws/v1alpha1" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/clients/aws" - "github.com/upbound/conductor/pkg/clients/aws/eks" - "github.com/upbound/conductor/pkg/util" + awscomputev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/compute/v1alpha1" + awsv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/clients/aws" + "github.com/crossplaneio/crossplane/pkg/clients/aws/eks" + "github.com/crossplaneio/crossplane/pkg/util" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -40,7 +40,7 @@ import ( ) const ( - controllerName = "eks.compute.aws.conductor.io" + controllerName = "eks.compute.aws.crossplane.io" finalizer = "finalizer." + controllerName clusterNamePrefix = "eks-" diff --git a/pkg/controller/aws/compute/eks_test.go b/pkg/controller/aws/compute/eks_test.go index 3f97e229dc..b3118206b1 100644 --- a/pkg/controller/aws/compute/eks_test.go +++ b/pkg/controller/aws/compute/eks_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,12 +20,12 @@ import ( "fmt" "testing" + "github.com/crossplaneio/crossplane/pkg/apis/aws" + . "github.com/crossplaneio/crossplane/pkg/apis/aws/compute/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/clients/aws/eks" + "github.com/crossplaneio/crossplane/pkg/clients/aws/eks/fake" . "github.com/onsi/gomega" - "github.com/upbound/conductor/pkg/apis/aws" - . "github.com/upbound/conductor/pkg/apis/aws/compute/v1alpha1" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/clients/aws/eks" - "github.com/upbound/conductor/pkg/clients/aws/eks/fake" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/controller/aws/provider/provider.go b/pkg/controller/aws/provider/provider.go index e94734e138..42cc4fd67d 100644 --- a/pkg/controller/aws/provider/provider.go +++ b/pkg/controller/aws/provider/provider.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ import ( "context" "github.com/aws/aws-sdk-go-v2/aws" + awsv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/v1alpha1" + awsclient "github.com/crossplaneio/crossplane/pkg/clients/aws" + "github.com/crossplaneio/crossplane/pkg/util" "github.com/go-ini/ini" - awsv1alpha1 "github.com/upbound/conductor/pkg/apis/aws/v1alpha1" - awsclient "github.com/upbound/conductor/pkg/clients/aws" - "github.com/upbound/conductor/pkg/util" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes" @@ -108,7 +108,7 @@ func (r *Reconciler) _validate(config *aws.Config) error { // and what is in the Provider.Spec // Automatically generate RBAC rules to allow the Controller to read and write Deployments // +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=aws.conductor.io,resources=provider,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=aws.crossplane.io,resources=provider,verbs=get;list;watch;create;update;patch;delete func (r *Reconciler) Reconcile(request reconcile.Request) (reconcile.Result, error) { // Fetch the Provider instance instance := &awsv1alpha1.Provider{} diff --git a/pkg/controller/aws/provider/provider_test.go b/pkg/controller/aws/provider/provider_test.go index 22848438da..1078f7172a 100644 --- a/pkg/controller/aws/provider/provider_test.go +++ b/pkg/controller/aws/provider/provider_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,14 +21,14 @@ import ( "strings" "testing" + . "github.com/crossplaneio/crossplane/pkg/apis/aws/v1alpha1" . "github.com/onsi/gomega" - . "github.com/upbound/conductor/pkg/apis/aws/v1alpha1" . "k8s.io/client-go/kubernetes/fake" . "sigs.k8s.io/controller-runtime/pkg/client/fake" "github.com/aws/aws-sdk-go-v2/aws" - apisaws "github.com/upbound/conductor/pkg/apis/aws" - awsv1alpha1 "github.com/upbound/conductor/pkg/apis/aws/v1alpha1" + apisaws "github.com/crossplaneio/crossplane/pkg/apis/aws" + awsv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/aws/rds/rdsinstance.go b/pkg/controller/aws/rds/rdsinstance.go index 5e7d0ef461..72cc80b03f 100644 --- a/pkg/controller/aws/rds/rdsinstance.go +++ b/pkg/controller/aws/rds/rdsinstance.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,12 +21,12 @@ import ( "fmt" "log" - databasev1alpha1 "github.com/upbound/conductor/pkg/apis/aws/database/v1alpha1" - awsv1alpha1 "github.com/upbound/conductor/pkg/apis/aws/v1alpha1" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/clients/aws" - "github.com/upbound/conductor/pkg/clients/aws/rds" - "github.com/upbound/conductor/pkg/util" + databasev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/database/v1alpha1" + awsv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/clients/aws" + "github.com/crossplaneio/crossplane/pkg/clients/aws/rds" + "github.com/crossplaneio/crossplane/pkg/util" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -43,7 +43,7 @@ import ( ) const ( - controllerName = "rds.aws.conductor.io" + controllerName = "rds.aws.crossplane.io" finalizer = "finalizer." + controllerName errorResourceClient = "Failed to create rds client" @@ -127,7 +127,7 @@ func (r *Reconciler) fail(instance *databasev1alpha1.RDSInstance, reason, msg st // connectionSecret return secret object for this resource func connectionSecret(instance *databasev1alpha1.RDSInstance, password string) *corev1.Secret { if instance.APIVersion == "" { - instance.APIVersion = "database.aws.conductor.io/v1alpha1" + instance.APIVersion = "database.aws.crossplane.io/v1alpha1" } if instance.Kind == "" { instance.Kind = "RDSInstance" diff --git a/pkg/controller/aws/rds/rdsinstance_test.go b/pkg/controller/aws/rds/rdsinstance_test.go index 7b1708d344..db7d088ac8 100644 --- a/pkg/controller/aws/rds/rdsinstance_test.go +++ b/pkg/controller/aws/rds/rdsinstance_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,13 +20,13 @@ import ( "fmt" "testing" + "github.com/crossplaneio/crossplane/pkg/apis/aws" + . "github.com/crossplaneio/crossplane/pkg/apis/aws/database/v1alpha1" + awsv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/clients/aws/rds" + . "github.com/crossplaneio/crossplane/pkg/clients/aws/rds/fake" . "github.com/onsi/gomega" - "github.com/upbound/conductor/pkg/apis/aws" - . "github.com/upbound/conductor/pkg/apis/aws/database/v1alpha1" - awsv1alpha1 "github.com/upbound/conductor/pkg/apis/aws/v1alpha1" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/clients/aws/rds" - . "github.com/upbound/conductor/pkg/clients/aws/rds/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/compute/compute.go b/pkg/controller/compute/compute.go index 4618fcdbb7..46504f8790 100644 --- a/pkg/controller/compute/compute.go +++ b/pkg/controller/compute/compute.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. package compute import ( - "github.com/upbound/conductor/pkg/controller/compute/kubernetes" + "github.com/crossplaneio/crossplane/pkg/controller/compute/kubernetes" "sigs.k8s.io/controller-runtime/pkg/manager" ) diff --git a/pkg/controller/compute/kubernetes/cluster.go b/pkg/controller/compute/kubernetes/cluster.go index 3c3daaf39a..067017033a 100644 --- a/pkg/controller/compute/kubernetes/cluster.go +++ b/pkg/controller/compute/kubernetes/cluster.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ import ( "context" "fmt" - computev1alpha1 "github.com/upbound/conductor/pkg/apis/compute/v1alpha1" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - gcpcomputev1alpha1 "github.com/upbound/conductor/pkg/apis/gcp/compute/v1alpha1" - "github.com/upbound/conductor/pkg/util" + computev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/compute/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + gcpcomputev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/gcp/compute/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -41,7 +41,7 @@ import ( ) const ( - controllerName = "kubernetes.compute.conductor.io" + controllerName = "kubernetes.compute.crossplane.io" finalizer = "finalizer." + controllerName errorResourceClassNotDefined = "Resource class is not provided" diff --git a/pkg/controller/compute/kubernetes/gcp_handler.go b/pkg/controller/compute/kubernetes/gcp_handler.go index 0c757f4755..f22884f717 100644 --- a/pkg/controller/compute/kubernetes/gcp_handler.go +++ b/pkg/controller/compute/kubernetes/gcp_handler.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ limitations under the License. package kubernetes import ( - computev1alpha1 "github.com/upbound/conductor/pkg/apis/compute/v1alpha1" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - gcpcomputev1alpha1 "github.com/upbound/conductor/pkg/apis/gcp/compute/v1alpha1" - "github.com/upbound/conductor/pkg/clients/gcp" - "github.com/upbound/conductor/pkg/util" + computev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/compute/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + gcpcomputev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/gcp/compute/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/clients/gcp" + "github.com/crossplaneio/crossplane/pkg/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 6e55fc5493..7aa9a91d8a 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ limitations under the License. package controller import ( - "github.com/upbound/conductor/pkg/controller/aws" - "github.com/upbound/conductor/pkg/controller/azure" - "github.com/upbound/conductor/pkg/controller/compute" - "github.com/upbound/conductor/pkg/controller/gcp" - "github.com/upbound/conductor/pkg/controller/storage" + "github.com/crossplaneio/crossplane/pkg/controller/aws" + "github.com/crossplaneio/crossplane/pkg/controller/azure" + "github.com/crossplaneio/crossplane/pkg/controller/compute" + "github.com/crossplaneio/crossplane/pkg/controller/gcp" + "github.com/crossplaneio/crossplane/pkg/controller/storage" "sigs.k8s.io/controller-runtime/pkg/manager" ) diff --git a/pkg/controller/storage/mysql/aws_handler.go b/pkg/controller/storage/mysql/aws_handler.go index fb3e1a5f0f..707007ff24 100644 --- a/pkg/controller/storage/mysql/aws_handler.go +++ b/pkg/controller/storage/mysql/aws_handler.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ package mysql import ( "fmt" - awsdbv1alpha1 "github.com/upbound/conductor/pkg/apis/aws/database/v1alpha1" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - mysqlv1alpha1 "github.com/upbound/conductor/pkg/apis/storage/v1alpha1" + awsdbv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/database/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + mysqlv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/storage/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/storage/mysql/aws_handler_test.go b/pkg/controller/storage/mysql/aws_handler_test.go index 45dc6c15c2..3ee816e012 100644 --- a/pkg/controller/storage/mysql/aws_handler_test.go +++ b/pkg/controller/storage/mysql/aws_handler_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ package mysql import ( "testing" + awsdbv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/database/v1alpha1" + mysqlv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/storage/v1alpha1" . "github.com/onsi/gomega" - awsdbv1alpha1 "github.com/upbound/conductor/pkg/apis/aws/database/v1alpha1" - mysqlv1alpha1 "github.com/upbound/conductor/pkg/apis/storage/v1alpha1" ) func TestTranslateToRDSInstance(t *testing.T) { diff --git a/pkg/controller/storage/mysql/azure_handler.go b/pkg/controller/storage/mysql/azure_handler.go index 9c028c435d..7c38c7bb2d 100644 --- a/pkg/controller/storage/mysql/azure_handler.go +++ b/pkg/controller/storage/mysql/azure_handler.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,10 +19,10 @@ package mysql import ( "fmt" - azuredbv1alpha1 "github.com/upbound/conductor/pkg/apis/azure/database/v1alpha1" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - mysqlv1alpha1 "github.com/upbound/conductor/pkg/apis/storage/v1alpha1" - "github.com/upbound/conductor/pkg/util" + azuredbv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/azure/database/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + mysqlv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/storage/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/storage/mysql/azure_handler_test.go b/pkg/controller/storage/mysql/azure_handler_test.go index fab28ade74..584064d532 100644 --- a/pkg/controller/storage/mysql/azure_handler_test.go +++ b/pkg/controller/storage/mysql/azure_handler_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ package mysql import ( "testing" + azuredbv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/azure/database/v1alpha1" + mysqlv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/storage/v1alpha1" . "github.com/onsi/gomega" - azuredbv1alpha1 "github.com/upbound/conductor/pkg/apis/azure/database/v1alpha1" - mysqlv1alpha1 "github.com/upbound/conductor/pkg/apis/storage/v1alpha1" ) func TestTranslateValuesToAzureMySQLServer(t *testing.T) { diff --git a/pkg/controller/storage/mysql/gcp_handler.go b/pkg/controller/storage/mysql/gcp_handler.go index 4331610fc2..ed7bd4a9c9 100644 --- a/pkg/controller/storage/mysql/gcp_handler.go +++ b/pkg/controller/storage/mysql/gcp_handler.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,10 +19,10 @@ package mysql import ( "fmt" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - gcpdbv1alpha1 "github.com/upbound/conductor/pkg/apis/gcp/database/v1alpha1" - mysqlv1alpha1 "github.com/upbound/conductor/pkg/apis/storage/v1alpha1" - "github.com/upbound/conductor/pkg/util" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + gcpdbv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/gcp/database/v1alpha1" + mysqlv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/storage/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/storage/mysql/gcp_handler_test.go b/pkg/controller/storage/mysql/gcp_handler_test.go index e753faad79..828ffbfd21 100644 --- a/pkg/controller/storage/mysql/gcp_handler_test.go +++ b/pkg/controller/storage/mysql/gcp_handler_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ package mysql import ( "testing" + gcpdbv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/gcp/database/v1alpha1" + mysqlv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/storage/v1alpha1" . "github.com/onsi/gomega" - gcpdbv1alpha1 "github.com/upbound/conductor/pkg/apis/gcp/database/v1alpha1" - mysqlv1alpha1 "github.com/upbound/conductor/pkg/apis/storage/v1alpha1" ) func TestTranslateToCloudSQL(t *testing.T) { diff --git a/pkg/controller/storage/mysql/mysqlinstance.go b/pkg/controller/storage/mysql/mysqlinstance.go index 92b3b5fbfb..e4bc4f260b 100644 --- a/pkg/controller/storage/mysql/mysqlinstance.go +++ b/pkg/controller/storage/mysql/mysqlinstance.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,12 +20,12 @@ import ( "context" "fmt" - awsdatabasev1alpha1 "github.com/upbound/conductor/pkg/apis/aws/database/v1alpha1" - azuredbv1alpha1 "github.com/upbound/conductor/pkg/apis/azure/database/v1alpha1" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - gcpdbv1alpha1 "github.com/upbound/conductor/pkg/apis/gcp/database/v1alpha1" - mysqlv1alpha1 "github.com/upbound/conductor/pkg/apis/storage/v1alpha1" - "github.com/upbound/conductor/pkg/util" + awsdatabasev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/aws/database/v1alpha1" + azuredbv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/azure/database/v1alpha1" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + gcpdbv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/gcp/database/v1alpha1" + mysqlv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/storage/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/util" "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -44,7 +44,7 @@ import ( const ( controllerName = "mysql-storage" - finalizer = "finalizer.mysql.storage.conductor.io" + finalizer = "finalizer.mysql.storage.crossplane.io" errorResourceClassNotDefined = "Resource class is not provided" errorResourceProvisioning = "Failed to _provision new resource" diff --git a/pkg/controller/storage/mysql/mysqlinstance_suite_test.go b/pkg/controller/storage/mysql/mysqlinstance_suite_test.go index 61e59fbd42..1ac4925878 100644 --- a/pkg/controller/storage/mysql/mysqlinstance_suite_test.go +++ b/pkg/controller/storage/mysql/mysqlinstance_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,10 +19,10 @@ package mysql import ( "context" "flag" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - "github.com/upbound/conductor/pkg/apis/storage" - . "github.com/upbound/conductor/pkg/apis/storage/v1alpha1" - "github.com/upbound/conductor/pkg/test" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/apis/storage" + . "github.com/crossplaneio/crossplane/pkg/apis/storage/v1alpha1" + "github.com/crossplaneio/crossplane/pkg/test" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/storage/mysql/mysqlinstance_test.go b/pkg/controller/storage/mysql/mysqlinstance_test.go index 98f9ca687a..c7a1bbfb50 100644 --- a/pkg/controller/storage/mysql/mysqlinstance_test.go +++ b/pkg/controller/storage/mysql/mysqlinstance_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1" + . "github.com/crossplaneio/crossplane/pkg/apis/storage/v1alpha1" . "github.com/onsi/gomega" - corev1alpha1 "github.com/upbound/conductor/pkg/apis/core/v1alpha1" - . "github.com/upbound/conductor/pkg/apis/storage/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/storage/storage.go b/pkg/controller/storage/storage.go index 0d35ac4989..4834c3e586 100644 --- a/pkg/controller/storage/storage.go +++ b/pkg/controller/storage/storage.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Conductor Authors. +Copyright 2018 The Crossplane Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. package storage import ( - "github.com/upbound/conductor/pkg/controller/storage/mysql" + "github.com/crossplaneio/crossplane/pkg/controller/storage/mysql" "sigs.k8s.io/controller-runtime/pkg/manager" )