From 250372c60f16a23cd34b68ae2982b1b982f9829f Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Thu, 9 Jul 2020 10:32:39 -0700 Subject: [PATCH] Prepare for release v0.10.0-beta.1 (#27) ProductLine: Stash Release: v2020.07.09-beta.0 Release-tracker: https://github.com/stashed/CHANGELOG/pull/2 Signed-off-by: 1gtm <1gtm@appscode.com> --- go.mod | 4 +- go.sum | 17 +- vendor/modules.txt | 4 +- vendor/stash.appscode.dev/stash/LICENSE | 201 ------------------ vendor/stash.appscode.dev/stash/LICENSE.md | 10 + .../stash.appscode.dev/stash/pkg/cli/env.go | 6 +- .../stash/pkg/cli/restic.go | 6 +- .../stash/pkg/registry/snapshot/snapshot.go | 6 +- .../stash/pkg/registry/snapshot/utils.go | 6 +- .../stash/pkg/util/backup_batch.go | 6 +- .../stash/pkg/util/backup_configuration.go | 6 +- .../stash.appscode.dev/stash/pkg/util/crds.go | 6 +- .../stash/pkg/util/init_container.go | 6 +- .../stash.appscode.dev/stash/pkg/util/job.go | 6 +- .../stash/pkg/util/kubernetes.go | 6 +- .../stash/pkg/util/options.go | 6 +- .../stash/pkg/util/restic.go | 6 +- .../stash/pkg/util/restore_session.go | 6 +- .../stash/pkg/util/sidecar.go | 6 +- .../stash.appscode.dev/stash/pkg/util/util.go | 10 +- 20 files changed, 65 insertions(+), 265 deletions(-) delete mode 100644 vendor/stash.appscode.dev/stash/LICENSE create mode 100644 vendor/stash.appscode.dev/stash/LICENSE.md diff --git a/go.mod b/go.mod index 1312a4e97..4002a2ade 100644 --- a/go.mod +++ b/go.mod @@ -20,8 +20,8 @@ require ( kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226 kmodules.xyz/openshift v0.0.0-20200522123204-ce4abf5433c8 - stash.appscode.dev/apimachinery v0.10.0-beta.0 - stash.appscode.dev/stash v0.9.0-rc.6.0.20200522144808-7d851e537e77 + stash.appscode.dev/apimachinery v0.10.0-beta.1 + stash.appscode.dev/stash v0.10.0-beta.1 ) replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d diff --git a/go.sum b/go.sum index f980fa819..48d7ab6c6 100644 --- a/go.sum +++ b/go.sum @@ -418,9 +418,7 @@ github.com/kubernetes-csi/csi-lib-utils v0.7.0/go.mod h1:bze+2G9+cmoHxN6+WyG1qT4 github.com/kubernetes-csi/csi-test v2.0.0+incompatible/go.mod h1:YxJ4UiuPWIhMBkxUKY5c267DyA0uDZ/MtAimhx/2TA0= github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1-0.20200521091436-82ef6e66e992 h1:sexeZ+nJGZ82bvi1y15N4eX1r1YAU8LbIREyzSl6sfE= github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1-0.20200521091436-82ef6e66e992/go.mod h1:gozodYSVrG83vojQOd8N2LruDu5Z+piDsIDPtmIuKgg= -github.com/kubernetes-incubator/service-catalog v0.2.3/go.mod h1:D0CRODiXUJs6VCZDB15TmCkesbuizkac9fYEiTA78BA= github.com/kubernetes-sigs/go-open-service-broker-client v0.0.0-20190909175253-906fa5f9c249/go.mod h1:s8wBC55/DEkNa3YMY1WLgpT33Ghpmw7v+waIxh15dYI= -github.com/kubernetes-sigs/service-catalog v0.2.3/go.mod h1:fmRsWJ38Od93DQ7cOXR9mMSSwmjyDS1EAomWxBlumuo= github.com/kubernetes-sigs/service-catalog v0.3.0/go.mod h1:zRfgMd1T9HuXR24Qj4GOu/TGWABVGw62MGlyHVcpWnU= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= @@ -509,8 +507,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -821,7 +817,6 @@ golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -962,8 +957,6 @@ kmodules.xyz/client-go v0.0.0-20200630053911-20d035822d35 h1:gDzZWVvgAaEBzo4lxMG kmodules.xyz/client-go v0.0.0-20200630053911-20d035822d35/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY= kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95/go.mod h1:jpu8xFsDKd6kAWUAKk8oTu/GQGBWqhrcaDeOJdaCJnk= -kmodules.xyz/custom-resources v0.0.0-20200521070540-2221c4957ef6 h1:7FNWsFr2umNrleWVyyI4Jn+VSqOknwpm/ztzuK6hpKA= -kmodules.xyz/custom-resources v0.0.0-20200521070540-2221c4957ef6/go.mod h1:Bxegf34XIvMnFwtWbi/6tcED3IivXDTzK+yYLP0LETo= kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9 h1:W+k1qhU0W1rptia2PWPOb7IWUvWnf31EMnatXt7MW6w= kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9/go.mod h1:bu1V7HdnuHc1hgvbqAdcwTViQ0TfZwF3Nu/SjB4vai4= kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d h1:ud3XDScnBdD5q6nLQI/tHLSbuuSwIFaav6IhcQAz2qA= @@ -1000,10 +993,8 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= -stash.appscode.dev/apimachinery v0.9.0-rc.6.0.20200522135619-e81205a3590e h1:alLoortY+IBpNIXr3/k1w3ffzN7MKI9wE94uxkXmoPo= -stash.appscode.dev/apimachinery v0.9.0-rc.6.0.20200522135619-e81205a3590e/go.mod h1:aChnMhHqbdaYqQ2ZQ8GIKgVHQrhOd8su54rDdYtJZ/k= -stash.appscode.dev/apimachinery v0.10.0-beta.0 h1:gIn9ai1ipjgGImTXJseOsucv3rJmQC4/34kihUWul4g= -stash.appscode.dev/apimachinery v0.10.0-beta.0/go.mod h1:v3rBovazmdCv/9rAA5U7LpDRFhVqcLsagnLlbPfD2Eg= -stash.appscode.dev/stash v0.9.0-rc.6.0.20200522144808-7d851e537e77 h1:igpICt/il1HNaFc30ofh65ysEjgePegcDQyO/5TjOog= -stash.appscode.dev/stash v0.9.0-rc.6.0.20200522144808-7d851e537e77/go.mod h1:Vm3LiKGmKk+6fqjuSmehWa/bvnW1cAVnf26VoduaXIA= +stash.appscode.dev/apimachinery v0.10.0-beta.1 h1:R1IhAhZ/iUbs2M+v9LYJacDCOmc4lk00JzSjVBrxOG0= +stash.appscode.dev/apimachinery v0.10.0-beta.1/go.mod h1:v3rBovazmdCv/9rAA5U7LpDRFhVqcLsagnLlbPfD2Eg= +stash.appscode.dev/stash v0.10.0-beta.1 h1:8XZkMwUjVWEul2J1pfjw5HXLDBTHDCWvhrNRPt4qeF8= +stash.appscode.dev/stash v0.10.0-beta.1/go.mod h1:BCQ3neoNjAfKGfkztVecCbTw4jy5b6Ppzc+eyCFRLsM= vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/vendor/modules.txt b/vendor/modules.txt index 3224476f4..92b088201 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -609,7 +609,7 @@ sigs.k8s.io/kustomize/pkg/types sigs.k8s.io/structured-merge-diff/v3/value # sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml -# stash.appscode.dev/apimachinery v0.10.0-beta.0 +# stash.appscode.dev/apimachinery v0.10.0-beta.1 stash.appscode.dev/apimachinery/apis stash.appscode.dev/apimachinery/apis/repositories stash.appscode.dev/apimachinery/apis/repositories/v1alpha1 @@ -632,7 +632,7 @@ stash.appscode.dev/apimachinery/client/listers/stash/v1beta1 stash.appscode.dev/apimachinery/crds stash.appscode.dev/apimachinery/pkg/docker stash.appscode.dev/apimachinery/pkg/restic -# stash.appscode.dev/stash v0.9.0-rc.6.0.20200522144808-7d851e537e77 +# stash.appscode.dev/stash v0.10.0-beta.1 stash.appscode.dev/stash/pkg/cli stash.appscode.dev/stash/pkg/registry/snapshot stash.appscode.dev/stash/pkg/util diff --git a/vendor/stash.appscode.dev/stash/LICENSE b/vendor/stash.appscode.dev/stash/LICENSE deleted file mode 100644 index 8dada3eda..000000000 --- a/vendor/stash.appscode.dev/stash/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/stash.appscode.dev/stash/LICENSE.md b/vendor/stash.appscode.dev/stash/LICENSE.md new file mode 100644 index 000000000..415eec66e --- /dev/null +++ b/vendor/stash.appscode.dev/stash/LICENSE.md @@ -0,0 +1,10 @@ +## License + +Source code in this repository is licensed under the PolyForm Noncommercial License 1.0.0. You may obtain a copy of the License at + + - [PolyForm-Noncommercial-1.0.0](https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md) + +Binaries and Docker images produced by the build process are dually licensed under the PolyForm Noncommercial License 1.0.0 and the AppsCode Free Trial License 1.0.0. You may obtain a copy of these Licenses at + + - [PolyForm-Noncommercial-1.0.0](https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md) + - [AppsCode-Free-Trial-1.0.0](https://github.com/appscode/licenses/raw/1.0.0/AppsCode-Free-Trial-1.0.0.md) diff --git a/vendor/stash.appscode.dev/stash/pkg/cli/env.go b/vendor/stash.appscode.dev/stash/pkg/cli/env.go index a8d922fcc..426085c5a 100644 --- a/vendor/stash.appscode.dev/stash/pkg/cli/env.go +++ b/vendor/stash.appscode.dev/stash/pkg/cli/env.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/cli/restic.go b/vendor/stash.appscode.dev/stash/pkg/cli/restic.go index 7083c0d6d..5d80ff1d0 100644 --- a/vendor/stash.appscode.dev/stash/pkg/cli/restic.go +++ b/vendor/stash.appscode.dev/stash/pkg/cli/restic.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/registry/snapshot/snapshot.go b/vendor/stash.appscode.dev/stash/pkg/registry/snapshot/snapshot.go index a4584b78a..d945a1096 100644 --- a/vendor/stash.appscode.dev/stash/pkg/registry/snapshot/snapshot.go +++ b/vendor/stash.appscode.dev/stash/pkg/registry/snapshot/snapshot.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/registry/snapshot/utils.go b/vendor/stash.appscode.dev/stash/pkg/registry/snapshot/utils.go index e0f65dec9..327f5c424 100644 --- a/vendor/stash.appscode.dev/stash/pkg/registry/snapshot/utils.go +++ b/vendor/stash.appscode.dev/stash/pkg/registry/snapshot/utils.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/backup_batch.go b/vendor/stash.appscode.dev/stash/pkg/util/backup_batch.go index 2dc7c9e28..8b6919226 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/backup_batch.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/backup_batch.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/backup_configuration.go b/vendor/stash.appscode.dev/stash/pkg/util/backup_configuration.go index fc02b1cc9..70d876fa3 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/backup_configuration.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/backup_configuration.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/crds.go b/vendor/stash.appscode.dev/stash/pkg/util/crds.go index eae5db5c6..6c21e0fe2 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/crds.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/crds.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/init_container.go b/vendor/stash.appscode.dev/stash/pkg/util/init_container.go index 50c03202c..8b0799b4f 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/init_container.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/init_container.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/job.go b/vendor/stash.appscode.dev/stash/pkg/util/job.go index 44b31aeaf..3e93fa68f 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/job.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/job.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/kubernetes.go b/vendor/stash.appscode.dev/stash/pkg/util/kubernetes.go index 0989716dc..07207936a 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/kubernetes.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/kubernetes.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/options.go b/vendor/stash.appscode.dev/stash/pkg/util/options.go index 8e65f6082..af92b8f16 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/options.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/options.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/restic.go b/vendor/stash.appscode.dev/stash/pkg/util/restic.go index 0ad8f8bc7..aaaebaddb 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/restic.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/restic.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/restore_session.go b/vendor/stash.appscode.dev/stash/pkg/util/restore_session.go index eb7e819a9..972fb69b5 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/restore_session.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/restore_session.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/sidecar.go b/vendor/stash.appscode.dev/stash/pkg/util/sidecar.go index 953699cac..886e6cdc9 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/sidecar.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/sidecar.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/stash.appscode.dev/stash/pkg/util/util.go b/vendor/stash.appscode.dev/stash/pkg/util/util.go index d12e8ac4a..51c73e447 100644 --- a/vendor/stash.appscode.dev/stash/pkg/util/util.go +++ b/vendor/stash.appscode.dev/stash/pkg/util/util.go @@ -1,11 +1,11 @@ /* -Copyright The Stash Authors. +Copyright AppsCode Inc. and Contributors -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the PolyForm Noncommercial License 1.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/appscode/licenses/raw/1.0.0/PolyForm-Noncommercial-1.0.0.md Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -30,7 +30,7 @@ import ( "github.com/appscode/go/log" "github.com/pkg/errors" core "k8s.io/api/core/v1" - crd_cs "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" + crd_cs "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" kerr "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" @@ -252,7 +252,7 @@ type WorkloadClients struct { KubeClient kubernetes.Interface OcClient oc_cs.Interface StashClient cs.Interface - CRDClient crd_cs.ApiextensionsV1beta1Interface + CRDClient crd_cs.Interface AppCatalogClient appcatalog_cs.Interface }