From 9f20dd9c1b9caf0e3623d50c2f650af48c9065c0 Mon Sep 17 00:00:00 2001 From: Zheng Xi Zhou Date: Wed, 17 Mar 2021 11:20:31 +0800 Subject: [PATCH] Move around unrelated commits Moved copyright Year bump to #62 and examples folder changing to #61 Signed-off-by: Zheng Xi Zhou --- Makefile | 4 ++-- apis/database/v1alpha1/zz_generated.deepcopy.go | 2 +- apis/database/v1alpha1/zz_generated.managed.go | 2 +- apis/database/v1alpha1/zz_generated.managedlist.go | 2 +- apis/sls/v1alpha1/zz_generated.deepcopy.go | 2 +- apis/sls/v1alpha1/zz_generated.managed.go | 2 +- apis/sls/v1alpha1/zz_generated.managedlist.go | 2 +- apis/v1alpha1/zz_generated.deepcopy.go | 2 +- apis/v1alpha1/zz_generated.pc.go | 2 +- apis/v1alpha1/zz_generated.pcu.go | 2 +- apis/v1alpha1/zz_generated.pculist.go | 2 +- {examples => cluster/examples}/database/rds.yaml | 0 {examples => cluster/examples}/provider.yaml | 0 hack/boilerplate.go.txt | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename {examples => cluster/examples}/database/rds.yaml (100%) rename {examples => cluster/examples}/provider.yaml (100%) diff --git a/Makefile b/Makefile index 3a21888..158b855 100644 --- a/Makefile +++ b/Makefile @@ -140,10 +140,10 @@ demo: docker build . -t ${IMG} -f ./hack/demo/Dockerfile kind load docker-image $(IMG) || { echo >&2 "kind not installed or error loading image: $(IMG)"; exit 1; } kubectl apply -f ./package/crds - cat ./examples/provider.yaml | sed \ + cat ./cluster/examples/provider.yaml | sed \ -e "s|((ACCESS_KEY_ID))|"${ACCESS_KEY_ID}"|g" \ -e "s|((ACCESS_KEY_SECRET))|"${ACCESS_KEY_SECRET}"|g" \ | kubectl apply -f - ./hack/demo/helm_install_crossplane_master.sh - kubectl apply -f ./examples/database/rds.yaml + kubectl apply -f ./cluster/examples/database/rds.yaml kubectl apply -f ./hack/demo/deploy/ diff --git a/apis/database/v1alpha1/zz_generated.deepcopy.go b/apis/database/v1alpha1/zz_generated.deepcopy.go index dab4355..43bdcb9 100644 --- a/apis/database/v1alpha1/zz_generated.deepcopy.go +++ b/apis/database/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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/apis/database/v1alpha1/zz_generated.managed.go b/apis/database/v1alpha1/zz_generated.managed.go index 5051688..84aa6e7 100644 --- a/apis/database/v1alpha1/zz_generated.managed.go +++ b/apis/database/v1alpha1/zz_generated.managed.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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/apis/database/v1alpha1/zz_generated.managedlist.go b/apis/database/v1alpha1/zz_generated.managedlist.go index 80d078c..f5bcdcd 100644 --- a/apis/database/v1alpha1/zz_generated.managedlist.go +++ b/apis/database/v1alpha1/zz_generated.managedlist.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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/apis/sls/v1alpha1/zz_generated.deepcopy.go b/apis/sls/v1alpha1/zz_generated.deepcopy.go index ff67b16..c734b9f 100644 --- a/apis/sls/v1alpha1/zz_generated.deepcopy.go +++ b/apis/sls/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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/apis/sls/v1alpha1/zz_generated.managed.go b/apis/sls/v1alpha1/zz_generated.managed.go index 826eac9..e8f31d1 100644 --- a/apis/sls/v1alpha1/zz_generated.managed.go +++ b/apis/sls/v1alpha1/zz_generated.managed.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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/apis/sls/v1alpha1/zz_generated.managedlist.go b/apis/sls/v1alpha1/zz_generated.managedlist.go index d6d2d40..b094393 100644 --- a/apis/sls/v1alpha1/zz_generated.managedlist.go +++ b/apis/sls/v1alpha1/zz_generated.managedlist.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go index 37eed7f..d140304 100644 --- a/apis/v1alpha1/zz_generated.deepcopy.go +++ b/apis/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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/apis/v1alpha1/zz_generated.pc.go b/apis/v1alpha1/zz_generated.pc.go index 6760604..93c3439 100644 --- a/apis/v1alpha1/zz_generated.pc.go +++ b/apis/v1alpha1/zz_generated.pc.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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/apis/v1alpha1/zz_generated.pcu.go b/apis/v1alpha1/zz_generated.pcu.go index 51b32ad..8dfba82 100644 --- a/apis/v1alpha1/zz_generated.pcu.go +++ b/apis/v1alpha1/zz_generated.pcu.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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/apis/v1alpha1/zz_generated.pculist.go b/apis/v1alpha1/zz_generated.pculist.go index 62685b1..2d92ffd 100644 --- a/apis/v1alpha1/zz_generated.pculist.go +++ b/apis/v1alpha1/zz_generated.pculist.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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/examples/database/rds.yaml b/cluster/examples/database/rds.yaml similarity index 100% rename from examples/database/rds.yaml rename to cluster/examples/database/rds.yaml diff --git a/examples/provider.yaml b/cluster/examples/provider.yaml similarity index 100% rename from examples/provider.yaml rename to cluster/examples/provider.yaml diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt index 4f45dde..e3ac8f2 100644 --- a/hack/boilerplate.go.txt +++ b/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2021 The Crossplane Authors. +Copyright 2020 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.