From c21651654632446a16ec269df04f851d63ade716 Mon Sep 17 00:00:00 2001 From: Enxebre Date: Fri, 19 Oct 2018 00:05:00 +0200 Subject: [PATCH 1/8] revendor cluster api --- Gopkg.lock | 276 ++++- .../spf13/cobra/cobra/cmd/license_agpl.go | 683 ------------- .../cobra/cobra/cmd/license_bsd_clause_2.go | 71 -- .../cobra/cobra/cmd/license_bsd_clause_3.go | 78 -- .../spf13/cobra/cobra/cmd/license_gpl_2.go | 376 ------- .../spf13/cobra/cobra/cmd/license_gpl_3.go | 711 ------------- .../spf13/cobra/cobra/cmd/license_lgpl.go | 186 ---- .../spf13/cobra/cobra/cmd/license_mit.go | 63 -- .../spf13/cobra/cobra/cmd/licenses.go | 118 --- .../cluster-api/pkg/apis/cluster/BUILD.bazel | 25 - .../pkg/apis/cluster/common/BUILD.bazel | 12 - .../cluster-api/pkg/apis/cluster/doc.go | 21 - .../pkg/apis/cluster/v1alpha1/BUILD.bazel | 60 -- .../apis/cluster/v1alpha1/cluster_types.go | 52 +- .../pkg/apis/cluster/v1alpha1/common_types.go | 4 +- .../pkg/apis/cluster/v1alpha1/doc.go | 9 +- .../apis/cluster/v1alpha1/machine_types.go | 54 +- .../v1alpha1/machinedeployment_types.go | 173 +--- .../apis/cluster/v1alpha1/machineset_types.go | 36 +- .../pkg/apis/cluster/v1alpha1/register.go | 48 + .../v1alpha1/zz_generated.api.register.go | 210 ---- .../v1alpha1/zz_generated.conversion.go | 953 ------------------ .../cluster/v1alpha1/zz_generated.deepcopy.go | 159 +-- .../cluster/v1alpha1/zz_generated.defaults.go | 32 - .../apis/cluster/zz_generated.api.register.go | 750 -------------- .../pkg/apis/cluster/zz_generated.deepcopy.go | 759 -------------- .../pkg/apis/cluster/zz_generated.defaults.go | 32 - .../clientset_generated/clientset/BUILD.bazel | 18 - .../clientset/scheme/BUILD.bazel | 18 - .../typed/cluster/v1alpha1/BUILD.bazel | 25 - .../externalversions/BUILD.bazel | 21 - .../externalversions/cluster/BUILD.bazel | 12 - .../cluster/v1alpha1/BUILD.bazel | 24 - .../internalinterfaces/BUILD.bazel | 14 - .../cluster/v1alpha1/BUILD.bazel | 20 - .../pkg/controller/config/BUILD.bazel | 13 - .../controller-runtime/LICENSE} | 41 +- .../pkg/runtime/scheme/scheme.go | 56 + 38 files changed, 480 insertions(+), 5733 deletions(-) delete mode 100644 vendor/github.com/spf13/cobra/cobra/cmd/license_agpl.go delete mode 100644 vendor/github.com/spf13/cobra/cobra/cmd/license_bsd_clause_2.go delete mode 100644 vendor/github.com/spf13/cobra/cobra/cmd/license_bsd_clause_3.go delete mode 100644 vendor/github.com/spf13/cobra/cobra/cmd/license_gpl_2.go delete mode 100644 vendor/github.com/spf13/cobra/cobra/cmd/license_gpl_3.go delete mode 100644 vendor/github.com/spf13/cobra/cobra/cmd/license_lgpl.go delete mode 100644 vendor/github.com/spf13/cobra/cobra/cmd/license_mit.go delete mode 100644 vendor/github.com/spf13/cobra/cobra/cmd/licenses.go delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/BUILD.bazel delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/common/BUILD.bazel delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/doc.go delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/BUILD.bazel create mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/register.go delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.api.register.go delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.conversion.go delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.defaults.go delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.api.register.go delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.deepcopy.go delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.defaults.go delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/BUILD.bazel delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/scheme/BUILD.bazel delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1/BUILD.bazel delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/BUILD.bazel delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/BUILD.bazel delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/v1alpha1/BUILD.bazel delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/internalinterfaces/BUILD.bazel delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/client/listers_generated/cluster/v1alpha1/BUILD.bazel delete mode 100644 vendor/sigs.k8s.io/cluster-api/pkg/controller/config/BUILD.bazel rename vendor/{github.com/spf13/cobra/cobra/cmd/license_apache_2.go => sigs.k8s.io/controller-runtime/LICENSE} (88%) create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/runtime/scheme/scheme.go diff --git a/Gopkg.lock b/Gopkg.lock index 5e113ce14..d8671fc9e 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -3,29 +3,38 @@ [[projects]] branch = "default" + digest = "1:24df057f15e7a09e75c1241cbe6f6590fd3eac9804f1110b02efade3214f042d" name = "bitbucket.org/ww/goautoneg" packages = ["."] + pruneopts = "UT" revision = "75cd24fc2f2c2a2088577d12123ddee5f54e0675" [[projects]] + digest = "1:0803645e1f57fb5271a6edc7570b9ea59bac2e5de67957075a43f3d74c8dbd97" name = "github.com/NYTimes/gziphandler" packages = ["."] + pruneopts = "UT" revision = "2600fb119af974220d3916a5916d6e31176aac1b" version = "v1.0.1" [[projects]] + digest = "1:d1665c44bd5db19aaee18d1b6233c99b0b9a986e8bccb24ef54747547a48027f" name = "github.com/PuerkitoBio/purell" packages = ["."] + pruneopts = "UT" revision = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4" version = "v1.1.0" [[projects]] branch = "master" + digest = "1:c739832d67eb1e9cc478a19cc1a1ccd78df0397bf8a32978b759152e205f644b" name = "github.com/PuerkitoBio/urlesc" packages = ["."] + pruneopts = "UT" revision = "de5bf2ad457846296e2031421a34e2568e304e35" [[projects]] + digest = "1:30c784eae4479f67fd87cb3fffb9742a86014caae5fd360323930950f4656e7f" name = "github.com/aws/aws-sdk-go" packages = [ "aws", @@ -57,24 +66,30 @@ "private/protocol/xml/xmlutil", "service/ec2", "service/ec2/ec2iface", - "service/sts" + "service/sts", ] + pruneopts = "UT" revision = "949f7800d745d1df9af349380e5deec8de206144" version = "v1.15.38" [[projects]] branch = "master" + digest = "1:d6afaeed1502aa28e80a4ed0981d570ad91b2579193404256ce672ed0a609e0d" name = "github.com/beorn7/perks" packages = ["quantile"] + pruneopts = "UT" revision = "3a771d992973f24aa725d07868b467d1ddfceafb" [[projects]] + digest = "1:705c40022f5c03bf96ffeb6477858d88565064485a513abcd0f11a0911546cb6" name = "github.com/blang/semver" packages = ["."] + pruneopts = "UT" revision = "2ee87856327ba09384cabd113bc6b5d174e9ec0f" version = "v3.5.1" [[projects]] + digest = "1:ed319ae4ca2e3d1884e22d307b4d02f4020316ebf95e565eaa4ead5983f48fda" name = "github.com/coreos/etcd" packages = [ "auth/authpb", @@ -88,253 +103,325 @@ "pkg/tlsutil", "pkg/transport", "pkg/types", - "version" + "version", ] + pruneopts = "UT" revision = "fca8add78a9d926166eb739b8e4a124434025ba3" version = "v3.3.9" [[projects]] + digest = "1:0ef770954bca104ee99b3b6b7f9b240605ac03517d9f98cbc1893daa03f3c038" name = "github.com/coreos/go-semver" packages = ["semver"] + pruneopts = "UT" revision = "8ab6407b697782a06568d4b7f1db25550ec2e4c6" version = "v0.2.0" [[projects]] + digest = "1:1da3a221f0bc090792d3a2a080ff09008427c0e0f0533a4ed6abd8994421da73" name = "github.com/coreos/go-systemd" packages = ["daemon"] + pruneopts = "UT" revision = "39ca1b05acc7ad1220e09f133283b8859a8b71ab" version = "v17" [[projects]] + digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" name = "github.com/davecgh/go-spew" packages = ["spew"] + pruneopts = "UT" revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" version = "v1.1.1" [[projects]] + digest = "1:f4f6279cb37479954644babd8f8ef00584ff9fa63555d2c6718c1c3517170202" name = "github.com/elazarl/go-bindata-assetfs" packages = ["."] + pruneopts = "UT" revision = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43" version = "v1.0.0" [[projects]] + digest = "1:899234af23e5793c34e06fd397f86ba33af5307b959b6a7afd19b63db065a9d7" name = "github.com/emicklei/go-restful" packages = [ ".", - "log" + "log", ] + pruneopts = "UT" revision = "3eb9738c1697594ea6e71a7156a9bb32ed216cf0" version = "v2.8.0" [[projects]] + digest = "1:ddab18e89cf46e40707b89dbe3835b4a591b0ea298e1035eefa84002aa9a4b4e" name = "github.com/emicklei/go-restful-swagger12" packages = ["."] + pruneopts = "UT" revision = "dcef7f55730566d41eae5db10e7d6981829720f6" version = "1.0.1" [[projects]] + digest = "1:f1f2bd73c025d24c3b93abf6364bccb802cf2fdedaa44360804c67800e8fab8d" name = "github.com/evanphx/json-patch" packages = ["."] + pruneopts = "UT" revision = "72bf35d0ff611848c1dc9df0f976c81192392fa5" version = "v4.1.0" [[projects]] + digest = "1:2cd7915ab26ede7d95b8749e6b1f933f1c6d5398030684e6505940a10f31cfda" name = "github.com/ghodss/yaml" packages = ["."] + pruneopts = "UT" revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" version = "v1.0.0" [[projects]] + digest = "1:5abd6a22805b1919f6a6bca0ae58b13cef1f3412812f38569978f43ef02743d4" name = "github.com/go-ini/ini" packages = ["."] + pruneopts = "UT" revision = "5cf292cae48347c2490ac1a58fe36735fb78df7e" version = "v1.38.2" [[projects]] + digest = "1:2997679181d901ac8aaf4330d11138ecf3974c6d3334995ff36f20cbd597daf8" name = "github.com/go-openapi/jsonpointer" packages = ["."] + pruneopts = "UT" revision = "3a0015ad55fa9873f41605d3e8f28cd279c32ab2" version = "0.16.0" [[projects]] + digest = "1:1ae3f233d75a731b164ca9feafd8ed646cbedf1784095876ed6988ce8aa88b1f" name = "github.com/go-openapi/jsonreference" packages = ["."] + pruneopts = "UT" revision = "3fb327e6747da3043567ee86abd02bb6376b6be2" version = "0.16.0" [[projects]] + digest = "1:3e5bdbd2a071c72c778c28fd7b5dfde95cdfbcef412f364377e031877205e418" name = "github.com/go-openapi/spec" packages = ["."] + pruneopts = "UT" revision = "384415f06ee238aae1df5caad877de6ceac3a5c4" version = "0.16.0" [[projects]] + digest = "1:c80984d4a9bb79539743aff5af91b595d84f513700150b0ed73c1697d1200d54" name = "github.com/go-openapi/swag" packages = ["."] + pruneopts = "UT" revision = "becd2f08beafcca035645a8a101e0e3e18140458" version = "0.16.0" [[projects]] + digest = "1:db238461f652ddb7c7057bc6fc503f6003a29987b1485ecbb96d92287db65bc9" name = "github.com/gogo/protobuf" packages = [ "gogoproto", "proto", "protoc-gen-gogo/descriptor", - "sortkeys" + "sortkeys", ] + pruneopts = "UT" revision = "636bf0302bc95575d69441b25a2603156ffdddf1" version = "v1.1.1" [[projects]] branch = "master" + digest = "1:1ba1d79f2810270045c328ae5d674321db34e3aae468eb4233883b473c5c0467" name = "github.com/golang/glog" packages = ["."] + pruneopts = "UT" revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" [[projects]] branch = "master" + digest = "1:3fb07f8e222402962fa190eb060608b34eddfb64562a18e2167df2de0ece85d8" name = "github.com/golang/groupcache" packages = ["lru"] + pruneopts = "UT" revision = "24b0969c4cb722950103eed87108c8d291a8df00" [[projects]] + digest = "1:4c0989ca0bcd10799064318923b9bc2db6b4d6338dd75f3f2d86c3511aaaf5cf" name = "github.com/golang/protobuf" packages = [ "proto", "ptypes", "ptypes/any", "ptypes/duration", - "ptypes/timestamp" + "ptypes/timestamp", ] + pruneopts = "UT" revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" version = "v1.2.0" [[projects]] branch = "master" + digest = "1:0bfbe13936953a98ae3cfe8ed6670d396ad81edf069a806d2f6515d7bb6950df" name = "github.com/google/btree" packages = ["."] + pruneopts = "UT" revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" [[projects]] branch = "master" + digest = "1:3ee90c0d94da31b442dde97c99635aaafec68d0b8a3c12ee2075c6bdabeec6bb" name = "github.com/google/gofuzz" packages = ["."] + pruneopts = "UT" revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" [[projects]] + digest = "1:8f8811f9be822914c3a25c6a071e93beb4c805d7b026cbf298bc577bc1cc945b" name = "github.com/google/uuid" packages = ["."] + pruneopts = "UT" revision = "064e2069ce9c359c118179501254f67d7d37ba24" version = "0.2" [[projects]] + digest = "1:65c4414eeb350c47b8de71110150d0ea8a281835b1f386eacaa3ad7325929c21" name = "github.com/googleapis/gnostic" packages = [ "OpenAPIv2", "compiler", - "extensions" + "extensions", ] + pruneopts = "UT" revision = "7c663266750e7d82587642f65e60bc4083f1f84e" version = "v0.2.0" [[projects]] branch = "master" + digest = "1:86c1210529e69d69860f2bb3ee9ccce0b595aa3f9165e7dd1388e5c612915888" name = "github.com/gregjones/httpcache" packages = [ ".", - "diskcache" + "diskcache", ] + pruneopts = "UT" revision = "9cad4c3443a7200dd6400aef47183728de563a38" [[projects]] + digest = "1:8ec8d88c248041a6df5f6574b87bc00e7e0b493881dad2e7ef47b11dc69093b5" name = "github.com/hashicorp/golang-lru" packages = [ ".", - "simplelru" + "simplelru", ] + pruneopts = "UT" revision = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768" version = "v0.5.0" [[projects]] branch = "master" + digest = "1:0778dc7fce1b4669a8bfa7ae506ec1f595b6ab0f8989c1c0d22a8ca1144e9972" name = "github.com/howeyc/gopass" packages = ["."] + pruneopts = "UT" revision = "bf9dde6d0d2c004a008c27aaee91170c786f6db8" [[projects]] + digest = "1:8eb1de8112c9924d59bf1d3e5c26f5eaa2bfc2a5fcbb92dc1c2e4546d695f277" name = "github.com/imdario/mergo" packages = ["."] + pruneopts = "UT" revision = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4" version = "v0.3.6" [[projects]] + digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" name = "github.com/inconshreveable/mousetrap" packages = ["."] + pruneopts = "UT" revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" version = "v1.0" [[projects]] + digest = "1:e22af8c7518e1eab6f2eab2b7d7558927f816262586cd6ed9f349c97a6c285c4" name = "github.com/jmespath/go-jmespath" packages = ["."] + pruneopts = "UT" revision = "0b12d6b5" [[projects]] + digest = "1:3e551bbb3a7c0ab2a2bf4660e7fcad16db089fdcfbb44b0199e62838038623ea" name = "github.com/json-iterator/go" packages = ["."] + pruneopts = "UT" revision = "1624edc4454b8682399def8740d46db5e4362ba4" version = "v1.1.5" [[projects]] + digest = "1:190ff84d9b2ed6589088f178cba8edb4b8ecb334df4572421fb016be1ac20463" name = "github.com/juju/ratelimit" packages = ["."] + pruneopts = "UT" revision = "59fac5042749a5afb9af70e813da1dd5474f0167" version = "1.0.1" [[projects]] + digest = "1:3e0502dcb749b6387865abf8070c5e5762384126c1b82625628480a67034b35d" name = "github.com/kubernetes-incubator/apiserver-builder" packages = [ "pkg/builders", - "pkg/controller" + "pkg/controller", ] + pruneopts = "UT" revision = "14201e804a58a140011a0044b15331f477535f91" version = "v1.9-alpha.4" [[projects]] branch = "master" + digest = "1:84a5a2b67486d5d67060ac393aa255d05d24ed5ee41daecd5635ec22657b6492" name = "github.com/mailru/easyjson" packages = [ "buffer", "jlexer", - "jwriter" + "jwriter", ] + pruneopts = "UT" revision = "60711f1a8329503b04e1c88535f419d0bb440bff" [[projects]] + digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc" name = "github.com/matttproud/golang_protobuf_extensions" packages = ["pbutil"] + pruneopts = "UT" revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" version = "v1.0.1" [[projects]] + digest = "1:33422d238f147d247752996a26574ac48dcf472976eda7f5134015f06bf16563" name = "github.com/modern-go/concurrent" packages = ["."] + pruneopts = "UT" revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" version = "1.0.3" [[projects]] + digest = "1:e32bdbdb7c377a07a9a46378290059822efdce5c8d96fe71940d87cb4f918855" name = "github.com/modern-go/reflect2" packages = ["."] + pruneopts = "UT" revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd" version = "1.0.1" [[projects]] branch = "master" + digest = "1:a6156889b651cc0bf3d9bef82b6ba8fbb9eb19aefd7bc5718357c38b67297cbc" name = "github.com/mxk/go-flowrate" packages = ["flowrate"] + pruneopts = "UT" revision = "cca7078d478f8520f85629ad7c68962d31ed7682" [[projects]] branch = "master" + digest = "1:d408905ee7771e8e4b181587a3426caa11b803c34a5dee74032943324e921ac5" name = "github.com/openshift/cluster-version-operator" packages = [ "lib/resourceapply", @@ -347,93 +434,119 @@ "pkg/generated/clientset/versioned/typed/clusterversion.openshift.io/v1", "pkg/generated/clientset/versioned/typed/operatorstatus.openshift.io/v1", "pkg/generated/listers/clusterversion.openshift.io/v1", - "pkg/generated/listers/operatorstatus.openshift.io/v1" + "pkg/generated/listers/operatorstatus.openshift.io/v1", ] + pruneopts = "UT" revision = "0be66ae4f68f23119d5c73c34e925573022f7aac" [[projects]] + digest = "1:e5d0bd87abc2781d14e274807a470acd180f0499f8bf5bb18606e9ec22ad9de9" name = "github.com/pborman/uuid" packages = ["."] + pruneopts = "UT" revision = "adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1" version = "v1.2" [[projects]] branch = "master" + digest = "1:3bf17a6e6eaa6ad24152148a631d18662f7212e21637c2699bff3369b7f00fa2" name = "github.com/petar/GoLLRB" packages = ["llrb"] + pruneopts = "UT" revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" [[projects]] + digest = "1:0e7775ebbcf00d8dd28ac663614af924411c868dca3d5aa762af0fae3808d852" name = "github.com/peterbourgon/diskv" packages = ["."] + pruneopts = "UT" revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" version = "v2.0.1" [[projects]] + digest = "1:b6221ec0f8903b556e127c449e7106b63e6867170c2d10a7c058623d086f2081" name = "github.com/prometheus/client_golang" packages = ["prometheus"] + pruneopts = "UT" revision = "c5b7fccd204277076155f10851dad72b76a49317" version = "v0.8.0" [[projects]] branch = "master" + digest = "1:2d5cd61daa5565187e1d96bae64dbbc6080dacf741448e9629c64fd93203b0d4" name = "github.com/prometheus/client_model" packages = ["go"] + pruneopts = "UT" revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" [[projects]] branch = "master" + digest = "1:63b68062b8968092eb86bedc4e68894bd096ea6b24920faca8b9dcf451f54bb5" name = "github.com/prometheus/common" packages = [ "expfmt", "internal/bitbucket.org/ww/goautoneg", - "model" + "model", ] + pruneopts = "UT" revision = "c7de2306084e37d54b8be01f3541a8464345e9a5" [[projects]] branch = "master" + digest = "1:ef1dd9945e58ee9b635273d28c0ef3fa3742a7dedc038ebe207fd63e6ce000ef" name = "github.com/prometheus/procfs" packages = [ ".", "internal/util", "nfs", - "xfs" + "xfs", ] + pruneopts = "UT" revision = "418d78d0b9a7b7de3a6bbc8a23def624cc977bb2" [[projects]] + digest = "1:d867dfa6751c8d7a435821ad3b736310c2ed68945d05b50fb9d23aee0540c8cc" name = "github.com/sirupsen/logrus" packages = ["."] + pruneopts = "UT" revision = "3e01752db0189b9157070a0e1668a620f9a85da2" version = "v1.0.6" [[projects]] + digest = "1:645cabccbb4fa8aab25a956cbcbdf6a6845ca736b2c64e197ca7cbb9d210b939" name = "github.com/spf13/cobra" packages = ["."] + pruneopts = "UT" revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" version = "v0.0.3" [[projects]] + digest = "1:dab83a1bbc7ad3d7a6ba1a1cc1760f25ac38cdf7d96a5cdd55cd915a4f5ceaf9" name = "github.com/spf13/pflag" packages = ["."] + pruneopts = "UT" revision = "9a97c102cda95a86cec2345a6f09f55a939babf5" version = "v1.0.2" [[projects]] + digest = "1:03aa6e485e528acb119fb32901cf99582c380225fc7d5a02758e08b180cb56c3" name = "github.com/ugorji/go" packages = ["codec"] + pruneopts = "UT" revision = "b4c50a2b199d93b13dc15e78929cfb23bfdf21ab" version = "v1.1.1" [[projects]] branch = "master" + digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8" name = "golang.org/x/crypto" packages = ["ssh/terminal"] + pruneopts = "UT" revision = "0e37d006457bf46f9e6692014ba72ef82c33022c" [[projects]] branch = "master" + digest = "1:d8d8d5b35b406a1f464e00ee46b91a348aed954e907654caac2ed33d651a3acf" name = "golang.org/x/net" packages = [ "context", @@ -445,20 +558,24 @@ "idna", "internal/timeseries", "trace", - "websocket" + "websocket", ] + pruneopts = "UT" revision = "26e67e76b6c3f6ce91f7c52def5af501b4e0f3a2" [[projects]] branch = "master" + digest = "1:49edbccdd6fb213dcf45486b0c939b788740451e5f2ff77aa42ca742d10da449" name = "golang.org/x/sys" packages = [ "unix", - "windows" + "windows", ] + pruneopts = "UT" revision = "1561086e645b2809fb9f8a1e2a38160bf8d53bf4" [[projects]] + digest = "1:0c56024909189aee3364b7f21a95a27459f718aa7c199a5c111c36cfffd9eaef" name = "golang.org/x/text" packages = [ "collate", @@ -475,18 +592,22 @@ "unicode/cldr", "unicode/norm", "unicode/rangetable", - "width" + "width", ] + pruneopts = "UT" revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" version = "v0.3.0" [[projects]] branch = "master" + digest = "1:56b0bca90b7e5d1facf5fbdacba23e4e0ce069d25381b8e2f70ef1e7ebfb9c1a" name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] + pruneopts = "UT" revision = "c3f76f3b92d1ffa4c58a9ff842a58b8877655e0f" [[projects]] + digest = "1:c52f29435ecb5b76c37e7f0098b6a50dbe60f8624d820827d0fede75c40199a1" name = "google.golang.org/grpc" packages = [ ".", @@ -515,24 +636,30 @@ "resolver/passthrough", "stats", "status", - "tap" + "tap", ] + pruneopts = "UT" revision = "8dea3dc473e90c8179e519d91302d0597c0ca1d1" version = "v1.15.0" [[projects]] + digest = "1:2d1fbdc6777e5408cabeb02bf336305e724b925ff4546ded0fa8715a7267922a" name = "gopkg.in/inf.v0" packages = ["."] + pruneopts = "UT" revision = "d2d2541c53f18d2a059457998ce2876cc8e67cbf" version = "v0.9.1" [[projects]] + digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" name = "gopkg.in/yaml.v2" packages = ["."] + pruneopts = "UT" revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" version = "v2.2.1" [[projects]] + digest = "1:c9f2a0ba561ebd04355ac5bff1b033589b036ac6b1cf31062fc57f072482b6ec" name = "k8s.io/api" packages = [ "admission/v1beta1", @@ -563,12 +690,14 @@ "settings/v1alpha1", "storage/v1", "storage/v1alpha1", - "storage/v1beta1" + "storage/v1beta1", ] + pruneopts = "UT" revision = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa" version = "kubernetes-1.11.1" [[projects]] + digest = "1:9ad35d12ec99779155070dd4196513d6fe180bd3c40f334a56feda8814a9dac8" name = "k8s.io/apiextensions-apiserver" packages = [ "pkg/apis/apiextensions", @@ -580,12 +709,14 @@ "pkg/client/informers/externalversions/apiextensions", "pkg/client/informers/externalversions/apiextensions/v1beta1", "pkg/client/informers/externalversions/internalinterfaces", - "pkg/client/listers/apiextensions/v1beta1" + "pkg/client/listers/apiextensions/v1beta1", ] + pruneopts = "UT" revision = "06dfdaae5c2bd89e1243151ff65b9bf8ee050f28" version = "kubernetes-1.11.1" [[projects]] + digest = "1:41d706a109bacfb7b3d92e44f3c74d61fa081abd7b94679ab31f1792422c9c77" name = "k8s.io/apimachinery" packages = [ "pkg/api/equality", @@ -641,13 +772,15 @@ "pkg/watch", "third_party/forked/golang/json", "third_party/forked/golang/netutil", - "third_party/forked/golang/reflect" + "third_party/forked/golang/reflect", ] + pruneopts = "UT" revision = "180eddb345a5be3a157cea1c624700ad5bd27b8f" version = "kubernetes-1.9.0" [[projects]] branch = "release-1.9" + digest = "1:68ea852f71ddbabb13b3629f0e4b5486e553dba37ac5da4211d630ec3ba0bcfc" name = "k8s.io/apiserver" packages = [ "pkg/admission", @@ -726,11 +859,13 @@ "pkg/util/webhook", "pkg/util/wsstream", "plugin/pkg/authenticator/token/webhook", - "plugin/pkg/authorizer/webhook" + "plugin/pkg/authorizer/webhook", ] + pruneopts = "UT" revision = "b2fdecc78668ca10ae83e151a11d8c4cbfce9431" [[projects]] + digest = "1:a4eb8ca91863d97402bdf79d21b870790c055c32674c3da4ef32bf0b3baacadc" name = "k8s.io/client-go" packages = [ "discovery", @@ -849,13 +984,15 @@ "util/flowcontrol", "util/homedir", "util/integer", - "util/workqueue" + "util/workqueue", ] + pruneopts = "UT" revision = "78700dec6369ba22221b72770783300f143df150" version = "v6.0.0" [[projects]] branch = "release-1.10" + digest = "1:2af67bd2524aa5fce3cb4bd6e20fbf773b8cf5a9dfc0d1bea7441d98d55f37b5" name = "k8s.io/kube-aggregator" packages = [ "pkg/apis/apiregistration", @@ -864,38 +1001,45 @@ "pkg/client/clientset_generated/clientset", "pkg/client/clientset_generated/clientset/scheme", "pkg/client/clientset_generated/clientset/typed/apiregistration/v1", - "pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1" + "pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1", ] + pruneopts = "UT" revision = "d29de253f8ba40ab4f8ee7eb50b522c0d83caff2" [[projects]] branch = "master" + digest = "1:a8a0fdd623b2a37c433d137bddfab6b155e988efbc7cd68c18f9923dce6c8742" name = "k8s.io/kube-openapi" packages = [ "pkg/builder", "pkg/common", "pkg/handler", "pkg/util", - "pkg/util/proto" + "pkg/util/proto", ] + pruneopts = "UT" revision = "e3762e86a74c878ffed47484592986685639c2cd" [[projects]] + digest = "1:4af026857bf817b36bed54d943c982cbeebeddd6201876ffebb46249c04edacc" name = "k8s.io/kubernetes" packages = ["pkg/kubectl/util/logs"] + pruneopts = "UT" revision = "a4529464e4629c21224b3d52edfe0ea91b072862" version = "v1.11.3" [[projects]] + digest = "1:ff54706d46de40c865b5fcfc4bde1087c02510cd12e0150de8e405ab427d9907" name = "k8s.io/utils" packages = ["pointer"] + pruneopts = "UT" revision = "045dc31ee5c40e8240241ce28dc24d7b56130373" [[projects]] branch = "master" + digest = "1:f014b8fdec7cafcb7016d64f5fa2d1efc83eb2f91ed6661ce000da736a282df1" name = "sigs.k8s.io/cluster-api" packages = [ - "pkg/apis/cluster", "pkg/apis/cluster/common", "pkg/apis/cluster/v1alpha1", "pkg/client/clientset_generated/clientset", @@ -906,13 +1050,89 @@ "pkg/client/informers_generated/externalversions/cluster/v1alpha1", "pkg/client/informers_generated/externalversions/internalinterfaces", "pkg/client/listers_generated/cluster/v1alpha1", - "pkg/controller/config" + "pkg/controller/config", ] - revision = "7db708b5df567c79e2e46f9c37cdbf001bef1302" + pruneopts = "UT" + revision = "0a0313c785b36a81ffc74c486128ac8b0c12ab3b" + +[[projects]] + digest = "1:84a8609383bec11b71d52dd813f33f1d16614b91966940bdc2aa79bea864fa25" + name = "sigs.k8s.io/controller-runtime" + packages = ["pkg/runtime/scheme"] + pruneopts = "UT" + revision = "53fc44b56078cd095b11bd44cfa0288ee4cf718f" + version = "v0.1.4" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "ba8c0db8d0a2cb6e2ff9ed3a7717ca6f197a8703d976908814227d0b17418e95" + input-imports = [ + "github.com/aws/aws-sdk-go/aws", + "github.com/aws/aws-sdk-go/aws/credentials", + "github.com/aws/aws-sdk-go/aws/session", + "github.com/aws/aws-sdk-go/service/ec2", + "github.com/aws/aws-sdk-go/service/ec2/ec2iface", + "github.com/blang/semver", + "github.com/ghodss/yaml", + "github.com/golang/glog", + "github.com/kubernetes-incubator/apiserver-builder/pkg/controller", + "github.com/openshift/cluster-version-operator/lib/resourceapply", + "github.com/openshift/cluster-version-operator/pkg/apis/operatorstatus.openshift.io/v1", + "github.com/openshift/cluster-version-operator/pkg/generated/clientset/versioned", + "github.com/sirupsen/logrus", + "github.com/spf13/cobra", + "github.com/spf13/pflag", + "k8s.io/api/apps/v1", + "k8s.io/api/apps/v1beta2", + "k8s.io/api/core/v1", + "k8s.io/api/rbac/v1", + "k8s.io/api/rbac/v1beta1", + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", + "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset", + "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme", + "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1", + "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions", + "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1", + "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1", + "k8s.io/apimachinery/pkg/api/equality", + "k8s.io/apimachinery/pkg/api/errors", + "k8s.io/apimachinery/pkg/apis/meta/v1", + "k8s.io/apimachinery/pkg/runtime", + "k8s.io/apimachinery/pkg/runtime/schema", + "k8s.io/apimachinery/pkg/runtime/serializer", + "k8s.io/apimachinery/pkg/types", + "k8s.io/apimachinery/pkg/util/errors", + "k8s.io/apimachinery/pkg/util/runtime", + "k8s.io/apimachinery/pkg/util/uuid", + "k8s.io/apimachinery/pkg/util/wait", + "k8s.io/client-go/informers", + "k8s.io/client-go/informers/apps/v1", + "k8s.io/client-go/informers/core/v1", + "k8s.io/client-go/informers/rbac/v1", + "k8s.io/client-go/kubernetes", + "k8s.io/client-go/kubernetes/scheme", + "k8s.io/client-go/kubernetes/typed/apps/v1", + "k8s.io/client-go/kubernetes/typed/core/v1", + "k8s.io/client-go/kubernetes/typed/rbac/v1", + "k8s.io/client-go/listers/apps/v1", + "k8s.io/client-go/listers/core/v1", + "k8s.io/client-go/rest", + "k8s.io/client-go/tools/cache", + "k8s.io/client-go/tools/clientcmd", + "k8s.io/client-go/tools/leaderelection", + "k8s.io/client-go/tools/leaderelection/resourcelock", + "k8s.io/client-go/tools/record", + "k8s.io/client-go/util/workqueue", + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset", + "k8s.io/kubernetes/pkg/kubectl/util/logs", + "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1", + "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset", + "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/scheme", + "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions", + "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/v1alpha1", + "sigs.k8s.io/cluster-api/pkg/client/listers_generated/cluster/v1alpha1", + "sigs.k8s.io/cluster-api/pkg/controller/config", + ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_agpl.go b/vendor/github.com/spf13/cobra/cobra/cmd/license_agpl.go deleted file mode 100644 index bc22e9732..000000000 --- a/vendor/github.com/spf13/cobra/cobra/cmd/license_agpl.go +++ /dev/null @@ -1,683 +0,0 @@ -package cmd - -func initAgpl() { - Licenses["agpl"] = License{ - Name: "GNU Affero General Public License", - PossibleMatches: []string{"agpl", "affero gpl", "gnu agpl"}, - Header: ` -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .`, - Text: ` GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. -`, - } -} diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_bsd_clause_2.go b/vendor/github.com/spf13/cobra/cobra/cmd/license_bsd_clause_2.go deleted file mode 100644 index 4a847e04a..000000000 --- a/vendor/github.com/spf13/cobra/cobra/cmd/license_bsd_clause_2.go +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright © 2015 Steve Francia . -// -// 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. - -// Parts inspired by https://github.com/ryanuber/go-license - -package cmd - -func initBsdClause2() { - Licenses["freebsd"] = License{ - Name: "Simplified BSD License", - PossibleMatches: []string{"freebsd", "simpbsd", "simple bsd", "2-clause bsd", - "2 clause bsd", "simplified bsd license"}, - Header: `All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.`, - Text: `{{ .copyright }} -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -`, - } -} diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_bsd_clause_3.go b/vendor/github.com/spf13/cobra/cobra/cmd/license_bsd_clause_3.go deleted file mode 100644 index c7476b31f..000000000 --- a/vendor/github.com/spf13/cobra/cobra/cmd/license_bsd_clause_3.go +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright © 2015 Steve Francia . -// -// 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. - -// Parts inspired by https://github.com/ryanuber/go-license - -package cmd - -func initBsdClause3() { - Licenses["bsd"] = License{ - Name: "NewBSD", - PossibleMatches: []string{"bsd", "newbsd", "3 clause bsd", "3-clause bsd"}, - Header: `All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.`, - Text: `{{ .copyright }} -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -`, - } -} diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_gpl_2.go b/vendor/github.com/spf13/cobra/cobra/cmd/license_gpl_2.go deleted file mode 100644 index 03e05b3a7..000000000 --- a/vendor/github.com/spf13/cobra/cobra/cmd/license_gpl_2.go +++ /dev/null @@ -1,376 +0,0 @@ -// Copyright © 2015 Steve Francia . -// -// 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. - -// Parts inspired by https://github.com/ryanuber/go-license - -package cmd - -func initGpl2() { - Licenses["gpl2"] = License{ - Name: "GNU General Public License 2.0", - PossibleMatches: []string{"gpl2", "gnu gpl2", "gplv2"}, - Header: ` -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with this program. If not, see .`, - Text: ` GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type 'show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. -`, - } -} diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_gpl_3.go b/vendor/github.com/spf13/cobra/cobra/cmd/license_gpl_3.go deleted file mode 100644 index ce07679c7..000000000 --- a/vendor/github.com/spf13/cobra/cobra/cmd/license_gpl_3.go +++ /dev/null @@ -1,711 +0,0 @@ -// Copyright © 2015 Steve Francia . -// -// 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. - -// Parts inspired by https://github.com/ryanuber/go-license - -package cmd - -func initGpl3() { - Licenses["gpl3"] = License{ - Name: "GNU General Public License 3.0", - PossibleMatches: []string{"gpl3", "gplv3", "gpl", "gnu gpl3", "gnu gpl"}, - Header: ` -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see .`, - Text: ` GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. -`, - } -} diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_lgpl.go b/vendor/github.com/spf13/cobra/cobra/cmd/license_lgpl.go deleted file mode 100644 index 0f8b96cad..000000000 --- a/vendor/github.com/spf13/cobra/cobra/cmd/license_lgpl.go +++ /dev/null @@ -1,186 +0,0 @@ -package cmd - -func initLgpl() { - Licenses["lgpl"] = License{ - Name: "GNU Lesser General Public License", - PossibleMatches: []string{"lgpl", "lesser gpl", "gnu lgpl"}, - Header: ` -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with this program. If not, see .`, - Text: ` GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library.`, - } -} diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_mit.go b/vendor/github.com/spf13/cobra/cobra/cmd/license_mit.go deleted file mode 100644 index bd2d0c4fa..000000000 --- a/vendor/github.com/spf13/cobra/cobra/cmd/license_mit.go +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright © 2015 Steve Francia . -// -// 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. - -// Parts inspired by https://github.com/ryanuber/go-license - -package cmd - -func initMit() { - Licenses["mit"] = License{ - Name: "MIT License", - PossibleMatches: []string{"mit"}, - Header: ` -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.`, - Text: `The MIT License (MIT) - -{{ .copyright }} - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -`, - } -} diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/licenses.go b/vendor/github.com/spf13/cobra/cobra/cmd/licenses.go deleted file mode 100644 index a070134dd..000000000 --- a/vendor/github.com/spf13/cobra/cobra/cmd/licenses.go +++ /dev/null @@ -1,118 +0,0 @@ -// Copyright © 2015 Steve Francia . -// -// 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. - -// Parts inspired by https://github.com/ryanuber/go-license - -package cmd - -import ( - "strings" - "time" - - "github.com/spf13/viper" -) - -// Licenses contains all possible licenses a user can choose from. -var Licenses = make(map[string]License) - -// License represents a software license agreement, containing the Name of -// the license, its possible matches (on the command line as given to cobra), -// the header to be used with each file on the file's creating, and the text -// of the license -type License struct { - Name string // The type of license in use - PossibleMatches []string // Similar names to guess - Text string // License text data - Header string // License header for source files -} - -func init() { - // Allows a user to not use a license. - Licenses["none"] = License{"None", []string{"none", "false"}, "", ""} - - initApache2() - initMit() - initBsdClause3() - initBsdClause2() - initGpl2() - initGpl3() - initLgpl() - initAgpl() -} - -// getLicense returns license specified by user in flag or in config. -// If user didn't specify the license, it returns Apache License 2.0. -// -// TODO: Inspect project for existing license -func getLicense() License { - // If explicitly flagged, use that. - if userLicense != "" { - return findLicense(userLicense) - } - - // If user wants to have custom license, use that. - if viper.IsSet("license.header") || viper.IsSet("license.text") { - return License{Header: viper.GetString("license.header"), - Text: viper.GetString("license.text")} - } - - // If user wants to have built-in license, use that. - if viper.IsSet("license") { - return findLicense(viper.GetString("license")) - } - - // If user didn't set any license, use Apache 2.0 by default. - return Licenses["apache"] -} - -func copyrightLine() string { - author := viper.GetString("author") - - year := viper.GetString("year") // For tests. - if year == "" { - year = time.Now().Format("2006") - } - - return "Copyright © " + year + " " + author -} - -// findLicense looks for License object of built-in licenses. -// If it didn't find license, then the app will be terminated and -// error will be printed. -func findLicense(name string) License { - found := matchLicense(name) - if found == "" { - er("unknown license: " + name) - } - return Licenses[found] -} - -// matchLicense compares the given a license name -// to PossibleMatches of all built-in licenses. -// It returns blank string, if name is blank string or it didn't find -// then appropriate match to name. -func matchLicense(name string) string { - if name == "" { - return "" - } - - for key, lic := range Licenses { - for _, match := range lic.PossibleMatches { - if strings.EqualFold(name, match) { - return key - } - } - } - - return "" -} diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/BUILD.bazel deleted file mode 100644 index 9404d7ba7..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/BUILD.bazel +++ /dev/null @@ -1,25 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "zz_generated.api.register.go", - "zz_generated.deepcopy.go", - "zz_generated.defaults.go", - ], - importpath = "sigs.k8s.io/cluster-api/pkg/apis/cluster", - visibility = ["//visibility:public"], - deps = [ - "//pkg/apis/cluster/common:go_default_library", - "//vendor/github.com/kubernetes-incubator/apiserver-builder/pkg/builders:go_default_library", - "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", - "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", - ], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/common/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/common/BUILD.bazel deleted file mode 100644 index 358eca1d2..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/common/BUILD.bazel +++ /dev/null @@ -1,12 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "consts.go", - "plugins.go", - ], - importpath = "sigs.k8s.io/cluster-api/pkg/apis/cluster/common", - visibility = ["//visibility:public"], - deps = ["//vendor/github.com/golang/glog:go_default_library"], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/doc.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/doc.go deleted file mode 100644 index fcc3a8e51..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/doc.go +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -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. -*/ - -// +k8s:deepcopy-gen=package,register -// +groupName=cluster.k8s.io - -// Package api is the internal version of the API. -package cluster diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/BUILD.bazel deleted file mode 100644 index f0fab9bdc..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/BUILD.bazel +++ /dev/null @@ -1,60 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - -go_library( - name = "go_default_library", - srcs = [ - "cluster_types.go", - "common_types.go", - "doc.go", - "machine_types.go", - "machinedeployment_types.go", - "machineset_types.go", - "zz_generated.api.register.go", - "zz_generated.conversion.go", - "zz_generated.deepcopy.go", - "zz_generated.defaults.go", - ], - importpath = "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1", - visibility = ["//visibility:public"], - deps = [ - "//pkg/apis/cluster:go_default_library", - "//pkg/apis/cluster/common:go_default_library", - "//vendor/github.com/kubernetes-incubator/apiserver-builder/pkg/builders:go_default_library", - "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/util/validation:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", - "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", - ], -) - -go_test( - name = "go_default_test", - srcs = [ - "cluster_types_test.go", - "machine_types_test.go", - "machinedeployment_types_test.go", - "machineset_types_test.go", - "v1alpha1_suite_test.go", - ], - embed = [":go_default_library"], - importpath = "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1_test", - deps = [ - "//pkg/apis:go_default_library", - "//pkg/apis/cluster:go_default_library", - "//pkg/apis/cluster/common:go_default_library", - "//pkg/apis/cluster/v1alpha1/testutil:go_default_library", - "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/openapi:go_default_library", - "//vendor/github.com/kubernetes-incubator/apiserver-builder/pkg/test:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", - ], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/cluster_types.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/cluster_types.go index 0572e9c4d..0aabc0c98 100644 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/cluster_types.go +++ b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/cluster_types.go @@ -17,26 +17,21 @@ limitations under the License. package v1alpha1 import ( - "log" - + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apiserver/pkg/endpoints/request" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" - - "sigs.k8s.io/cluster-api/pkg/apis/cluster" "sigs.k8s.io/cluster-api/pkg/apis/cluster/common" ) -const ClusterFinalizer string = "cluster.cluster.k8s.io" +const ClusterFinalizer = "cluster.cluster.k8s.io" // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// Cluster +// Cluster is the Schema for the clusters API // +k8s:openapi-gen=true -// +resource:path=clusters,strategy=ClusterStrategy +// +kubebuilder:subresource:status type Cluster struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -55,7 +50,7 @@ type ClusterSpec struct { // their own versioned API types that should be // serialized/deserialized from this field. // +optional - ProviderConfig ProviderConfig `json:"providerConfig"` + ProviderConfig ProviderConfig `json:"providerConfig,omitempty"` } // ClusterNetworkingConfig specifies the different networking @@ -79,7 +74,8 @@ type NetworkRanges struct { // ClusterStatus defines the observed state of Cluster type ClusterStatus struct { // APIEndpoint represents the endpoint to communicate with the IP. - APIEndpoints []APIEndpoint `json:"apiEndpoints"` + // +optional + APIEndpoints []APIEndpoint `json:"apiEndpoints,omitempty"` // NB: Eventually we will redefine ErrorReason as ClusterStatusError once the // following issue is fixed. @@ -88,17 +84,20 @@ type ClusterStatus struct { // If set, indicates that there is a problem reconciling the // state, and will be set to a token value suitable for // programmatic interpretation. - ErrorReason common.ClusterStatusError `json:"errorReason"` + // +optional + ErrorReason common.ClusterStatusError `json:"errorReason,omitempty"` // If set, indicates that there is a problem reconciling the // state, and will be set to a descriptive error message. - ErrorMessage string `json:"errorMessage"` + // +optional + ErrorMessage string `json:"errorMessage,omitempty"` // Provider-specific status. // It is recommended that providers maintain their // own versioned API types that should be // serialized/deserialized from this field. - ProviderStatus *runtime.RawExtension `json:"providerStatus"` + // +optional + ProviderStatus *runtime.RawExtension `json:"providerStatus,omitempty"` } // APIEndpoint represents a reachable Kubernetes API endpoint. @@ -110,10 +109,7 @@ type APIEndpoint struct { Port int `json:"port"` } -// Validate checks that an instance of Cluster is well formed -func (ClusterStrategy) Validate(ctx request.Context, obj runtime.Object) field.ErrorList { - o := obj.(*cluster.Cluster) - log.Printf("Validating fields for Cluster %s\n", o.Name) +func (o *Cluster) Validate() field.ErrorList { errors := field.ErrorList{} // perform validation here and add to errors using field.Invalid if o.Spec.ClusterNetwork.ServiceDomain == "" { @@ -137,19 +133,15 @@ func (ClusterStrategy) Validate(ctx request.Context, obj runtime.Object) field.E return errors } -// PrepareForCreate clears fields that are not allowed to be set by end users on creation. -func (c ClusterStrategy) PrepareForCreate(ctx request.Context, obj runtime.Object) { - // Invoke the parent implementation to strip the Status - c.DefaultStorageStrategy.PrepareForCreate(ctx, obj) +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - // Cast the element and set finalizer - o := obj.(*cluster.Cluster) - o.ObjectMeta.Finalizers = append(o.ObjectMeta.Finalizers, ClusterFinalizer) +// ClusterList contains a list of Cluster +type ClusterList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Cluster `json:"items"` } -// DefaultingFunction sets default Cluster field values -func (ClusterSchemeFns) DefaultingFunction(o interface{}) { - obj := o.(*Cluster) - // set default field values here - log.Printf("Defaulting fields for Cluster %s\n", obj.Name) +func init() { + SchemeBuilder.Register(&Cluster{}, &ClusterList{}) } diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/common_types.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/common_types.go index 0ed2658f0..8f9d36fc4 100644 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/common_types.go +++ b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/common_types.go @@ -16,7 +16,7 @@ limitations under the License. package v1alpha1 -import runtime "k8s.io/apimachinery/pkg/runtime" +import "k8s.io/apimachinery/pkg/runtime" // ProviderConfig defines the configuration to use during node creation. type ProviderConfig struct { @@ -33,7 +33,7 @@ type ProviderConfig struct { // Source for the provider configuration. Cannot be used if value is // not empty. // +optional - ValueFrom *ProviderConfigSource `json:valueFrom,omitempty` + ValueFrom *ProviderConfigSource `json:"valueFrom,omitempty"` } // ProviderConfigSource represents a source for the provider-specific diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/doc.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/doc.go index ccf38ed68..9bd92e435 100644 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/doc.go +++ b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/doc.go @@ -14,15 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ - -// Api versions allow the api contract for a resource to be changed while keeping -// backward compatibility by support multiple concurrent versions -// of the same resource - +// Package v1alpha1 contains API Schema definitions for the cluster v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register // +k8s:conversion-gen=sigs.k8s.io/cluster-api/pkg/apis/cluster // +k8s:defaulter-gen=TypeMeta // +groupName=cluster.k8s.io -package v1alpha1 // import "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1" - +package v1alpha1 diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machine_types.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machine_types.go index 87d0c9a0e..76b87b378 100644 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machine_types.go +++ b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machine_types.go @@ -17,28 +17,22 @@ limitations under the License. package v1alpha1 import ( - "log" - - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apiserver/pkg/endpoints/request" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/validation/field" + "k8s.io/apimachinery/pkg/runtime" - "sigs.k8s.io/cluster-api/pkg/apis/cluster" - clustercommon "sigs.k8s.io/cluster-api/pkg/apis/cluster/common" + "sigs.k8s.io/cluster-api/pkg/apis/cluster/common" ) // Finalizer is set on PreareForCreate callback -const MachineFinalizer string = "machine.cluster.k8s.io" +const MachineFinalizer = "machine.cluster.k8s.io" // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// Machine +// Machine is the Schema for the machines API // +k8s:openapi-gen=true -// +resource:path=machines,strategy=MachineStrategy +// +kubebuilder:subresource:status type Machine struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -91,7 +85,7 @@ type MachineStatus struct { // When was this status last observed // +optional - LastUpdated metav1.Time `json:"lastUpdated,omitempty"` + LastUpdated *metav1.Time `json:"lastUpdated,omitempty"` // The current versions of software on the corresponding Node (if it // exists). This is provided for a few reasons: @@ -124,11 +118,11 @@ type MachineStatus struct { // spec, values that are unsupported by the controller, or the // responsible controller itself being critically misconfigured. // - // Any transient errors that occur during the reconcilation of Machines + // Any transient errors that occur during the reconciliation of Machines // can be added as events to the Machine object and/or logged in the // controller's output. // +optional - ErrorReason *clustercommon.MachineStatusError `json:"errorReason,omitempty"` + ErrorReason *common.MachineStatusError `json:"errorReason,omitempty"` // +optional ErrorMessage *string `json:"errorMessage,omitempty"` @@ -136,7 +130,8 @@ type MachineStatus struct { // It is recommended that providers maintain their // own versioned API types that should be // serialized/deserialized from this field. - ProviderStatus *runtime.RawExtension `json:"providerStatus"` + // +optional + ProviderStatus *runtime.RawExtension `json:"providerStatus,omitempty"` // Addresses is a list of addresses assigned to the machine. Queried from cloud provider, if available. // +optional @@ -162,28 +157,15 @@ type MachineVersionInfo struct { ControlPlane string `json:"controlPlane,omitempty"` } -// Validate checks that an instance of Machine is well formed -func (MachineStrategy) Validate(ctx request.Context, obj runtime.Object) field.ErrorList { - machine := obj.(*cluster.Machine) - log.Printf("Validating fields for Machine %s\n", machine.Name) - errors := field.ErrorList{} - // perform validation here and add to errors using field.Invalid - return errors -} - -// PrepareForCreate clears fields that are not allowed to be set by end users on creation. -func (m MachineStrategy) PrepareForCreate(ctx request.Context, obj runtime.Object) { - // Invoke the parent implementation to strip the Status - m.DefaultStorageStrategy.PrepareForCreate(ctx, obj) +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - // Cast the element and set finalizer - o := obj.(*cluster.Machine) - o.ObjectMeta.Finalizers = append(o.ObjectMeta.Finalizers, MachineFinalizer) +// MachineList contains a list of Machine +type MachineList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Machine `json:"items"` } -// DefaultingFunction sets default Machine field values -func (MachineSchemeFns) DefaultingFunction(o interface{}) { - obj := o.(*Machine) - // set default field values here - log.Printf("Defaulting fields for Machine %s\n", obj.Name) +func init() { + SchemeBuilder.Register(&Machine{}, &MachineList{}) } diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machinedeployment_types.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machinedeployment_types.go index 06e797a08..d3017c05d 100644 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machinedeployment_types.go +++ b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machinedeployment_types.go @@ -17,36 +17,12 @@ limitations under the License. package v1alpha1 import ( - "log" - - "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apiserver/pkg/endpoints/request" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/util/intstr" - utilvalidation "k8s.io/apimachinery/pkg/util/validation" - "k8s.io/apimachinery/pkg/util/validation/field" - "sigs.k8s.io/cluster-api/pkg/apis/cluster" "sigs.k8s.io/cluster-api/pkg/apis/cluster/common" ) -// +genclient -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// MachineDeployment -// +k8s:openapi-gen=true -// +resource:path=machinedeployments,strategy=MachineDeploymentValidationStrategy -type MachineDeployment struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec MachineDeploymentSpec `json:"spec,omitempty"` - Status MachineDeploymentStatus `json:"status,omitempty"` -} - // MachineDeploymentSpec defines the desired state of MachineDeployment type MachineDeploymentSpec struct { // Number of desired machines. Defaults to 1. @@ -174,142 +150,29 @@ type MachineDeploymentStatus struct { UnavailableReplicas int32 `json:"unavailableReplicas,omitempty" protobuf:"varint,5,opt,name=unavailableReplicas"` } -// Validate checks that an instance of MachineDeployment is well formed -func (MachineDeploymentValidationStrategy) Validate(ctx request.Context, obj runtime.Object) field.ErrorList { - md := obj.(*cluster.MachineDeployment) - log.Printf("Validating fields for MachineDeployment %s\n", md.Name) - allErrs := field.ErrorList{} - - allErrs = append(allErrs, ValidateMachineDeploymentSpec(&md.Spec, field.NewPath("spec"))...) - return allErrs -} - -func ValidateMachineDeploymentSpec(spec *cluster.MachineDeploymentSpec, fldPath *field.Path) field.ErrorList { - allErrs := field.ErrorList{} - allErrs = append(allErrs, metav1validation.ValidateLabelSelector(&spec.Selector, fldPath.Child("selector"))...) - if len(spec.Selector.MatchLabels)+len(spec.Selector.MatchExpressions) == 0 { - allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), spec.Selector, "empty selector is not valid for MachineSet.")) - } - selector, err := metav1.LabelSelectorAsSelector(&spec.Selector) - if err != nil { - allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), spec.Selector, "invalid label selector.")) - } else { - labels := labels.Set(spec.Template.Labels) - if !selector.Matches(labels) { - allErrs = append(allErrs, field.Invalid(fldPath.Child("template", "metadata", "labels"), spec.Template.Labels, "`selector` does not match template `labels`")) - } - } - - if spec.Replicas == nil || *spec.Replicas < 0 { - allErrs = append(allErrs, field.Invalid(fldPath.Child("replicas"), *spec.Replicas, "replicas must be specified and can not be negative")) - } - - allErrs = append(allErrs, ValidateMachineDeploymentStrategy(&spec.Strategy, fldPath.Child("strategy"))...) - return allErrs -} - -func ValidateMachineDeploymentStrategy(strategy *cluster.MachineDeploymentStrategy, fldPath *field.Path) field.ErrorList { - allErrs := field.ErrorList{} - switch strategy.Type { - case common.RollingUpdateMachineDeploymentStrategyType: - if strategy.RollingUpdate != nil { - allErrs = append(allErrs, ValidateMachineRollingUpdateDeployment(strategy.RollingUpdate, fldPath.Child("rollingUpdate"))...) - } - default: - allErrs = append(allErrs, field.Invalid(fldPath.Child("Type"), strategy.Type, "is an invalid type")) - } - return allErrs -} - -func ValidateMachineRollingUpdateDeployment(rollingUpdate *cluster.MachineRollingUpdateDeployment, fldPath *field.Path) field.ErrorList { - allErrs := field.ErrorList{} - var maxUnavailable int - var maxSurge int - - if rollingUpdate.MaxUnavailable != nil { - allErrs = append(allErrs, ValidatePositiveIntOrPercent(rollingUpdate.MaxUnavailable, fldPath.Child("maxUnavailable"))...) - maxUnavailable, _ = getIntOrPercent(rollingUpdate.MaxUnavailable, false) - - // Validate that MaxUnavailable is not more than 100%. - if len(utilvalidation.IsValidPercent(rollingUpdate.MaxUnavailable.StrVal)) == 0 && maxUnavailable > 100 { - allErrs = append(allErrs, field.Invalid(fldPath.Child("maxUnavailable"), rollingUpdate.MaxUnavailable, "should not be more than 100%")) - } - } - - if rollingUpdate.MaxSurge != nil { - allErrs = append(allErrs, ValidatePositiveIntOrPercent(rollingUpdate.MaxSurge, fldPath.Child("maxSurge"))...) - maxSurge, _ = getIntOrPercent(rollingUpdate.MaxSurge, true) - } +// +genclient +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - if rollingUpdate.MaxUnavailable != nil && rollingUpdate.MaxSurge != nil && maxUnavailable == 0 && maxSurge == 0 { - // Both MaxSurge and MaxUnavailable cannot be zero. - allErrs = append(allErrs, field.Invalid(fldPath.Child("maxUnavailable"), rollingUpdate.MaxUnavailable, "may not be 0 when `maxSurge` is 0")) - } +// MachineDeployment is the Schema for the machinedeployments API +// +k8s:openapi-gen=true +// +kubebuilder:subresource:status +type MachineDeployment struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` - return allErrs + Spec MachineDeploymentSpec `json:"spec,omitempty"` + Status MachineDeploymentStatus `json:"status,omitempty"` } -func ValidatePositiveIntOrPercent(s *intstr.IntOrString, fldPath *field.Path) field.ErrorList { - allErrs := field.ErrorList{} - if x, err := getIntOrPercent(s, false); err != nil { - allErrs = append(allErrs, field.Invalid(fldPath, s.StrVal, "value should be int(5) or percentage(5%)")) - } else if x < 0 { - allErrs = append(allErrs, field.Invalid(fldPath, x, "value should not be negative")) - } - return allErrs -} +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -func getIntOrPercent(s *intstr.IntOrString, roundUp bool) (int, error) { - return intstr.GetValueFromIntOrPercent(s, 100, roundUp) +// MachineDeploymentList contains a list of MachineDeployment +type MachineDeploymentList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []MachineDeployment `json:"items"` } -// DefaultingFunction sets default MachineDeployment field values -func (MachineDeploymentSchemeFns) DefaultingFunction(o interface{}) { - obj := o.(*MachineDeployment) - // set default field values here - log.Printf("Defaulting fields for MachineDeployment %s\n", obj.Name) - if obj.Spec.Replicas == nil { - obj.Spec.Replicas = new(int32) - *obj.Spec.Replicas = 1 - } - - if obj.Spec.MinReadySeconds == nil { - obj.Spec.MinReadySeconds = new(int32) - *obj.Spec.MinReadySeconds = 0 - } - - if obj.Spec.RevisionHistoryLimit == nil { - obj.Spec.RevisionHistoryLimit = new(int32) - *obj.Spec.RevisionHistoryLimit = 1 - } - - if obj.Spec.ProgressDeadlineSeconds == nil { - obj.Spec.ProgressDeadlineSeconds = new(int32) - *obj.Spec.ProgressDeadlineSeconds = 600 - } - - if obj.Spec.Strategy.Type == "" { - obj.Spec.Strategy.Type = common.RollingUpdateMachineDeploymentStrategyType - } - - // Default RollingUpdate strategy only if strategy type is RollingUpdate. - if obj.Spec.Strategy.Type == common.RollingUpdateMachineDeploymentStrategyType { - if obj.Spec.Strategy.RollingUpdate == nil { - obj.Spec.Strategy.RollingUpdate = &MachineRollingUpdateDeployment{} - } - - if obj.Spec.Strategy.RollingUpdate.MaxSurge == nil { - x := intstr.FromInt(1) - obj.Spec.Strategy.RollingUpdate.MaxSurge = &x - } - - if obj.Spec.Strategy.RollingUpdate.MaxUnavailable == nil { - x := intstr.FromInt(0) - obj.Spec.Strategy.RollingUpdate.MaxUnavailable = &x - } - } - - if len(obj.Namespace) == 0 { - obj.Namespace = metav1.NamespaceDefault - } +func init() { + SchemeBuilder.Register(&MachineDeployment{}, &MachineDeploymentList{}) } diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machineset_types.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machineset_types.go index db5c6d3b0..de5d52dae 100644 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machineset_types.go +++ b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/machineset_types.go @@ -14,21 +14,17 @@ See the License for the specific language governing permissions and limitations under the License. */ - package v1alpha1 import ( "log" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apiserver/pkg/endpoints/request" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" + + "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/cluster-api/pkg/apis/cluster/common" - "k8s.io/apimachinery/pkg/labels" - "sigs.k8s.io/cluster-api/pkg/apis/cluster" - metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" ) // +genclient @@ -36,7 +32,7 @@ import ( // MachineSet ensures that a specified number of machines replicas are running at any given time. // +k8s:openapi-gen=true -// +resource:path=machinesets,strategy=MachineSetStrategy +// +kubebuilder:subresource:status type MachineSet struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -119,7 +115,7 @@ type MachineSetStatus struct { // spec, values that are unsupported by the machine controller, or the // responsible machine controller itself being critically misconfigured. // - // Any transient errors that occur during the reconcilation of Machines + // Any transient errors that occur during the reconciliation of Machines // can be added as events to the MachineSet object and/or logged in the // controller's output. // +optional @@ -128,9 +124,7 @@ type MachineSetStatus struct { ErrorMessage *string `json:"errorMessage,omitempty"` } -// Validate checks that an instance of MachineSet is well formed -func (MachineSetStrategy) Validate(ctx request.Context, obj runtime.Object) field.ErrorList { - machineSet := obj.(*cluster.MachineSet) +func (machineSet *MachineSet) Validate() field.ErrorList { errors := field.ErrorList{} // validate spec.selector and spec.template.labels @@ -145,7 +139,7 @@ func (MachineSetStrategy) Validate(ctx request.Context, obj runtime.Object) fiel } else { labels := labels.Set(machineSet.Spec.Template.Labels) if !selector.Matches(labels) { - errors = append(errors, field.Invalid(fldPath.Child("template","metadata","labels"), machineSet.Spec.Template.Labels, "`selector` does not match template `labels`")) + errors = append(errors, field.Invalid(fldPath.Child("template", "metadata", "labels"), machineSet.Spec.Template.Labels, "`selector` does not match template `labels`")) } } @@ -153,8 +147,7 @@ func (MachineSetStrategy) Validate(ctx request.Context, obj runtime.Object) fiel } // DefaultingFunction sets default MachineSet field values -func (MachineSetSchemeFns) DefaultingFunction(o interface{}) { - obj := o.(*MachineSet) +func (obj *MachineSet) Default() { log.Printf("Defaulting fields for MachineSet %s\n", obj.Name) if obj.Spec.Replicas == nil { @@ -166,3 +159,16 @@ func (MachineSetSchemeFns) DefaultingFunction(o interface{}) { obj.Namespace = metav1.NamespaceDefault } } + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// MachineSetList contains a list of MachineSet +type MachineSetList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []MachineSet `json:"items"` +} + +func init() { + SchemeBuilder.Register(&MachineSet{}, &MachineSetList{}) +} diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/register.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/register.go new file mode 100644 index 000000000..d4b852967 --- /dev/null +++ b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/register.go @@ -0,0 +1,48 @@ +/* +Copyright 2018 The Kubernetes Authors. + +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. +*/ + +// NOTE: Boilerplate only. Ignore this file. + +// Package v1alpha1 contains API Schema definitions for the cluster v1alpha1 API group +// +k8s:openapi-gen=true +// +k8s:deepcopy-gen=package,register +// +k8s:conversion-gen=sigs.k8s.io/cluster-api/pkg/apis/cluster +// +k8s:defaulter-gen=TypeMeta +// +groupName=cluster.k8s.io +package v1alpha1 + +import ( + "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/runtime/scheme" +) + +var ( + // SchemeGroupVersion is group version used to register these objects + SchemeGroupVersion = schema.GroupVersion{Group: "cluster.k8s.io", Version: "v1alpha1"} + + // SchemeBuilder is used to add go types to the GroupVersionKind scheme + SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} + + // Required by pkg/client/... + // TODO(pwittrock): Remove this after removing pkg/client/... + AddToScheme = SchemeBuilder.AddToScheme +) + +// Required by pkg/client/listers/... +// TODO(pwittrock): Remove this after removing pkg/client/... +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.api.register.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.api.register.go deleted file mode 100644 index 0f5b0acd9..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.api.register.go +++ /dev/null @@ -1,210 +0,0 @@ -/* -Copyright 2017 The Kubernetes Authors. - -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. -*/ - -// This file was autogenerated by apiregister-gen. Do not edit it manually! - -package v1alpha1 - -import ( - "github.com/kubernetes-incubator/apiserver-builder/pkg/builders" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "sigs.k8s.io/cluster-api/pkg/apis/cluster" -) - -var ( - clusterClusterStorage = builders.NewApiResource( // Resource status endpoint - cluster.InternalCluster, - ClusterSchemeFns{}, - func() runtime.Object { return &Cluster{} }, // Register versioned resource - func() runtime.Object { return &ClusterList{} }, // Register versioned resource list - &ClusterStrategy{builders.StorageStrategySingleton}, - ) - clusterMachineStorage = builders.NewApiResource( // Resource status endpoint - cluster.InternalMachine, - MachineSchemeFns{}, - func() runtime.Object { return &Machine{} }, // Register versioned resource - func() runtime.Object { return &MachineList{} }, // Register versioned resource list - &MachineStrategy{builders.StorageStrategySingleton}, - ) - clusterMachineDeploymentStorage = builders.NewApiResource( // Resource status endpoint - cluster.InternalMachineDeployment, - MachineDeploymentSchemeFns{}, - func() runtime.Object { return &MachineDeployment{} }, // Register versioned resource - func() runtime.Object { return &MachineDeploymentList{} }, // Register versioned resource list - &MachineDeploymentValidationStrategy{builders.StorageStrategySingleton}, - ) - clusterMachineSetStorage = builders.NewApiResource( // Resource status endpoint - cluster.InternalMachineSet, - MachineSetSchemeFns{}, - func() runtime.Object { return &MachineSet{} }, // Register versioned resource - func() runtime.Object { return &MachineSetList{} }, // Register versioned resource list - &MachineSetStrategy{builders.StorageStrategySingleton}, - ) - ApiVersion = builders.NewApiVersion("cluster.k8s.io", "v1alpha1").WithResources( - clusterClusterStorage, - builders.NewApiResource( // Resource status endpoint - cluster.InternalClusterStatus, - ClusterSchemeFns{}, - func() runtime.Object { return &Cluster{} }, // Register versioned resource - func() runtime.Object { return &ClusterList{} }, // Register versioned resource list - &ClusterStatusStrategy{builders.StatusStorageStrategySingleton}, - ), clusterMachineStorage, - builders.NewApiResource( // Resource status endpoint - cluster.InternalMachineStatus, - MachineSchemeFns{}, - func() runtime.Object { return &Machine{} }, // Register versioned resource - func() runtime.Object { return &MachineList{} }, // Register versioned resource list - &MachineStatusStrategy{builders.StatusStorageStrategySingleton}, - ), clusterMachineDeploymentStorage, - builders.NewApiResource( // Resource status endpoint - cluster.InternalMachineDeploymentStatus, - MachineDeploymentSchemeFns{}, - func() runtime.Object { return &MachineDeployment{} }, // Register versioned resource - func() runtime.Object { return &MachineDeploymentList{} }, // Register versioned resource list - &MachineDeploymentValidationStatusStrategy{builders.StatusStorageStrategySingleton}, - ), clusterMachineSetStorage, - builders.NewApiResource( // Resource status endpoint - cluster.InternalMachineSetStatus, - MachineSetSchemeFns{}, - func() runtime.Object { return &MachineSet{} }, // Register versioned resource - func() runtime.Object { return &MachineSetList{} }, // Register versioned resource list - &MachineSetStatusStrategy{builders.StatusStorageStrategySingleton}, - )) - - // Required by code generated by go2idl - AddToScheme = ApiVersion.SchemaBuilder.AddToScheme - SchemeBuilder = ApiVersion.SchemaBuilder - localSchemeBuilder = &SchemeBuilder - SchemeGroupVersion = ApiVersion.GroupVersion -) - -// Required by code generated by go2idl -// Kind takes an unqualified kind and returns a Group qualified GroupKind -func Kind(kind string) schema.GroupKind { - return SchemeGroupVersion.WithKind(kind).GroupKind() -} - -// Required by code generated by go2idl -// Resource takes an unqualified resource and returns a Group qualified GroupResource -func Resource(resource string) schema.GroupResource { - return SchemeGroupVersion.WithResource(resource).GroupResource() -} - -// -// Cluster Functions and Structs -// -// +k8s:deepcopy-gen=false -type ClusterSchemeFns struct { - builders.DefaultSchemeFns -} - -// +k8s:deepcopy-gen=false -type ClusterStrategy struct { - builders.DefaultStorageStrategy -} - -// +k8s:deepcopy-gen=false -type ClusterStatusStrategy struct { - builders.DefaultStatusStorageStrategy -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type ClusterList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []Cluster `json:"items"` -} - -// -// Machine Functions and Structs -// -// +k8s:deepcopy-gen=false -type MachineSchemeFns struct { - builders.DefaultSchemeFns -} - -// +k8s:deepcopy-gen=false -type MachineStrategy struct { - builders.DefaultStorageStrategy -} - -// +k8s:deepcopy-gen=false -type MachineStatusStrategy struct { - builders.DefaultStatusStorageStrategy -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type MachineList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []Machine `json:"items"` -} - -// -// MachineDeployment Functions and Structs -// -// +k8s:deepcopy-gen=false -type MachineDeploymentSchemeFns struct { - builders.DefaultSchemeFns -} - -// +k8s:deepcopy-gen=false -type MachineDeploymentValidationStrategy struct { - builders.DefaultStorageStrategy -} - -// +k8s:deepcopy-gen=false -type MachineDeploymentValidationStatusStrategy struct { - builders.DefaultStatusStorageStrategy -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type MachineDeploymentList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []MachineDeployment `json:"items"` -} - -// -// MachineSet Functions and Structs -// -// +k8s:deepcopy-gen=false -type MachineSetSchemeFns struct { - builders.DefaultSchemeFns -} - -// +k8s:deepcopy-gen=false -type MachineSetStrategy struct { - builders.DefaultStorageStrategy -} - -// +k8s:deepcopy-gen=false -type MachineSetStatusStrategy struct { - builders.DefaultStatusStorageStrategy -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type MachineSetList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []MachineSet `json:"items"` -} diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.conversion.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.conversion.go deleted file mode 100644 index 859457ec4..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.conversion.go +++ /dev/null @@ -1,953 +0,0 @@ -// +build !ignore_autogenerated - -/* -Copyright 2018 The Kubernetes Authors. - -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. -*/ - -// Code generated by conversion-gen. DO NOT EDIT. - -// This file was autogenerated by conversion-gen. Do not edit it manually! - -package v1alpha1 - -import ( - unsafe "unsafe" - - v1 "k8s.io/api/core/v1" - conversion "k8s.io/apimachinery/pkg/conversion" - runtime "k8s.io/apimachinery/pkg/runtime" - intstr "k8s.io/apimachinery/pkg/util/intstr" - cluster "sigs.k8s.io/cluster-api/pkg/apis/cluster" - common "sigs.k8s.io/cluster-api/pkg/apis/cluster/common" -) - -func init() { - localSchemeBuilder.Register(RegisterConversions) -} - -// RegisterConversions adds conversion functions to the given scheme. -// Public to allow building arbitrary schemes. -func RegisterConversions(scheme *runtime.Scheme) error { - return scheme.AddGeneratedConversionFuncs( - Convert_v1alpha1_APIEndpoint_To_cluster_APIEndpoint, - Convert_cluster_APIEndpoint_To_v1alpha1_APIEndpoint, - Convert_v1alpha1_Cluster_To_cluster_Cluster, - Convert_cluster_Cluster_To_v1alpha1_Cluster, - Convert_v1alpha1_ClusterList_To_cluster_ClusterList, - Convert_cluster_ClusterList_To_v1alpha1_ClusterList, - Convert_v1alpha1_ClusterNetworkingConfig_To_cluster_ClusterNetworkingConfig, - Convert_cluster_ClusterNetworkingConfig_To_v1alpha1_ClusterNetworkingConfig, - Convert_v1alpha1_ClusterSpec_To_cluster_ClusterSpec, - Convert_cluster_ClusterSpec_To_v1alpha1_ClusterSpec, - Convert_v1alpha1_ClusterStatus_To_cluster_ClusterStatus, - Convert_cluster_ClusterStatus_To_v1alpha1_ClusterStatus, - Convert_v1alpha1_ClusterStatusStrategy_To_cluster_ClusterStatusStrategy, - Convert_cluster_ClusterStatusStrategy_To_v1alpha1_ClusterStatusStrategy, - Convert_v1alpha1_ClusterStrategy_To_cluster_ClusterStrategy, - Convert_cluster_ClusterStrategy_To_v1alpha1_ClusterStrategy, - Convert_v1alpha1_Machine_To_cluster_Machine, - Convert_cluster_Machine_To_v1alpha1_Machine, - Convert_v1alpha1_MachineDeployment_To_cluster_MachineDeployment, - Convert_cluster_MachineDeployment_To_v1alpha1_MachineDeployment, - Convert_v1alpha1_MachineDeploymentList_To_cluster_MachineDeploymentList, - Convert_cluster_MachineDeploymentList_To_v1alpha1_MachineDeploymentList, - Convert_v1alpha1_MachineDeploymentSpec_To_cluster_MachineDeploymentSpec, - Convert_cluster_MachineDeploymentSpec_To_v1alpha1_MachineDeploymentSpec, - Convert_v1alpha1_MachineDeploymentStatus_To_cluster_MachineDeploymentStatus, - Convert_cluster_MachineDeploymentStatus_To_v1alpha1_MachineDeploymentStatus, - Convert_v1alpha1_MachineDeploymentStrategy_To_cluster_MachineDeploymentStrategy, - Convert_cluster_MachineDeploymentStrategy_To_v1alpha1_MachineDeploymentStrategy, - Convert_v1alpha1_MachineDeploymentValidationStatusStrategy_To_cluster_MachineDeploymentValidationStatusStrategy, - Convert_cluster_MachineDeploymentValidationStatusStrategy_To_v1alpha1_MachineDeploymentValidationStatusStrategy, - Convert_v1alpha1_MachineDeploymentValidationStrategy_To_cluster_MachineDeploymentValidationStrategy, - Convert_cluster_MachineDeploymentValidationStrategy_To_v1alpha1_MachineDeploymentValidationStrategy, - Convert_v1alpha1_MachineList_To_cluster_MachineList, - Convert_cluster_MachineList_To_v1alpha1_MachineList, - Convert_v1alpha1_MachineRollingUpdateDeployment_To_cluster_MachineRollingUpdateDeployment, - Convert_cluster_MachineRollingUpdateDeployment_To_v1alpha1_MachineRollingUpdateDeployment, - Convert_v1alpha1_MachineSet_To_cluster_MachineSet, - Convert_cluster_MachineSet_To_v1alpha1_MachineSet, - Convert_v1alpha1_MachineSetList_To_cluster_MachineSetList, - Convert_cluster_MachineSetList_To_v1alpha1_MachineSetList, - Convert_v1alpha1_MachineSetSpec_To_cluster_MachineSetSpec, - Convert_cluster_MachineSetSpec_To_v1alpha1_MachineSetSpec, - Convert_v1alpha1_MachineSetStatus_To_cluster_MachineSetStatus, - Convert_cluster_MachineSetStatus_To_v1alpha1_MachineSetStatus, - Convert_v1alpha1_MachineSetStatusStrategy_To_cluster_MachineSetStatusStrategy, - Convert_cluster_MachineSetStatusStrategy_To_v1alpha1_MachineSetStatusStrategy, - Convert_v1alpha1_MachineSetStrategy_To_cluster_MachineSetStrategy, - Convert_cluster_MachineSetStrategy_To_v1alpha1_MachineSetStrategy, - Convert_v1alpha1_MachineSpec_To_cluster_MachineSpec, - Convert_cluster_MachineSpec_To_v1alpha1_MachineSpec, - Convert_v1alpha1_MachineStatus_To_cluster_MachineStatus, - Convert_cluster_MachineStatus_To_v1alpha1_MachineStatus, - Convert_v1alpha1_MachineStatusStrategy_To_cluster_MachineStatusStrategy, - Convert_cluster_MachineStatusStrategy_To_v1alpha1_MachineStatusStrategy, - Convert_v1alpha1_MachineStrategy_To_cluster_MachineStrategy, - Convert_cluster_MachineStrategy_To_v1alpha1_MachineStrategy, - Convert_v1alpha1_MachineTemplateSpec_To_cluster_MachineTemplateSpec, - Convert_cluster_MachineTemplateSpec_To_v1alpha1_MachineTemplateSpec, - Convert_v1alpha1_MachineVersionInfo_To_cluster_MachineVersionInfo, - Convert_cluster_MachineVersionInfo_To_v1alpha1_MachineVersionInfo, - Convert_v1alpha1_NetworkRanges_To_cluster_NetworkRanges, - Convert_cluster_NetworkRanges_To_v1alpha1_NetworkRanges, - Convert_v1alpha1_ProviderConfig_To_cluster_ProviderConfig, - Convert_cluster_ProviderConfig_To_v1alpha1_ProviderConfig, - Convert_v1alpha1_ProviderConfigSource_To_cluster_ProviderConfigSource, - Convert_cluster_ProviderConfigSource_To_v1alpha1_ProviderConfigSource, - ) -} - -func autoConvert_v1alpha1_APIEndpoint_To_cluster_APIEndpoint(in *APIEndpoint, out *cluster.APIEndpoint, s conversion.Scope) error { - out.Host = in.Host - out.Port = in.Port - return nil -} - -// Convert_v1alpha1_APIEndpoint_To_cluster_APIEndpoint is an autogenerated conversion function. -func Convert_v1alpha1_APIEndpoint_To_cluster_APIEndpoint(in *APIEndpoint, out *cluster.APIEndpoint, s conversion.Scope) error { - return autoConvert_v1alpha1_APIEndpoint_To_cluster_APIEndpoint(in, out, s) -} - -func autoConvert_cluster_APIEndpoint_To_v1alpha1_APIEndpoint(in *cluster.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { - out.Host = in.Host - out.Port = in.Port - return nil -} - -// Convert_cluster_APIEndpoint_To_v1alpha1_APIEndpoint is an autogenerated conversion function. -func Convert_cluster_APIEndpoint_To_v1alpha1_APIEndpoint(in *cluster.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { - return autoConvert_cluster_APIEndpoint_To_v1alpha1_APIEndpoint(in, out, s) -} - -func autoConvert_v1alpha1_Cluster_To_cluster_Cluster(in *Cluster, out *cluster.Cluster, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha1_ClusterSpec_To_cluster_ClusterSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1alpha1_ClusterStatus_To_cluster_ClusterStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha1_Cluster_To_cluster_Cluster is an autogenerated conversion function. -func Convert_v1alpha1_Cluster_To_cluster_Cluster(in *Cluster, out *cluster.Cluster, s conversion.Scope) error { - return autoConvert_v1alpha1_Cluster_To_cluster_Cluster(in, out, s) -} - -func autoConvert_cluster_Cluster_To_v1alpha1_Cluster(in *cluster.Cluster, out *Cluster, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_cluster_ClusterSpec_To_v1alpha1_ClusterSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_cluster_ClusterStatus_To_v1alpha1_ClusterStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_cluster_Cluster_To_v1alpha1_Cluster is an autogenerated conversion function. -func Convert_cluster_Cluster_To_v1alpha1_Cluster(in *cluster.Cluster, out *Cluster, s conversion.Scope) error { - return autoConvert_cluster_Cluster_To_v1alpha1_Cluster(in, out, s) -} - -func autoConvert_v1alpha1_ClusterList_To_cluster_ClusterList(in *ClusterList, out *cluster.ClusterList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]cluster.Cluster)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_v1alpha1_ClusterList_To_cluster_ClusterList is an autogenerated conversion function. -func Convert_v1alpha1_ClusterList_To_cluster_ClusterList(in *ClusterList, out *cluster.ClusterList, s conversion.Scope) error { - return autoConvert_v1alpha1_ClusterList_To_cluster_ClusterList(in, out, s) -} - -func autoConvert_cluster_ClusterList_To_v1alpha1_ClusterList(in *cluster.ClusterList, out *ClusterList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]Cluster)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_cluster_ClusterList_To_v1alpha1_ClusterList is an autogenerated conversion function. -func Convert_cluster_ClusterList_To_v1alpha1_ClusterList(in *cluster.ClusterList, out *ClusterList, s conversion.Scope) error { - return autoConvert_cluster_ClusterList_To_v1alpha1_ClusterList(in, out, s) -} - -func autoConvert_v1alpha1_ClusterNetworkingConfig_To_cluster_ClusterNetworkingConfig(in *ClusterNetworkingConfig, out *cluster.ClusterNetworkingConfig, s conversion.Scope) error { - if err := Convert_v1alpha1_NetworkRanges_To_cluster_NetworkRanges(&in.Services, &out.Services, s); err != nil { - return err - } - if err := Convert_v1alpha1_NetworkRanges_To_cluster_NetworkRanges(&in.Pods, &out.Pods, s); err != nil { - return err - } - out.ServiceDomain = in.ServiceDomain - return nil -} - -// Convert_v1alpha1_ClusterNetworkingConfig_To_cluster_ClusterNetworkingConfig is an autogenerated conversion function. -func Convert_v1alpha1_ClusterNetworkingConfig_To_cluster_ClusterNetworkingConfig(in *ClusterNetworkingConfig, out *cluster.ClusterNetworkingConfig, s conversion.Scope) error { - return autoConvert_v1alpha1_ClusterNetworkingConfig_To_cluster_ClusterNetworkingConfig(in, out, s) -} - -func autoConvert_cluster_ClusterNetworkingConfig_To_v1alpha1_ClusterNetworkingConfig(in *cluster.ClusterNetworkingConfig, out *ClusterNetworkingConfig, s conversion.Scope) error { - if err := Convert_cluster_NetworkRanges_To_v1alpha1_NetworkRanges(&in.Services, &out.Services, s); err != nil { - return err - } - if err := Convert_cluster_NetworkRanges_To_v1alpha1_NetworkRanges(&in.Pods, &out.Pods, s); err != nil { - return err - } - out.ServiceDomain = in.ServiceDomain - return nil -} - -// Convert_cluster_ClusterNetworkingConfig_To_v1alpha1_ClusterNetworkingConfig is an autogenerated conversion function. -func Convert_cluster_ClusterNetworkingConfig_To_v1alpha1_ClusterNetworkingConfig(in *cluster.ClusterNetworkingConfig, out *ClusterNetworkingConfig, s conversion.Scope) error { - return autoConvert_cluster_ClusterNetworkingConfig_To_v1alpha1_ClusterNetworkingConfig(in, out, s) -} - -func autoConvert_v1alpha1_ClusterSpec_To_cluster_ClusterSpec(in *ClusterSpec, out *cluster.ClusterSpec, s conversion.Scope) error { - if err := Convert_v1alpha1_ClusterNetworkingConfig_To_cluster_ClusterNetworkingConfig(&in.ClusterNetwork, &out.ClusterNetwork, s); err != nil { - return err - } - if err := Convert_v1alpha1_ProviderConfig_To_cluster_ProviderConfig(&in.ProviderConfig, &out.ProviderConfig, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha1_ClusterSpec_To_cluster_ClusterSpec is an autogenerated conversion function. -func Convert_v1alpha1_ClusterSpec_To_cluster_ClusterSpec(in *ClusterSpec, out *cluster.ClusterSpec, s conversion.Scope) error { - return autoConvert_v1alpha1_ClusterSpec_To_cluster_ClusterSpec(in, out, s) -} - -func autoConvert_cluster_ClusterSpec_To_v1alpha1_ClusterSpec(in *cluster.ClusterSpec, out *ClusterSpec, s conversion.Scope) error { - if err := Convert_cluster_ClusterNetworkingConfig_To_v1alpha1_ClusterNetworkingConfig(&in.ClusterNetwork, &out.ClusterNetwork, s); err != nil { - return err - } - if err := Convert_cluster_ProviderConfig_To_v1alpha1_ProviderConfig(&in.ProviderConfig, &out.ProviderConfig, s); err != nil { - return err - } - return nil -} - -// Convert_cluster_ClusterSpec_To_v1alpha1_ClusterSpec is an autogenerated conversion function. -func Convert_cluster_ClusterSpec_To_v1alpha1_ClusterSpec(in *cluster.ClusterSpec, out *ClusterSpec, s conversion.Scope) error { - return autoConvert_cluster_ClusterSpec_To_v1alpha1_ClusterSpec(in, out, s) -} - -func autoConvert_v1alpha1_ClusterStatus_To_cluster_ClusterStatus(in *ClusterStatus, out *cluster.ClusterStatus, s conversion.Scope) error { - out.APIEndpoints = *(*[]cluster.APIEndpoint)(unsafe.Pointer(&in.APIEndpoints)) - out.ErrorReason = common.ClusterStatusError(in.ErrorReason) - out.ErrorMessage = in.ErrorMessage - out.ProviderStatus = (*runtime.RawExtension)(unsafe.Pointer(in.ProviderStatus)) - return nil -} - -// Convert_v1alpha1_ClusterStatus_To_cluster_ClusterStatus is an autogenerated conversion function. -func Convert_v1alpha1_ClusterStatus_To_cluster_ClusterStatus(in *ClusterStatus, out *cluster.ClusterStatus, s conversion.Scope) error { - return autoConvert_v1alpha1_ClusterStatus_To_cluster_ClusterStatus(in, out, s) -} - -func autoConvert_cluster_ClusterStatus_To_v1alpha1_ClusterStatus(in *cluster.ClusterStatus, out *ClusterStatus, s conversion.Scope) error { - out.APIEndpoints = *(*[]APIEndpoint)(unsafe.Pointer(&in.APIEndpoints)) - out.ErrorReason = common.ClusterStatusError(in.ErrorReason) - out.ErrorMessage = in.ErrorMessage - out.ProviderStatus = (*runtime.RawExtension)(unsafe.Pointer(in.ProviderStatus)) - return nil -} - -// Convert_cluster_ClusterStatus_To_v1alpha1_ClusterStatus is an autogenerated conversion function. -func Convert_cluster_ClusterStatus_To_v1alpha1_ClusterStatus(in *cluster.ClusterStatus, out *ClusterStatus, s conversion.Scope) error { - return autoConvert_cluster_ClusterStatus_To_v1alpha1_ClusterStatus(in, out, s) -} - -func autoConvert_v1alpha1_ClusterStatusStrategy_To_cluster_ClusterStatusStrategy(in *ClusterStatusStrategy, out *cluster.ClusterStatusStrategy, s conversion.Scope) error { - out.DefaultStatusStorageStrategy = in.DefaultStatusStorageStrategy - return nil -} - -// Convert_v1alpha1_ClusterStatusStrategy_To_cluster_ClusterStatusStrategy is an autogenerated conversion function. -func Convert_v1alpha1_ClusterStatusStrategy_To_cluster_ClusterStatusStrategy(in *ClusterStatusStrategy, out *cluster.ClusterStatusStrategy, s conversion.Scope) error { - return autoConvert_v1alpha1_ClusterStatusStrategy_To_cluster_ClusterStatusStrategy(in, out, s) -} - -func autoConvert_cluster_ClusterStatusStrategy_To_v1alpha1_ClusterStatusStrategy(in *cluster.ClusterStatusStrategy, out *ClusterStatusStrategy, s conversion.Scope) error { - out.DefaultStatusStorageStrategy = in.DefaultStatusStorageStrategy - return nil -} - -// Convert_cluster_ClusterStatusStrategy_To_v1alpha1_ClusterStatusStrategy is an autogenerated conversion function. -func Convert_cluster_ClusterStatusStrategy_To_v1alpha1_ClusterStatusStrategy(in *cluster.ClusterStatusStrategy, out *ClusterStatusStrategy, s conversion.Scope) error { - return autoConvert_cluster_ClusterStatusStrategy_To_v1alpha1_ClusterStatusStrategy(in, out, s) -} - -func autoConvert_v1alpha1_ClusterStrategy_To_cluster_ClusterStrategy(in *ClusterStrategy, out *cluster.ClusterStrategy, s conversion.Scope) error { - out.DefaultStorageStrategy = in.DefaultStorageStrategy - return nil -} - -// Convert_v1alpha1_ClusterStrategy_To_cluster_ClusterStrategy is an autogenerated conversion function. -func Convert_v1alpha1_ClusterStrategy_To_cluster_ClusterStrategy(in *ClusterStrategy, out *cluster.ClusterStrategy, s conversion.Scope) error { - return autoConvert_v1alpha1_ClusterStrategy_To_cluster_ClusterStrategy(in, out, s) -} - -func autoConvert_cluster_ClusterStrategy_To_v1alpha1_ClusterStrategy(in *cluster.ClusterStrategy, out *ClusterStrategy, s conversion.Scope) error { - out.DefaultStorageStrategy = in.DefaultStorageStrategy - return nil -} - -// Convert_cluster_ClusterStrategy_To_v1alpha1_ClusterStrategy is an autogenerated conversion function. -func Convert_cluster_ClusterStrategy_To_v1alpha1_ClusterStrategy(in *cluster.ClusterStrategy, out *ClusterStrategy, s conversion.Scope) error { - return autoConvert_cluster_ClusterStrategy_To_v1alpha1_ClusterStrategy(in, out, s) -} - -func autoConvert_v1alpha1_Machine_To_cluster_Machine(in *Machine, out *cluster.Machine, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha1_MachineSpec_To_cluster_MachineSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1alpha1_MachineStatus_To_cluster_MachineStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha1_Machine_To_cluster_Machine is an autogenerated conversion function. -func Convert_v1alpha1_Machine_To_cluster_Machine(in *Machine, out *cluster.Machine, s conversion.Scope) error { - return autoConvert_v1alpha1_Machine_To_cluster_Machine(in, out, s) -} - -func autoConvert_cluster_Machine_To_v1alpha1_Machine(in *cluster.Machine, out *Machine, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_cluster_MachineSpec_To_v1alpha1_MachineSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_cluster_MachineStatus_To_v1alpha1_MachineStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_cluster_Machine_To_v1alpha1_Machine is an autogenerated conversion function. -func Convert_cluster_Machine_To_v1alpha1_Machine(in *cluster.Machine, out *Machine, s conversion.Scope) error { - return autoConvert_cluster_Machine_To_v1alpha1_Machine(in, out, s) -} - -func autoConvert_v1alpha1_MachineDeployment_To_cluster_MachineDeployment(in *MachineDeployment, out *cluster.MachineDeployment, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha1_MachineDeploymentSpec_To_cluster_MachineDeploymentSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1alpha1_MachineDeploymentStatus_To_cluster_MachineDeploymentStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha1_MachineDeployment_To_cluster_MachineDeployment is an autogenerated conversion function. -func Convert_v1alpha1_MachineDeployment_To_cluster_MachineDeployment(in *MachineDeployment, out *cluster.MachineDeployment, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineDeployment_To_cluster_MachineDeployment(in, out, s) -} - -func autoConvert_cluster_MachineDeployment_To_v1alpha1_MachineDeployment(in *cluster.MachineDeployment, out *MachineDeployment, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_cluster_MachineDeploymentSpec_To_v1alpha1_MachineDeploymentSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_cluster_MachineDeploymentStatus_To_v1alpha1_MachineDeploymentStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_cluster_MachineDeployment_To_v1alpha1_MachineDeployment is an autogenerated conversion function. -func Convert_cluster_MachineDeployment_To_v1alpha1_MachineDeployment(in *cluster.MachineDeployment, out *MachineDeployment, s conversion.Scope) error { - return autoConvert_cluster_MachineDeployment_To_v1alpha1_MachineDeployment(in, out, s) -} - -func autoConvert_v1alpha1_MachineDeploymentList_To_cluster_MachineDeploymentList(in *MachineDeploymentList, out *cluster.MachineDeploymentList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]cluster.MachineDeployment)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_v1alpha1_MachineDeploymentList_To_cluster_MachineDeploymentList is an autogenerated conversion function. -func Convert_v1alpha1_MachineDeploymentList_To_cluster_MachineDeploymentList(in *MachineDeploymentList, out *cluster.MachineDeploymentList, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineDeploymentList_To_cluster_MachineDeploymentList(in, out, s) -} - -func autoConvert_cluster_MachineDeploymentList_To_v1alpha1_MachineDeploymentList(in *cluster.MachineDeploymentList, out *MachineDeploymentList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]MachineDeployment)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_cluster_MachineDeploymentList_To_v1alpha1_MachineDeploymentList is an autogenerated conversion function. -func Convert_cluster_MachineDeploymentList_To_v1alpha1_MachineDeploymentList(in *cluster.MachineDeploymentList, out *MachineDeploymentList, s conversion.Scope) error { - return autoConvert_cluster_MachineDeploymentList_To_v1alpha1_MachineDeploymentList(in, out, s) -} - -func autoConvert_v1alpha1_MachineDeploymentSpec_To_cluster_MachineDeploymentSpec(in *MachineDeploymentSpec, out *cluster.MachineDeploymentSpec, s conversion.Scope) error { - out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) - out.Selector = in.Selector - if err := Convert_v1alpha1_MachineTemplateSpec_To_cluster_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { - return err - } - if err := Convert_v1alpha1_MachineDeploymentStrategy_To_cluster_MachineDeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { - return err - } - out.MinReadySeconds = (*int32)(unsafe.Pointer(in.MinReadySeconds)) - out.RevisionHistoryLimit = (*int32)(unsafe.Pointer(in.RevisionHistoryLimit)) - out.Paused = in.Paused - out.ProgressDeadlineSeconds = (*int32)(unsafe.Pointer(in.ProgressDeadlineSeconds)) - return nil -} - -// Convert_v1alpha1_MachineDeploymentSpec_To_cluster_MachineDeploymentSpec is an autogenerated conversion function. -func Convert_v1alpha1_MachineDeploymentSpec_To_cluster_MachineDeploymentSpec(in *MachineDeploymentSpec, out *cluster.MachineDeploymentSpec, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineDeploymentSpec_To_cluster_MachineDeploymentSpec(in, out, s) -} - -func autoConvert_cluster_MachineDeploymentSpec_To_v1alpha1_MachineDeploymentSpec(in *cluster.MachineDeploymentSpec, out *MachineDeploymentSpec, s conversion.Scope) error { - out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) - out.Selector = in.Selector - if err := Convert_cluster_MachineTemplateSpec_To_v1alpha1_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { - return err - } - if err := Convert_cluster_MachineDeploymentStrategy_To_v1alpha1_MachineDeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { - return err - } - out.MinReadySeconds = (*int32)(unsafe.Pointer(in.MinReadySeconds)) - out.RevisionHistoryLimit = (*int32)(unsafe.Pointer(in.RevisionHistoryLimit)) - out.Paused = in.Paused - out.ProgressDeadlineSeconds = (*int32)(unsafe.Pointer(in.ProgressDeadlineSeconds)) - return nil -} - -// Convert_cluster_MachineDeploymentSpec_To_v1alpha1_MachineDeploymentSpec is an autogenerated conversion function. -func Convert_cluster_MachineDeploymentSpec_To_v1alpha1_MachineDeploymentSpec(in *cluster.MachineDeploymentSpec, out *MachineDeploymentSpec, s conversion.Scope) error { - return autoConvert_cluster_MachineDeploymentSpec_To_v1alpha1_MachineDeploymentSpec(in, out, s) -} - -func autoConvert_v1alpha1_MachineDeploymentStatus_To_cluster_MachineDeploymentStatus(in *MachineDeploymentStatus, out *cluster.MachineDeploymentStatus, s conversion.Scope) error { - out.ObservedGeneration = in.ObservedGeneration - out.Replicas = in.Replicas - out.UpdatedReplicas = in.UpdatedReplicas - out.ReadyReplicas = in.ReadyReplicas - out.AvailableReplicas = in.AvailableReplicas - out.UnavailableReplicas = in.UnavailableReplicas - return nil -} - -// Convert_v1alpha1_MachineDeploymentStatus_To_cluster_MachineDeploymentStatus is an autogenerated conversion function. -func Convert_v1alpha1_MachineDeploymentStatus_To_cluster_MachineDeploymentStatus(in *MachineDeploymentStatus, out *cluster.MachineDeploymentStatus, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineDeploymentStatus_To_cluster_MachineDeploymentStatus(in, out, s) -} - -func autoConvert_cluster_MachineDeploymentStatus_To_v1alpha1_MachineDeploymentStatus(in *cluster.MachineDeploymentStatus, out *MachineDeploymentStatus, s conversion.Scope) error { - out.ObservedGeneration = in.ObservedGeneration - out.Replicas = in.Replicas - out.UpdatedReplicas = in.UpdatedReplicas - out.ReadyReplicas = in.ReadyReplicas - out.AvailableReplicas = in.AvailableReplicas - out.UnavailableReplicas = in.UnavailableReplicas - return nil -} - -// Convert_cluster_MachineDeploymentStatus_To_v1alpha1_MachineDeploymentStatus is an autogenerated conversion function. -func Convert_cluster_MachineDeploymentStatus_To_v1alpha1_MachineDeploymentStatus(in *cluster.MachineDeploymentStatus, out *MachineDeploymentStatus, s conversion.Scope) error { - return autoConvert_cluster_MachineDeploymentStatus_To_v1alpha1_MachineDeploymentStatus(in, out, s) -} - -func autoConvert_v1alpha1_MachineDeploymentStrategy_To_cluster_MachineDeploymentStrategy(in *MachineDeploymentStrategy, out *cluster.MachineDeploymentStrategy, s conversion.Scope) error { - out.Type = common.MachineDeploymentStrategyType(in.Type) - out.RollingUpdate = (*cluster.MachineRollingUpdateDeployment)(unsafe.Pointer(in.RollingUpdate)) - return nil -} - -// Convert_v1alpha1_MachineDeploymentStrategy_To_cluster_MachineDeploymentStrategy is an autogenerated conversion function. -func Convert_v1alpha1_MachineDeploymentStrategy_To_cluster_MachineDeploymentStrategy(in *MachineDeploymentStrategy, out *cluster.MachineDeploymentStrategy, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineDeploymentStrategy_To_cluster_MachineDeploymentStrategy(in, out, s) -} - -func autoConvert_cluster_MachineDeploymentStrategy_To_v1alpha1_MachineDeploymentStrategy(in *cluster.MachineDeploymentStrategy, out *MachineDeploymentStrategy, s conversion.Scope) error { - out.Type = common.MachineDeploymentStrategyType(in.Type) - out.RollingUpdate = (*MachineRollingUpdateDeployment)(unsafe.Pointer(in.RollingUpdate)) - return nil -} - -// Convert_cluster_MachineDeploymentStrategy_To_v1alpha1_MachineDeploymentStrategy is an autogenerated conversion function. -func Convert_cluster_MachineDeploymentStrategy_To_v1alpha1_MachineDeploymentStrategy(in *cluster.MachineDeploymentStrategy, out *MachineDeploymentStrategy, s conversion.Scope) error { - return autoConvert_cluster_MachineDeploymentStrategy_To_v1alpha1_MachineDeploymentStrategy(in, out, s) -} - -func autoConvert_v1alpha1_MachineDeploymentValidationStatusStrategy_To_cluster_MachineDeploymentValidationStatusStrategy(in *MachineDeploymentValidationStatusStrategy, out *cluster.MachineDeploymentValidationStatusStrategy, s conversion.Scope) error { - out.DefaultStatusStorageStrategy = in.DefaultStatusStorageStrategy - return nil -} - -// Convert_v1alpha1_MachineDeploymentValidationStatusStrategy_To_cluster_MachineDeploymentValidationStatusStrategy is an autogenerated conversion function. -func Convert_v1alpha1_MachineDeploymentValidationStatusStrategy_To_cluster_MachineDeploymentValidationStatusStrategy(in *MachineDeploymentValidationStatusStrategy, out *cluster.MachineDeploymentValidationStatusStrategy, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineDeploymentValidationStatusStrategy_To_cluster_MachineDeploymentValidationStatusStrategy(in, out, s) -} - -func autoConvert_cluster_MachineDeploymentValidationStatusStrategy_To_v1alpha1_MachineDeploymentValidationStatusStrategy(in *cluster.MachineDeploymentValidationStatusStrategy, out *MachineDeploymentValidationStatusStrategy, s conversion.Scope) error { - out.DefaultStatusStorageStrategy = in.DefaultStatusStorageStrategy - return nil -} - -// Convert_cluster_MachineDeploymentValidationStatusStrategy_To_v1alpha1_MachineDeploymentValidationStatusStrategy is an autogenerated conversion function. -func Convert_cluster_MachineDeploymentValidationStatusStrategy_To_v1alpha1_MachineDeploymentValidationStatusStrategy(in *cluster.MachineDeploymentValidationStatusStrategy, out *MachineDeploymentValidationStatusStrategy, s conversion.Scope) error { - return autoConvert_cluster_MachineDeploymentValidationStatusStrategy_To_v1alpha1_MachineDeploymentValidationStatusStrategy(in, out, s) -} - -func autoConvert_v1alpha1_MachineDeploymentValidationStrategy_To_cluster_MachineDeploymentValidationStrategy(in *MachineDeploymentValidationStrategy, out *cluster.MachineDeploymentValidationStrategy, s conversion.Scope) error { - out.DefaultStorageStrategy = in.DefaultStorageStrategy - return nil -} - -// Convert_v1alpha1_MachineDeploymentValidationStrategy_To_cluster_MachineDeploymentValidationStrategy is an autogenerated conversion function. -func Convert_v1alpha1_MachineDeploymentValidationStrategy_To_cluster_MachineDeploymentValidationStrategy(in *MachineDeploymentValidationStrategy, out *cluster.MachineDeploymentValidationStrategy, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineDeploymentValidationStrategy_To_cluster_MachineDeploymentValidationStrategy(in, out, s) -} - -func autoConvert_cluster_MachineDeploymentValidationStrategy_To_v1alpha1_MachineDeploymentValidationStrategy(in *cluster.MachineDeploymentValidationStrategy, out *MachineDeploymentValidationStrategy, s conversion.Scope) error { - out.DefaultStorageStrategy = in.DefaultStorageStrategy - return nil -} - -// Convert_cluster_MachineDeploymentValidationStrategy_To_v1alpha1_MachineDeploymentValidationStrategy is an autogenerated conversion function. -func Convert_cluster_MachineDeploymentValidationStrategy_To_v1alpha1_MachineDeploymentValidationStrategy(in *cluster.MachineDeploymentValidationStrategy, out *MachineDeploymentValidationStrategy, s conversion.Scope) error { - return autoConvert_cluster_MachineDeploymentValidationStrategy_To_v1alpha1_MachineDeploymentValidationStrategy(in, out, s) -} - -func autoConvert_v1alpha1_MachineList_To_cluster_MachineList(in *MachineList, out *cluster.MachineList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]cluster.Machine)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_v1alpha1_MachineList_To_cluster_MachineList is an autogenerated conversion function. -func Convert_v1alpha1_MachineList_To_cluster_MachineList(in *MachineList, out *cluster.MachineList, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineList_To_cluster_MachineList(in, out, s) -} - -func autoConvert_cluster_MachineList_To_v1alpha1_MachineList(in *cluster.MachineList, out *MachineList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]Machine)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_cluster_MachineList_To_v1alpha1_MachineList is an autogenerated conversion function. -func Convert_cluster_MachineList_To_v1alpha1_MachineList(in *cluster.MachineList, out *MachineList, s conversion.Scope) error { - return autoConvert_cluster_MachineList_To_v1alpha1_MachineList(in, out, s) -} - -func autoConvert_v1alpha1_MachineRollingUpdateDeployment_To_cluster_MachineRollingUpdateDeployment(in *MachineRollingUpdateDeployment, out *cluster.MachineRollingUpdateDeployment, s conversion.Scope) error { - out.MaxUnavailable = (*intstr.IntOrString)(unsafe.Pointer(in.MaxUnavailable)) - out.MaxSurge = (*intstr.IntOrString)(unsafe.Pointer(in.MaxSurge)) - return nil -} - -// Convert_v1alpha1_MachineRollingUpdateDeployment_To_cluster_MachineRollingUpdateDeployment is an autogenerated conversion function. -func Convert_v1alpha1_MachineRollingUpdateDeployment_To_cluster_MachineRollingUpdateDeployment(in *MachineRollingUpdateDeployment, out *cluster.MachineRollingUpdateDeployment, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineRollingUpdateDeployment_To_cluster_MachineRollingUpdateDeployment(in, out, s) -} - -func autoConvert_cluster_MachineRollingUpdateDeployment_To_v1alpha1_MachineRollingUpdateDeployment(in *cluster.MachineRollingUpdateDeployment, out *MachineRollingUpdateDeployment, s conversion.Scope) error { - out.MaxUnavailable = (*intstr.IntOrString)(unsafe.Pointer(in.MaxUnavailable)) - out.MaxSurge = (*intstr.IntOrString)(unsafe.Pointer(in.MaxSurge)) - return nil -} - -// Convert_cluster_MachineRollingUpdateDeployment_To_v1alpha1_MachineRollingUpdateDeployment is an autogenerated conversion function. -func Convert_cluster_MachineRollingUpdateDeployment_To_v1alpha1_MachineRollingUpdateDeployment(in *cluster.MachineRollingUpdateDeployment, out *MachineRollingUpdateDeployment, s conversion.Scope) error { - return autoConvert_cluster_MachineRollingUpdateDeployment_To_v1alpha1_MachineRollingUpdateDeployment(in, out, s) -} - -func autoConvert_v1alpha1_MachineSet_To_cluster_MachineSet(in *MachineSet, out *cluster.MachineSet, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha1_MachineSetSpec_To_cluster_MachineSetSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1alpha1_MachineSetStatus_To_cluster_MachineSetStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha1_MachineSet_To_cluster_MachineSet is an autogenerated conversion function. -func Convert_v1alpha1_MachineSet_To_cluster_MachineSet(in *MachineSet, out *cluster.MachineSet, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineSet_To_cluster_MachineSet(in, out, s) -} - -func autoConvert_cluster_MachineSet_To_v1alpha1_MachineSet(in *cluster.MachineSet, out *MachineSet, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_cluster_MachineSetSpec_To_v1alpha1_MachineSetSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_cluster_MachineSetStatus_To_v1alpha1_MachineSetStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_cluster_MachineSet_To_v1alpha1_MachineSet is an autogenerated conversion function. -func Convert_cluster_MachineSet_To_v1alpha1_MachineSet(in *cluster.MachineSet, out *MachineSet, s conversion.Scope) error { - return autoConvert_cluster_MachineSet_To_v1alpha1_MachineSet(in, out, s) -} - -func autoConvert_v1alpha1_MachineSetList_To_cluster_MachineSetList(in *MachineSetList, out *cluster.MachineSetList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]cluster.MachineSet)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_v1alpha1_MachineSetList_To_cluster_MachineSetList is an autogenerated conversion function. -func Convert_v1alpha1_MachineSetList_To_cluster_MachineSetList(in *MachineSetList, out *cluster.MachineSetList, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineSetList_To_cluster_MachineSetList(in, out, s) -} - -func autoConvert_cluster_MachineSetList_To_v1alpha1_MachineSetList(in *cluster.MachineSetList, out *MachineSetList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]MachineSet)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_cluster_MachineSetList_To_v1alpha1_MachineSetList is an autogenerated conversion function. -func Convert_cluster_MachineSetList_To_v1alpha1_MachineSetList(in *cluster.MachineSetList, out *MachineSetList, s conversion.Scope) error { - return autoConvert_cluster_MachineSetList_To_v1alpha1_MachineSetList(in, out, s) -} - -func autoConvert_v1alpha1_MachineSetSpec_To_cluster_MachineSetSpec(in *MachineSetSpec, out *cluster.MachineSetSpec, s conversion.Scope) error { - out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) - out.MinReadySeconds = in.MinReadySeconds - out.Selector = in.Selector - if err := Convert_v1alpha1_MachineTemplateSpec_To_cluster_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha1_MachineSetSpec_To_cluster_MachineSetSpec is an autogenerated conversion function. -func Convert_v1alpha1_MachineSetSpec_To_cluster_MachineSetSpec(in *MachineSetSpec, out *cluster.MachineSetSpec, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineSetSpec_To_cluster_MachineSetSpec(in, out, s) -} - -func autoConvert_cluster_MachineSetSpec_To_v1alpha1_MachineSetSpec(in *cluster.MachineSetSpec, out *MachineSetSpec, s conversion.Scope) error { - out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) - out.MinReadySeconds = in.MinReadySeconds - out.Selector = in.Selector - if err := Convert_cluster_MachineTemplateSpec_To_v1alpha1_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { - return err - } - return nil -} - -// Convert_cluster_MachineSetSpec_To_v1alpha1_MachineSetSpec is an autogenerated conversion function. -func Convert_cluster_MachineSetSpec_To_v1alpha1_MachineSetSpec(in *cluster.MachineSetSpec, out *MachineSetSpec, s conversion.Scope) error { - return autoConvert_cluster_MachineSetSpec_To_v1alpha1_MachineSetSpec(in, out, s) -} - -func autoConvert_v1alpha1_MachineSetStatus_To_cluster_MachineSetStatus(in *MachineSetStatus, out *cluster.MachineSetStatus, s conversion.Scope) error { - out.Replicas = in.Replicas - out.FullyLabeledReplicas = in.FullyLabeledReplicas - out.ReadyReplicas = in.ReadyReplicas - out.AvailableReplicas = in.AvailableReplicas - out.ObservedGeneration = in.ObservedGeneration - out.ErrorReason = (*common.MachineSetStatusError)(unsafe.Pointer(in.ErrorReason)) - out.ErrorMessage = (*string)(unsafe.Pointer(in.ErrorMessage)) - return nil -} - -// Convert_v1alpha1_MachineSetStatus_To_cluster_MachineSetStatus is an autogenerated conversion function. -func Convert_v1alpha1_MachineSetStatus_To_cluster_MachineSetStatus(in *MachineSetStatus, out *cluster.MachineSetStatus, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineSetStatus_To_cluster_MachineSetStatus(in, out, s) -} - -func autoConvert_cluster_MachineSetStatus_To_v1alpha1_MachineSetStatus(in *cluster.MachineSetStatus, out *MachineSetStatus, s conversion.Scope) error { - out.Replicas = in.Replicas - out.FullyLabeledReplicas = in.FullyLabeledReplicas - out.ReadyReplicas = in.ReadyReplicas - out.AvailableReplicas = in.AvailableReplicas - out.ObservedGeneration = in.ObservedGeneration - out.ErrorReason = (*common.MachineSetStatusError)(unsafe.Pointer(in.ErrorReason)) - out.ErrorMessage = (*string)(unsafe.Pointer(in.ErrorMessage)) - return nil -} - -// Convert_cluster_MachineSetStatus_To_v1alpha1_MachineSetStatus is an autogenerated conversion function. -func Convert_cluster_MachineSetStatus_To_v1alpha1_MachineSetStatus(in *cluster.MachineSetStatus, out *MachineSetStatus, s conversion.Scope) error { - return autoConvert_cluster_MachineSetStatus_To_v1alpha1_MachineSetStatus(in, out, s) -} - -func autoConvert_v1alpha1_MachineSetStatusStrategy_To_cluster_MachineSetStatusStrategy(in *MachineSetStatusStrategy, out *cluster.MachineSetStatusStrategy, s conversion.Scope) error { - out.DefaultStatusStorageStrategy = in.DefaultStatusStorageStrategy - return nil -} - -// Convert_v1alpha1_MachineSetStatusStrategy_To_cluster_MachineSetStatusStrategy is an autogenerated conversion function. -func Convert_v1alpha1_MachineSetStatusStrategy_To_cluster_MachineSetStatusStrategy(in *MachineSetStatusStrategy, out *cluster.MachineSetStatusStrategy, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineSetStatusStrategy_To_cluster_MachineSetStatusStrategy(in, out, s) -} - -func autoConvert_cluster_MachineSetStatusStrategy_To_v1alpha1_MachineSetStatusStrategy(in *cluster.MachineSetStatusStrategy, out *MachineSetStatusStrategy, s conversion.Scope) error { - out.DefaultStatusStorageStrategy = in.DefaultStatusStorageStrategy - return nil -} - -// Convert_cluster_MachineSetStatusStrategy_To_v1alpha1_MachineSetStatusStrategy is an autogenerated conversion function. -func Convert_cluster_MachineSetStatusStrategy_To_v1alpha1_MachineSetStatusStrategy(in *cluster.MachineSetStatusStrategy, out *MachineSetStatusStrategy, s conversion.Scope) error { - return autoConvert_cluster_MachineSetStatusStrategy_To_v1alpha1_MachineSetStatusStrategy(in, out, s) -} - -func autoConvert_v1alpha1_MachineSetStrategy_To_cluster_MachineSetStrategy(in *MachineSetStrategy, out *cluster.MachineSetStrategy, s conversion.Scope) error { - out.DefaultStorageStrategy = in.DefaultStorageStrategy - return nil -} - -// Convert_v1alpha1_MachineSetStrategy_To_cluster_MachineSetStrategy is an autogenerated conversion function. -func Convert_v1alpha1_MachineSetStrategy_To_cluster_MachineSetStrategy(in *MachineSetStrategy, out *cluster.MachineSetStrategy, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineSetStrategy_To_cluster_MachineSetStrategy(in, out, s) -} - -func autoConvert_cluster_MachineSetStrategy_To_v1alpha1_MachineSetStrategy(in *cluster.MachineSetStrategy, out *MachineSetStrategy, s conversion.Scope) error { - out.DefaultStorageStrategy = in.DefaultStorageStrategy - return nil -} - -// Convert_cluster_MachineSetStrategy_To_v1alpha1_MachineSetStrategy is an autogenerated conversion function. -func Convert_cluster_MachineSetStrategy_To_v1alpha1_MachineSetStrategy(in *cluster.MachineSetStrategy, out *MachineSetStrategy, s conversion.Scope) error { - return autoConvert_cluster_MachineSetStrategy_To_v1alpha1_MachineSetStrategy(in, out, s) -} - -func autoConvert_v1alpha1_MachineSpec_To_cluster_MachineSpec(in *MachineSpec, out *cluster.MachineSpec, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - out.Taints = *(*[]v1.Taint)(unsafe.Pointer(&in.Taints)) - if err := Convert_v1alpha1_ProviderConfig_To_cluster_ProviderConfig(&in.ProviderConfig, &out.ProviderConfig, s); err != nil { - return err - } - if err := Convert_v1alpha1_MachineVersionInfo_To_cluster_MachineVersionInfo(&in.Versions, &out.Versions, s); err != nil { - return err - } - out.ConfigSource = (*v1.NodeConfigSource)(unsafe.Pointer(in.ConfigSource)) - return nil -} - -// Convert_v1alpha1_MachineSpec_To_cluster_MachineSpec is an autogenerated conversion function. -func Convert_v1alpha1_MachineSpec_To_cluster_MachineSpec(in *MachineSpec, out *cluster.MachineSpec, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineSpec_To_cluster_MachineSpec(in, out, s) -} - -func autoConvert_cluster_MachineSpec_To_v1alpha1_MachineSpec(in *cluster.MachineSpec, out *MachineSpec, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - out.Taints = *(*[]v1.Taint)(unsafe.Pointer(&in.Taints)) - if err := Convert_cluster_ProviderConfig_To_v1alpha1_ProviderConfig(&in.ProviderConfig, &out.ProviderConfig, s); err != nil { - return err - } - if err := Convert_cluster_MachineVersionInfo_To_v1alpha1_MachineVersionInfo(&in.Versions, &out.Versions, s); err != nil { - return err - } - out.ConfigSource = (*v1.NodeConfigSource)(unsafe.Pointer(in.ConfigSource)) - return nil -} - -// Convert_cluster_MachineSpec_To_v1alpha1_MachineSpec is an autogenerated conversion function. -func Convert_cluster_MachineSpec_To_v1alpha1_MachineSpec(in *cluster.MachineSpec, out *MachineSpec, s conversion.Scope) error { - return autoConvert_cluster_MachineSpec_To_v1alpha1_MachineSpec(in, out, s) -} - -func autoConvert_v1alpha1_MachineStatus_To_cluster_MachineStatus(in *MachineStatus, out *cluster.MachineStatus, s conversion.Scope) error { - out.NodeRef = (*v1.ObjectReference)(unsafe.Pointer(in.NodeRef)) - out.LastUpdated = in.LastUpdated - out.Versions = (*cluster.MachineVersionInfo)(unsafe.Pointer(in.Versions)) - out.ErrorReason = (*common.MachineStatusError)(unsafe.Pointer(in.ErrorReason)) - out.ErrorMessage = (*string)(unsafe.Pointer(in.ErrorMessage)) - out.ProviderStatus = (*runtime.RawExtension)(unsafe.Pointer(in.ProviderStatus)) - out.Addresses = *(*[]v1.NodeAddress)(unsafe.Pointer(&in.Addresses)) - out.Conditions = *(*[]v1.NodeCondition)(unsafe.Pointer(&in.Conditions)) - return nil -} - -// Convert_v1alpha1_MachineStatus_To_cluster_MachineStatus is an autogenerated conversion function. -func Convert_v1alpha1_MachineStatus_To_cluster_MachineStatus(in *MachineStatus, out *cluster.MachineStatus, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineStatus_To_cluster_MachineStatus(in, out, s) -} - -func autoConvert_cluster_MachineStatus_To_v1alpha1_MachineStatus(in *cluster.MachineStatus, out *MachineStatus, s conversion.Scope) error { - out.NodeRef = (*v1.ObjectReference)(unsafe.Pointer(in.NodeRef)) - out.LastUpdated = in.LastUpdated - out.Versions = (*MachineVersionInfo)(unsafe.Pointer(in.Versions)) - out.ErrorReason = (*common.MachineStatusError)(unsafe.Pointer(in.ErrorReason)) - out.ErrorMessage = (*string)(unsafe.Pointer(in.ErrorMessage)) - out.ProviderStatus = (*runtime.RawExtension)(unsafe.Pointer(in.ProviderStatus)) - out.Addresses = *(*[]v1.NodeAddress)(unsafe.Pointer(&in.Addresses)) - out.Conditions = *(*[]v1.NodeCondition)(unsafe.Pointer(&in.Conditions)) - return nil -} - -// Convert_cluster_MachineStatus_To_v1alpha1_MachineStatus is an autogenerated conversion function. -func Convert_cluster_MachineStatus_To_v1alpha1_MachineStatus(in *cluster.MachineStatus, out *MachineStatus, s conversion.Scope) error { - return autoConvert_cluster_MachineStatus_To_v1alpha1_MachineStatus(in, out, s) -} - -func autoConvert_v1alpha1_MachineStatusStrategy_To_cluster_MachineStatusStrategy(in *MachineStatusStrategy, out *cluster.MachineStatusStrategy, s conversion.Scope) error { - out.DefaultStatusStorageStrategy = in.DefaultStatusStorageStrategy - return nil -} - -// Convert_v1alpha1_MachineStatusStrategy_To_cluster_MachineStatusStrategy is an autogenerated conversion function. -func Convert_v1alpha1_MachineStatusStrategy_To_cluster_MachineStatusStrategy(in *MachineStatusStrategy, out *cluster.MachineStatusStrategy, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineStatusStrategy_To_cluster_MachineStatusStrategy(in, out, s) -} - -func autoConvert_cluster_MachineStatusStrategy_To_v1alpha1_MachineStatusStrategy(in *cluster.MachineStatusStrategy, out *MachineStatusStrategy, s conversion.Scope) error { - out.DefaultStatusStorageStrategy = in.DefaultStatusStorageStrategy - return nil -} - -// Convert_cluster_MachineStatusStrategy_To_v1alpha1_MachineStatusStrategy is an autogenerated conversion function. -func Convert_cluster_MachineStatusStrategy_To_v1alpha1_MachineStatusStrategy(in *cluster.MachineStatusStrategy, out *MachineStatusStrategy, s conversion.Scope) error { - return autoConvert_cluster_MachineStatusStrategy_To_v1alpha1_MachineStatusStrategy(in, out, s) -} - -func autoConvert_v1alpha1_MachineStrategy_To_cluster_MachineStrategy(in *MachineStrategy, out *cluster.MachineStrategy, s conversion.Scope) error { - out.DefaultStorageStrategy = in.DefaultStorageStrategy - return nil -} - -// Convert_v1alpha1_MachineStrategy_To_cluster_MachineStrategy is an autogenerated conversion function. -func Convert_v1alpha1_MachineStrategy_To_cluster_MachineStrategy(in *MachineStrategy, out *cluster.MachineStrategy, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineStrategy_To_cluster_MachineStrategy(in, out, s) -} - -func autoConvert_cluster_MachineStrategy_To_v1alpha1_MachineStrategy(in *cluster.MachineStrategy, out *MachineStrategy, s conversion.Scope) error { - out.DefaultStorageStrategy = in.DefaultStorageStrategy - return nil -} - -// Convert_cluster_MachineStrategy_To_v1alpha1_MachineStrategy is an autogenerated conversion function. -func Convert_cluster_MachineStrategy_To_v1alpha1_MachineStrategy(in *cluster.MachineStrategy, out *MachineStrategy, s conversion.Scope) error { - return autoConvert_cluster_MachineStrategy_To_v1alpha1_MachineStrategy(in, out, s) -} - -func autoConvert_v1alpha1_MachineTemplateSpec_To_cluster_MachineTemplateSpec(in *MachineTemplateSpec, out *cluster.MachineTemplateSpec, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha1_MachineSpec_To_cluster_MachineSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha1_MachineTemplateSpec_To_cluster_MachineTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha1_MachineTemplateSpec_To_cluster_MachineTemplateSpec(in *MachineTemplateSpec, out *cluster.MachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineTemplateSpec_To_cluster_MachineTemplateSpec(in, out, s) -} - -func autoConvert_cluster_MachineTemplateSpec_To_v1alpha1_MachineTemplateSpec(in *cluster.MachineTemplateSpec, out *MachineTemplateSpec, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_cluster_MachineSpec_To_v1alpha1_MachineSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - return nil -} - -// Convert_cluster_MachineTemplateSpec_To_v1alpha1_MachineTemplateSpec is an autogenerated conversion function. -func Convert_cluster_MachineTemplateSpec_To_v1alpha1_MachineTemplateSpec(in *cluster.MachineTemplateSpec, out *MachineTemplateSpec, s conversion.Scope) error { - return autoConvert_cluster_MachineTemplateSpec_To_v1alpha1_MachineTemplateSpec(in, out, s) -} - -func autoConvert_v1alpha1_MachineVersionInfo_To_cluster_MachineVersionInfo(in *MachineVersionInfo, out *cluster.MachineVersionInfo, s conversion.Scope) error { - out.Kubelet = in.Kubelet - out.ControlPlane = in.ControlPlane - return nil -} - -// Convert_v1alpha1_MachineVersionInfo_To_cluster_MachineVersionInfo is an autogenerated conversion function. -func Convert_v1alpha1_MachineVersionInfo_To_cluster_MachineVersionInfo(in *MachineVersionInfo, out *cluster.MachineVersionInfo, s conversion.Scope) error { - return autoConvert_v1alpha1_MachineVersionInfo_To_cluster_MachineVersionInfo(in, out, s) -} - -func autoConvert_cluster_MachineVersionInfo_To_v1alpha1_MachineVersionInfo(in *cluster.MachineVersionInfo, out *MachineVersionInfo, s conversion.Scope) error { - out.Kubelet = in.Kubelet - out.ControlPlane = in.ControlPlane - return nil -} - -// Convert_cluster_MachineVersionInfo_To_v1alpha1_MachineVersionInfo is an autogenerated conversion function. -func Convert_cluster_MachineVersionInfo_To_v1alpha1_MachineVersionInfo(in *cluster.MachineVersionInfo, out *MachineVersionInfo, s conversion.Scope) error { - return autoConvert_cluster_MachineVersionInfo_To_v1alpha1_MachineVersionInfo(in, out, s) -} - -func autoConvert_v1alpha1_NetworkRanges_To_cluster_NetworkRanges(in *NetworkRanges, out *cluster.NetworkRanges, s conversion.Scope) error { - out.CIDRBlocks = *(*[]string)(unsafe.Pointer(&in.CIDRBlocks)) - return nil -} - -// Convert_v1alpha1_NetworkRanges_To_cluster_NetworkRanges is an autogenerated conversion function. -func Convert_v1alpha1_NetworkRanges_To_cluster_NetworkRanges(in *NetworkRanges, out *cluster.NetworkRanges, s conversion.Scope) error { - return autoConvert_v1alpha1_NetworkRanges_To_cluster_NetworkRanges(in, out, s) -} - -func autoConvert_cluster_NetworkRanges_To_v1alpha1_NetworkRanges(in *cluster.NetworkRanges, out *NetworkRanges, s conversion.Scope) error { - out.CIDRBlocks = *(*[]string)(unsafe.Pointer(&in.CIDRBlocks)) - return nil -} - -// Convert_cluster_NetworkRanges_To_v1alpha1_NetworkRanges is an autogenerated conversion function. -func Convert_cluster_NetworkRanges_To_v1alpha1_NetworkRanges(in *cluster.NetworkRanges, out *NetworkRanges, s conversion.Scope) error { - return autoConvert_cluster_NetworkRanges_To_v1alpha1_NetworkRanges(in, out, s) -} - -func autoConvert_v1alpha1_ProviderConfig_To_cluster_ProviderConfig(in *ProviderConfig, out *cluster.ProviderConfig, s conversion.Scope) error { - out.Value = (*runtime.RawExtension)(unsafe.Pointer(in.Value)) - out.ValueFrom = (*cluster.ProviderConfigSource)(unsafe.Pointer(in.ValueFrom)) - return nil -} - -// Convert_v1alpha1_ProviderConfig_To_cluster_ProviderConfig is an autogenerated conversion function. -func Convert_v1alpha1_ProviderConfig_To_cluster_ProviderConfig(in *ProviderConfig, out *cluster.ProviderConfig, s conversion.Scope) error { - return autoConvert_v1alpha1_ProviderConfig_To_cluster_ProviderConfig(in, out, s) -} - -func autoConvert_cluster_ProviderConfig_To_v1alpha1_ProviderConfig(in *cluster.ProviderConfig, out *ProviderConfig, s conversion.Scope) error { - out.Value = (*runtime.RawExtension)(unsafe.Pointer(in.Value)) - out.ValueFrom = (*ProviderConfigSource)(unsafe.Pointer(in.ValueFrom)) - return nil -} - -// Convert_cluster_ProviderConfig_To_v1alpha1_ProviderConfig is an autogenerated conversion function. -func Convert_cluster_ProviderConfig_To_v1alpha1_ProviderConfig(in *cluster.ProviderConfig, out *ProviderConfig, s conversion.Scope) error { - return autoConvert_cluster_ProviderConfig_To_v1alpha1_ProviderConfig(in, out, s) -} - -func autoConvert_v1alpha1_ProviderConfigSource_To_cluster_ProviderConfigSource(in *ProviderConfigSource, out *cluster.ProviderConfigSource, s conversion.Scope) error { - return nil -} - -// Convert_v1alpha1_ProviderConfigSource_To_cluster_ProviderConfigSource is an autogenerated conversion function. -func Convert_v1alpha1_ProviderConfigSource_To_cluster_ProviderConfigSource(in *ProviderConfigSource, out *cluster.ProviderConfigSource, s conversion.Scope) error { - return autoConvert_v1alpha1_ProviderConfigSource_To_cluster_ProviderConfigSource(in, out, s) -} - -func autoConvert_cluster_ProviderConfigSource_To_v1alpha1_ProviderConfigSource(in *cluster.ProviderConfigSource, out *ProviderConfigSource, s conversion.Scope) error { - return nil -} - -// Convert_cluster_ProviderConfigSource_To_v1alpha1_ProviderConfigSource is an autogenerated conversion function. -func Convert_cluster_ProviderConfigSource_To_v1alpha1_ProviderConfigSource(in *cluster.ProviderConfigSource, out *ProviderConfigSource, s conversion.Scope) error { - return autoConvert_cluster_ProviderConfigSource_To_v1alpha1_ProviderConfigSource(in, out, s) -} diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go index bce2322f6..24c00b0cd 100644 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by deepcopy-gen. DO NOT EDIT. +// Code generated by main. DO NOT EDIT. package v1alpha1 @@ -150,12 +150,8 @@ func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) { } if in.ProviderStatus != nil { in, out := &in.ProviderStatus, &out.ProviderStatus - if *in == nil { - *out = nil - } else { - *out = new(runtime.RawExtension) - (*in).DeepCopyInto(*out) - } + *out = new(runtime.RawExtension) + (*in).DeepCopyInto(*out) } return } @@ -264,42 +260,26 @@ func (in *MachineDeploymentSpec) DeepCopyInto(out *MachineDeploymentSpec) { *out = *in if in.Replicas != nil { in, out := &in.Replicas, &out.Replicas - if *in == nil { - *out = nil - } else { - *out = new(int32) - **out = **in - } + *out = new(int32) + **out = **in } in.Selector.DeepCopyInto(&out.Selector) in.Template.DeepCopyInto(&out.Template) in.Strategy.DeepCopyInto(&out.Strategy) if in.MinReadySeconds != nil { in, out := &in.MinReadySeconds, &out.MinReadySeconds - if *in == nil { - *out = nil - } else { - *out = new(int32) - **out = **in - } + *out = new(int32) + **out = **in } if in.RevisionHistoryLimit != nil { in, out := &in.RevisionHistoryLimit, &out.RevisionHistoryLimit - if *in == nil { - *out = nil - } else { - *out = new(int32) - **out = **in - } + *out = new(int32) + **out = **in } if in.ProgressDeadlineSeconds != nil { in, out := &in.ProgressDeadlineSeconds, &out.ProgressDeadlineSeconds - if *in == nil { - *out = nil - } else { - *out = new(int32) - **out = **in - } + *out = new(int32) + **out = **in } return } @@ -335,12 +315,8 @@ func (in *MachineDeploymentStrategy) DeepCopyInto(out *MachineDeploymentStrategy *out = *in if in.RollingUpdate != nil { in, out := &in.RollingUpdate, &out.RollingUpdate - if *in == nil { - *out = nil - } else { - *out = new(MachineRollingUpdateDeployment) - (*in).DeepCopyInto(*out) - } + *out = new(MachineRollingUpdateDeployment) + (*in).DeepCopyInto(*out) } return } @@ -393,21 +369,13 @@ func (in *MachineRollingUpdateDeployment) DeepCopyInto(out *MachineRollingUpdate *out = *in if in.MaxUnavailable != nil { in, out := &in.MaxUnavailable, &out.MaxUnavailable - if *in == nil { - *out = nil - } else { - *out = new(intstr.IntOrString) - **out = **in - } + *out = new(intstr.IntOrString) + **out = **in } if in.MaxSurge != nil { in, out := &in.MaxSurge, &out.MaxSurge - if *in == nil { - *out = nil - } else { - *out = new(intstr.IntOrString) - **out = **in - } + *out = new(intstr.IntOrString) + **out = **in } return } @@ -488,12 +456,8 @@ func (in *MachineSetSpec) DeepCopyInto(out *MachineSetSpec) { *out = *in if in.Replicas != nil { in, out := &in.Replicas, &out.Replicas - if *in == nil { - *out = nil - } else { - *out = new(int32) - **out = **in - } + *out = new(int32) + **out = **in } in.Selector.DeepCopyInto(&out.Selector) in.Template.DeepCopyInto(&out.Template) @@ -515,21 +479,13 @@ func (in *MachineSetStatus) DeepCopyInto(out *MachineSetStatus) { *out = *in if in.ErrorReason != nil { in, out := &in.ErrorReason, &out.ErrorReason - if *in == nil { - *out = nil - } else { - *out = new(common.MachineSetStatusError) - **out = **in - } + *out = new(common.MachineSetStatusError) + **out = **in } if in.ErrorMessage != nil { in, out := &in.ErrorMessage, &out.ErrorMessage - if *in == nil { - *out = nil - } else { - *out = new(string) - **out = **in - } + *out = new(string) + **out = **in } return } @@ -559,12 +515,8 @@ func (in *MachineSpec) DeepCopyInto(out *MachineSpec) { out.Versions = in.Versions if in.ConfigSource != nil { in, out := &in.ConfigSource, &out.ConfigSource - if *in == nil { - *out = nil - } else { - *out = new(v1.NodeConfigSource) - (*in).DeepCopyInto(*out) - } + *out = new(v1.NodeConfigSource) + (*in).DeepCopyInto(*out) } return } @@ -584,49 +536,32 @@ func (in *MachineStatus) DeepCopyInto(out *MachineStatus) { *out = *in if in.NodeRef != nil { in, out := &in.NodeRef, &out.NodeRef - if *in == nil { - *out = nil - } else { - *out = new(v1.ObjectReference) - **out = **in - } + *out = new(v1.ObjectReference) + **out = **in + } + if in.LastUpdated != nil { + in, out := &in.LastUpdated, &out.LastUpdated + *out = (*in).DeepCopy() } - in.LastUpdated.DeepCopyInto(&out.LastUpdated) if in.Versions != nil { in, out := &in.Versions, &out.Versions - if *in == nil { - *out = nil - } else { - *out = new(MachineVersionInfo) - **out = **in - } + *out = new(MachineVersionInfo) + **out = **in } if in.ErrorReason != nil { in, out := &in.ErrorReason, &out.ErrorReason - if *in == nil { - *out = nil - } else { - *out = new(common.MachineStatusError) - **out = **in - } + *out = new(common.MachineStatusError) + **out = **in } if in.ErrorMessage != nil { in, out := &in.ErrorMessage, &out.ErrorMessage - if *in == nil { - *out = nil - } else { - *out = new(string) - **out = **in - } + *out = new(string) + **out = **in } if in.ProviderStatus != nil { in, out := &in.ProviderStatus, &out.ProviderStatus - if *in == nil { - *out = nil - } else { - *out = new(runtime.RawExtension) - (*in).DeepCopyInto(*out) - } + *out = new(runtime.RawExtension) + (*in).DeepCopyInto(*out) } if in.Addresses != nil { in, out := &in.Addresses, &out.Addresses @@ -713,21 +648,13 @@ func (in *ProviderConfig) DeepCopyInto(out *ProviderConfig) { *out = *in if in.Value != nil { in, out := &in.Value, &out.Value - if *in == nil { - *out = nil - } else { - *out = new(runtime.RawExtension) - (*in).DeepCopyInto(*out) - } + *out = new(runtime.RawExtension) + (*in).DeepCopyInto(*out) } if in.ValueFrom != nil { in, out := &in.ValueFrom, &out.ValueFrom - if *in == nil { - *out = nil - } else { - *out = new(ProviderConfigSource) - **out = **in - } + *out = new(ProviderConfigSource) + **out = **in } return } diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.defaults.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.defaults.go deleted file mode 100644 index 5e24d22ca..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/zz_generated.defaults.go +++ /dev/null @@ -1,32 +0,0 @@ -// +build !ignore_autogenerated - -/* -Copyright 2018 The Kubernetes Authors. - -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. -*/ - -// This file was autogenerated by defaulter-gen. Do not edit it manually! - -package v1alpha1 - -import ( - runtime "k8s.io/apimachinery/pkg/runtime" -) - -// RegisterDefaults adds defaulters functions to the given scheme. -// Public to allow building arbitrary schemes. -// All generated defaulters are covering - they call all nested defaulters. -func RegisterDefaults(scheme *runtime.Scheme) error { - return nil -} diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.api.register.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.api.register.go deleted file mode 100644 index fe206e8de..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.api.register.go +++ /dev/null @@ -1,750 +0,0 @@ -/* -Copyright 2017 The Kubernetes Authors. - -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. -*/ - -// This file was autogenerated by apiregister-gen. Do not edit it manually! - -package cluster - -import ( - "fmt" - - "github.com/kubernetes-incubator/apiserver-builder/pkg/builders" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/apis/meta/internalversion" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - pkgruntime "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - utilintstr "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/apiserver/pkg/registry/rest" - clustercommon "sigs.k8s.io/cluster-api/pkg/apis/cluster/common" -) - -var ( - InternalCluster = builders.NewInternalResource( - "clusters", - "Cluster", - func() runtime.Object { return &Cluster{} }, - func() runtime.Object { return &ClusterList{} }, - ) - InternalClusterStatus = builders.NewInternalResourceStatus( - "clusters", - "ClusterStatus", - func() runtime.Object { return &Cluster{} }, - func() runtime.Object { return &ClusterList{} }, - ) - InternalMachine = builders.NewInternalResource( - "machines", - "Machine", - func() runtime.Object { return &Machine{} }, - func() runtime.Object { return &MachineList{} }, - ) - InternalMachineStatus = builders.NewInternalResourceStatus( - "machines", - "MachineStatus", - func() runtime.Object { return &Machine{} }, - func() runtime.Object { return &MachineList{} }, - ) - InternalMachineDeployment = builders.NewInternalResource( - "machinedeployments", - "MachineDeployment", - func() runtime.Object { return &MachineDeployment{} }, - func() runtime.Object { return &MachineDeploymentList{} }, - ) - InternalMachineDeploymentStatus = builders.NewInternalResourceStatus( - "machinedeployments", - "MachineDeploymentStatus", - func() runtime.Object { return &MachineDeployment{} }, - func() runtime.Object { return &MachineDeploymentList{} }, - ) - InternalMachineSet = builders.NewInternalResource( - "machinesets", - "MachineSet", - func() runtime.Object { return &MachineSet{} }, - func() runtime.Object { return &MachineSetList{} }, - ) - InternalMachineSetStatus = builders.NewInternalResourceStatus( - "machinesets", - "MachineSetStatus", - func() runtime.Object { return &MachineSet{} }, - func() runtime.Object { return &MachineSetList{} }, - ) - // Registered resources and subresources - ApiVersion = builders.NewApiGroup("cluster.k8s.io").WithKinds( - InternalCluster, - InternalClusterStatus, - InternalMachine, - InternalMachineStatus, - InternalMachineDeployment, - InternalMachineDeploymentStatus, - InternalMachineSet, - InternalMachineSetStatus, - ) - - // Required by code generated by go2idl - AddToScheme = ApiVersion.SchemaBuilder.AddToScheme - SchemeBuilder = ApiVersion.SchemaBuilder - localSchemeBuilder = &SchemeBuilder - SchemeGroupVersion = ApiVersion.GroupVersion -) - -// Required by code generated by go2idl -// Kind takes an unqualified kind and returns a Group qualified GroupKind -func Kind(kind string) schema.GroupKind { - return SchemeGroupVersion.WithKind(kind).GroupKind() -} - -// Required by code generated by go2idl -// Resource takes an unqualified resource and returns a Group qualified GroupResource -func Resource(resource string) schema.GroupResource { - return SchemeGroupVersion.WithResource(resource).GroupResource() -} - -// +genclient -// +genclient -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type Cluster struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ClusterSpec - Status ClusterStatus -} - -// +genclient -// +genclient -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type MachineSet struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec MachineSetSpec - Status MachineSetStatus -} - -type ClusterStatus struct { - APIEndpoints []APIEndpoint - ErrorReason clustercommon.ClusterStatusError - ErrorMessage string - ProviderStatus *pkgruntime.RawExtension -} - -type MachineSetStatus struct { - Replicas int32 - FullyLabeledReplicas int32 - ReadyReplicas int32 - AvailableReplicas int32 - ObservedGeneration int64 - ErrorReason *clustercommon.MachineSetStatusError - ErrorMessage *string -} - -type APIEndpoint struct { - Host string - Port int -} - -type MachineSetSpec struct { - Replicas *int32 - MinReadySeconds int32 - Selector metav1.LabelSelector - Template MachineTemplateSpec -} - -type ClusterSpec struct { - ClusterNetwork ClusterNetworkingConfig - ProviderConfig ProviderConfig -} - -type MachineTemplateSpec struct { - metav1.ObjectMeta - Spec MachineSpec -} - -type ProviderConfig struct { - Value *pkgruntime.RawExtension - ValueFrom *ProviderConfigSource -} - -type MachineSpec struct { - metav1.ObjectMeta - Taints []corev1.Taint - ProviderConfig ProviderConfig - Versions MachineVersionInfo - ConfigSource *corev1.NodeConfigSource -} - -type ProviderConfigSource struct { -} - -type MachineVersionInfo struct { - Kubelet string - ControlPlane string -} - -type ClusterNetworkingConfig struct { - Services NetworkRanges - Pods NetworkRanges - ServiceDomain string -} - -// +genclient -// +genclient -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type MachineDeployment struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec MachineDeploymentSpec - Status MachineDeploymentStatus -} - -type NetworkRanges struct { - CIDRBlocks []string -} - -type MachineDeploymentStatus struct { - ObservedGeneration int64 - Replicas int32 - UpdatedReplicas int32 - ReadyReplicas int32 - AvailableReplicas int32 - UnavailableReplicas int32 -} - -type MachineDeploymentSpec struct { - Replicas *int32 - Selector metav1.LabelSelector - Template MachineTemplateSpec - Strategy MachineDeploymentStrategy - MinReadySeconds *int32 - RevisionHistoryLimit *int32 - Paused bool - ProgressDeadlineSeconds *int32 -} - -type MachineDeploymentStrategy struct { - Type clustercommon.MachineDeploymentStrategyType - RollingUpdate *MachineRollingUpdateDeployment -} - -type MachineRollingUpdateDeployment struct { - MaxUnavailable *utilintstr.IntOrString - MaxSurge *utilintstr.IntOrString -} - -// +genclient -// +genclient -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type Machine struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec MachineSpec - Status MachineStatus -} - -type MachineStatus struct { - NodeRef *corev1.ObjectReference - LastUpdated metav1.Time - Versions *MachineVersionInfo - ErrorReason *clustercommon.MachineStatusError - ErrorMessage *string - ProviderStatus *pkgruntime.RawExtension - Addresses []corev1.NodeAddress - Conditions []corev1.NodeCondition -} - -// -// Cluster Functions and Structs -// -// +k8s:deepcopy-gen=false -type ClusterStrategy struct { - builders.DefaultStorageStrategy -} - -// +k8s:deepcopy-gen=false -type ClusterStatusStrategy struct { - builders.DefaultStatusStorageStrategy -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type ClusterList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Cluster -} - -func (Cluster) NewStatus() interface{} { - return ClusterStatus{} -} - -func (pc *Cluster) GetStatus() interface{} { - return pc.Status -} - -func (pc *Cluster) SetStatus(s interface{}) { - pc.Status = s.(ClusterStatus) -} - -func (pc *Cluster) GetSpec() interface{} { - return pc.Spec -} - -func (pc *Cluster) SetSpec(s interface{}) { - pc.Spec = s.(ClusterSpec) -} - -func (pc *Cluster) GetObjectMeta() *metav1.ObjectMeta { - return &pc.ObjectMeta -} - -func (pc *Cluster) SetGeneration(generation int64) { - pc.ObjectMeta.Generation = generation -} - -func (pc Cluster) GetGeneration() int64 { - return pc.ObjectMeta.Generation -} - -// Registry is an interface for things that know how to store Cluster. -// +k8s:deepcopy-gen=false -type ClusterRegistry interface { - ListClusters(ctx request.Context, options *internalversion.ListOptions) (*ClusterList, error) - GetCluster(ctx request.Context, id string, options *metav1.GetOptions) (*Cluster, error) - CreateCluster(ctx request.Context, id *Cluster) (*Cluster, error) - UpdateCluster(ctx request.Context, id *Cluster) (*Cluster, error) - DeleteCluster(ctx request.Context, id string) (bool, error) -} - -// NewRegistry returns a new Registry interface for the given Storage. Any mismatched types will panic. -func NewClusterRegistry(sp builders.StandardStorageProvider) ClusterRegistry { - return &storageCluster{sp} -} - -// Implement Registry -// storage puts strong typing around storage calls -// +k8s:deepcopy-gen=false -type storageCluster struct { - builders.StandardStorageProvider -} - -func (s *storageCluster) ListClusters(ctx request.Context, options *internalversion.ListOptions) (*ClusterList, error) { - if options != nil && options.FieldSelector != nil && !options.FieldSelector.Empty() { - return nil, fmt.Errorf("field selector not supported yet") - } - st := s.GetStandardStorage() - obj, err := st.List(ctx, options) - if err != nil { - return nil, err - } - return obj.(*ClusterList), err -} - -func (s *storageCluster) GetCluster(ctx request.Context, id string, options *metav1.GetOptions) (*Cluster, error) { - st := s.GetStandardStorage() - obj, err := st.Get(ctx, id, options) - if err != nil { - return nil, err - } - return obj.(*Cluster), nil -} - -func (s *storageCluster) CreateCluster(ctx request.Context, object *Cluster) (*Cluster, error) { - st := s.GetStandardStorage() - obj, err := st.Create(ctx, object, nil, true) - if err != nil { - return nil, err - } - return obj.(*Cluster), nil -} - -func (s *storageCluster) UpdateCluster(ctx request.Context, object *Cluster) (*Cluster, error) { - st := s.GetStandardStorage() - obj, _, err := st.Update(ctx, object.Name, rest.DefaultUpdatedObjectInfo(object), nil, nil) - if err != nil { - return nil, err - } - return obj.(*Cluster), nil -} - -func (s *storageCluster) DeleteCluster(ctx request.Context, id string) (bool, error) { - st := s.GetStandardStorage() - _, sync, err := st.Delete(ctx, id, nil) - return sync, err -} - -// -// Machine Functions and Structs -// -// +k8s:deepcopy-gen=false -type MachineStrategy struct { - builders.DefaultStorageStrategy -} - -// +k8s:deepcopy-gen=false -type MachineStatusStrategy struct { - builders.DefaultStatusStorageStrategy -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type MachineList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Machine -} - -func (Machine) NewStatus() interface{} { - return MachineStatus{} -} - -func (pc *Machine) GetStatus() interface{} { - return pc.Status -} - -func (pc *Machine) SetStatus(s interface{}) { - pc.Status = s.(MachineStatus) -} - -func (pc *Machine) GetSpec() interface{} { - return pc.Spec -} - -func (pc *Machine) SetSpec(s interface{}) { - pc.Spec = s.(MachineSpec) -} - -func (pc *Machine) GetObjectMeta() *metav1.ObjectMeta { - return &pc.ObjectMeta -} - -func (pc *Machine) SetGeneration(generation int64) { - pc.ObjectMeta.Generation = generation -} - -func (pc Machine) GetGeneration() int64 { - return pc.ObjectMeta.Generation -} - -// Registry is an interface for things that know how to store Machine. -// +k8s:deepcopy-gen=false -type MachineRegistry interface { - ListMachines(ctx request.Context, options *internalversion.ListOptions) (*MachineList, error) - GetMachine(ctx request.Context, id string, options *metav1.GetOptions) (*Machine, error) - CreateMachine(ctx request.Context, id *Machine) (*Machine, error) - UpdateMachine(ctx request.Context, id *Machine) (*Machine, error) - DeleteMachine(ctx request.Context, id string) (bool, error) -} - -// NewRegistry returns a new Registry interface for the given Storage. Any mismatched types will panic. -func NewMachineRegistry(sp builders.StandardStorageProvider) MachineRegistry { - return &storageMachine{sp} -} - -// Implement Registry -// storage puts strong typing around storage calls -// +k8s:deepcopy-gen=false -type storageMachine struct { - builders.StandardStorageProvider -} - -func (s *storageMachine) ListMachines(ctx request.Context, options *internalversion.ListOptions) (*MachineList, error) { - if options != nil && options.FieldSelector != nil && !options.FieldSelector.Empty() { - return nil, fmt.Errorf("field selector not supported yet") - } - st := s.GetStandardStorage() - obj, err := st.List(ctx, options) - if err != nil { - return nil, err - } - return obj.(*MachineList), err -} - -func (s *storageMachine) GetMachine(ctx request.Context, id string, options *metav1.GetOptions) (*Machine, error) { - st := s.GetStandardStorage() - obj, err := st.Get(ctx, id, options) - if err != nil { - return nil, err - } - return obj.(*Machine), nil -} - -func (s *storageMachine) CreateMachine(ctx request.Context, object *Machine) (*Machine, error) { - st := s.GetStandardStorage() - obj, err := st.Create(ctx, object, nil, true) - if err != nil { - return nil, err - } - return obj.(*Machine), nil -} - -func (s *storageMachine) UpdateMachine(ctx request.Context, object *Machine) (*Machine, error) { - st := s.GetStandardStorage() - obj, _, err := st.Update(ctx, object.Name, rest.DefaultUpdatedObjectInfo(object), nil, nil) - if err != nil { - return nil, err - } - return obj.(*Machine), nil -} - -func (s *storageMachine) DeleteMachine(ctx request.Context, id string) (bool, error) { - st := s.GetStandardStorage() - _, sync, err := st.Delete(ctx, id, nil) - return sync, err -} - -// -// MachineDeployment Functions and Structs -// -// +k8s:deepcopy-gen=false -type MachineDeploymentValidationStrategy struct { - builders.DefaultStorageStrategy -} - -// +k8s:deepcopy-gen=false -type MachineDeploymentValidationStatusStrategy struct { - builders.DefaultStatusStorageStrategy -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type MachineDeploymentList struct { - metav1.TypeMeta - metav1.ListMeta - Items []MachineDeployment -} - -func (MachineDeployment) NewStatus() interface{} { - return MachineDeploymentStatus{} -} - -func (pc *MachineDeployment) GetStatus() interface{} { - return pc.Status -} - -func (pc *MachineDeployment) SetStatus(s interface{}) { - pc.Status = s.(MachineDeploymentStatus) -} - -func (pc *MachineDeployment) GetSpec() interface{} { - return pc.Spec -} - -func (pc *MachineDeployment) SetSpec(s interface{}) { - pc.Spec = s.(MachineDeploymentSpec) -} - -func (pc *MachineDeployment) GetObjectMeta() *metav1.ObjectMeta { - return &pc.ObjectMeta -} - -func (pc *MachineDeployment) SetGeneration(generation int64) { - pc.ObjectMeta.Generation = generation -} - -func (pc MachineDeployment) GetGeneration() int64 { - return pc.ObjectMeta.Generation -} - -// Registry is an interface for things that know how to store MachineDeployment. -// +k8s:deepcopy-gen=false -type MachineDeploymentRegistry interface { - ListMachineDeployments(ctx request.Context, options *internalversion.ListOptions) (*MachineDeploymentList, error) - GetMachineDeployment(ctx request.Context, id string, options *metav1.GetOptions) (*MachineDeployment, error) - CreateMachineDeployment(ctx request.Context, id *MachineDeployment) (*MachineDeployment, error) - UpdateMachineDeployment(ctx request.Context, id *MachineDeployment) (*MachineDeployment, error) - DeleteMachineDeployment(ctx request.Context, id string) (bool, error) -} - -// NewRegistry returns a new Registry interface for the given Storage. Any mismatched types will panic. -func NewMachineDeploymentRegistry(sp builders.StandardStorageProvider) MachineDeploymentRegistry { - return &storageMachineDeployment{sp} -} - -// Implement Registry -// storage puts strong typing around storage calls -// +k8s:deepcopy-gen=false -type storageMachineDeployment struct { - builders.StandardStorageProvider -} - -func (s *storageMachineDeployment) ListMachineDeployments(ctx request.Context, options *internalversion.ListOptions) (*MachineDeploymentList, error) { - if options != nil && options.FieldSelector != nil && !options.FieldSelector.Empty() { - return nil, fmt.Errorf("field selector not supported yet") - } - st := s.GetStandardStorage() - obj, err := st.List(ctx, options) - if err != nil { - return nil, err - } - return obj.(*MachineDeploymentList), err -} - -func (s *storageMachineDeployment) GetMachineDeployment(ctx request.Context, id string, options *metav1.GetOptions) (*MachineDeployment, error) { - st := s.GetStandardStorage() - obj, err := st.Get(ctx, id, options) - if err != nil { - return nil, err - } - return obj.(*MachineDeployment), nil -} - -func (s *storageMachineDeployment) CreateMachineDeployment(ctx request.Context, object *MachineDeployment) (*MachineDeployment, error) { - st := s.GetStandardStorage() - obj, err := st.Create(ctx, object, nil, true) - if err != nil { - return nil, err - } - return obj.(*MachineDeployment), nil -} - -func (s *storageMachineDeployment) UpdateMachineDeployment(ctx request.Context, object *MachineDeployment) (*MachineDeployment, error) { - st := s.GetStandardStorage() - obj, _, err := st.Update(ctx, object.Name, rest.DefaultUpdatedObjectInfo(object), nil, nil) - if err != nil { - return nil, err - } - return obj.(*MachineDeployment), nil -} - -func (s *storageMachineDeployment) DeleteMachineDeployment(ctx request.Context, id string) (bool, error) { - st := s.GetStandardStorage() - _, sync, err := st.Delete(ctx, id, nil) - return sync, err -} - -// -// MachineSet Functions and Structs -// -// +k8s:deepcopy-gen=false -type MachineSetStrategy struct { - builders.DefaultStorageStrategy -} - -// +k8s:deepcopy-gen=false -type MachineSetStatusStrategy struct { - builders.DefaultStatusStorageStrategy -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type MachineSetList struct { - metav1.TypeMeta - metav1.ListMeta - Items []MachineSet -} - -func (MachineSet) NewStatus() interface{} { - return MachineSetStatus{} -} - -func (pc *MachineSet) GetStatus() interface{} { - return pc.Status -} - -func (pc *MachineSet) SetStatus(s interface{}) { - pc.Status = s.(MachineSetStatus) -} - -func (pc *MachineSet) GetSpec() interface{} { - return pc.Spec -} - -func (pc *MachineSet) SetSpec(s interface{}) { - pc.Spec = s.(MachineSetSpec) -} - -func (pc *MachineSet) GetObjectMeta() *metav1.ObjectMeta { - return &pc.ObjectMeta -} - -func (pc *MachineSet) SetGeneration(generation int64) { - pc.ObjectMeta.Generation = generation -} - -func (pc MachineSet) GetGeneration() int64 { - return pc.ObjectMeta.Generation -} - -// Registry is an interface for things that know how to store MachineSet. -// +k8s:deepcopy-gen=false -type MachineSetRegistry interface { - ListMachineSets(ctx request.Context, options *internalversion.ListOptions) (*MachineSetList, error) - GetMachineSet(ctx request.Context, id string, options *metav1.GetOptions) (*MachineSet, error) - CreateMachineSet(ctx request.Context, id *MachineSet) (*MachineSet, error) - UpdateMachineSet(ctx request.Context, id *MachineSet) (*MachineSet, error) - DeleteMachineSet(ctx request.Context, id string) (bool, error) -} - -// NewRegistry returns a new Registry interface for the given Storage. Any mismatched types will panic. -func NewMachineSetRegistry(sp builders.StandardStorageProvider) MachineSetRegistry { - return &storageMachineSet{sp} -} - -// Implement Registry -// storage puts strong typing around storage calls -// +k8s:deepcopy-gen=false -type storageMachineSet struct { - builders.StandardStorageProvider -} - -func (s *storageMachineSet) ListMachineSets(ctx request.Context, options *internalversion.ListOptions) (*MachineSetList, error) { - if options != nil && options.FieldSelector != nil && !options.FieldSelector.Empty() { - return nil, fmt.Errorf("field selector not supported yet") - } - st := s.GetStandardStorage() - obj, err := st.List(ctx, options) - if err != nil { - return nil, err - } - return obj.(*MachineSetList), err -} - -func (s *storageMachineSet) GetMachineSet(ctx request.Context, id string, options *metav1.GetOptions) (*MachineSet, error) { - st := s.GetStandardStorage() - obj, err := st.Get(ctx, id, options) - if err != nil { - return nil, err - } - return obj.(*MachineSet), nil -} - -func (s *storageMachineSet) CreateMachineSet(ctx request.Context, object *MachineSet) (*MachineSet, error) { - st := s.GetStandardStorage() - obj, err := st.Create(ctx, object, nil, true) - if err != nil { - return nil, err - } - return obj.(*MachineSet), nil -} - -func (s *storageMachineSet) UpdateMachineSet(ctx request.Context, object *MachineSet) (*MachineSet, error) { - st := s.GetStandardStorage() - obj, _, err := st.Update(ctx, object.Name, rest.DefaultUpdatedObjectInfo(object), nil, nil) - if err != nil { - return nil, err - } - return obj.(*MachineSet), nil -} - -func (s *storageMachineSet) DeleteMachineSet(ctx request.Context, id string) (bool, error) { - st := s.GetStandardStorage() - _, sync, err := st.Delete(ctx, id, nil) - return sync, err -} diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.deepcopy.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.deepcopy.go deleted file mode 100644 index fae5daf9e..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.deepcopy.go +++ /dev/null @@ -1,759 +0,0 @@ -// +build !ignore_autogenerated - -/* -Copyright 2018 The Kubernetes Authors. - -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. -*/ - -// Code generated by deepcopy-gen. DO NOT EDIT. - -package cluster - -import ( - v1 "k8s.io/api/core/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - intstr "k8s.io/apimachinery/pkg/util/intstr" - common "sigs.k8s.io/cluster-api/pkg/apis/cluster/common" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *APIEndpoint) DeepCopyInto(out *APIEndpoint) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIEndpoint. -func (in *APIEndpoint) DeepCopy() *APIEndpoint { - if in == nil { - return nil - } - out := new(APIEndpoint) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Cluster) DeepCopyInto(out *Cluster) { - *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 Cluster. -func (in *Cluster) DeepCopy() *Cluster { - if in == nil { - return nil - } - out := new(Cluster) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Cluster) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterList) DeepCopyInto(out *ClusterList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Cluster, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterList. -func (in *ClusterList) DeepCopy() *ClusterList { - if in == nil { - return nil - } - out := new(ClusterList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ClusterList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterNetworkingConfig) DeepCopyInto(out *ClusterNetworkingConfig) { - *out = *in - in.Services.DeepCopyInto(&out.Services) - in.Pods.DeepCopyInto(&out.Pods) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterNetworkingConfig. -func (in *ClusterNetworkingConfig) DeepCopy() *ClusterNetworkingConfig { - if in == nil { - return nil - } - out := new(ClusterNetworkingConfig) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) { - *out = *in - in.ClusterNetwork.DeepCopyInto(&out.ClusterNetwork) - in.ProviderConfig.DeepCopyInto(&out.ProviderConfig) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSpec. -func (in *ClusterSpec) DeepCopy() *ClusterSpec { - if in == nil { - return nil - } - out := new(ClusterSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) { - *out = *in - if in.APIEndpoints != nil { - in, out := &in.APIEndpoints, &out.APIEndpoints - *out = make([]APIEndpoint, len(*in)) - copy(*out, *in) - } - if in.ProviderStatus != nil { - in, out := &in.ProviderStatus, &out.ProviderStatus - if *in == nil { - *out = nil - } else { - *out = new(runtime.RawExtension) - (*in).DeepCopyInto(*out) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterStatus. -func (in *ClusterStatus) DeepCopy() *ClusterStatus { - if in == nil { - return nil - } - out := new(ClusterStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Machine) DeepCopyInto(out *Machine) { - *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 Machine. -func (in *Machine) DeepCopy() *Machine { - if in == nil { - return nil - } - out := new(Machine) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Machine) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineDeployment) DeepCopyInto(out *MachineDeployment) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineDeployment. -func (in *MachineDeployment) DeepCopy() *MachineDeployment { - if in == nil { - return nil - } - out := new(MachineDeployment) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *MachineDeployment) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineDeploymentList) DeepCopyInto(out *MachineDeploymentList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]MachineDeployment, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineDeploymentList. -func (in *MachineDeploymentList) DeepCopy() *MachineDeploymentList { - if in == nil { - return nil - } - out := new(MachineDeploymentList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *MachineDeploymentList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineDeploymentSpec) DeepCopyInto(out *MachineDeploymentSpec) { - *out = *in - if in.Replicas != nil { - in, out := &in.Replicas, &out.Replicas - if *in == nil { - *out = nil - } else { - *out = new(int32) - **out = **in - } - } - in.Selector.DeepCopyInto(&out.Selector) - in.Template.DeepCopyInto(&out.Template) - in.Strategy.DeepCopyInto(&out.Strategy) - if in.MinReadySeconds != nil { - in, out := &in.MinReadySeconds, &out.MinReadySeconds - if *in == nil { - *out = nil - } else { - *out = new(int32) - **out = **in - } - } - if in.RevisionHistoryLimit != nil { - in, out := &in.RevisionHistoryLimit, &out.RevisionHistoryLimit - if *in == nil { - *out = nil - } else { - *out = new(int32) - **out = **in - } - } - if in.ProgressDeadlineSeconds != nil { - in, out := &in.ProgressDeadlineSeconds, &out.ProgressDeadlineSeconds - if *in == nil { - *out = nil - } else { - *out = new(int32) - **out = **in - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineDeploymentSpec. -func (in *MachineDeploymentSpec) DeepCopy() *MachineDeploymentSpec { - if in == nil { - return nil - } - out := new(MachineDeploymentSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineDeploymentStatus) DeepCopyInto(out *MachineDeploymentStatus) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineDeploymentStatus. -func (in *MachineDeploymentStatus) DeepCopy() *MachineDeploymentStatus { - if in == nil { - return nil - } - out := new(MachineDeploymentStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineDeploymentStrategy) DeepCopyInto(out *MachineDeploymentStrategy) { - *out = *in - if in.RollingUpdate != nil { - in, out := &in.RollingUpdate, &out.RollingUpdate - if *in == nil { - *out = nil - } else { - *out = new(MachineRollingUpdateDeployment) - (*in).DeepCopyInto(*out) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineDeploymentStrategy. -func (in *MachineDeploymentStrategy) DeepCopy() *MachineDeploymentStrategy { - if in == nil { - return nil - } - out := new(MachineDeploymentStrategy) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineList) DeepCopyInto(out *MachineList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Machine, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineList. -func (in *MachineList) DeepCopy() *MachineList { - if in == nil { - return nil - } - out := new(MachineList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *MachineList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineRollingUpdateDeployment) DeepCopyInto(out *MachineRollingUpdateDeployment) { - *out = *in - if in.MaxUnavailable != nil { - in, out := &in.MaxUnavailable, &out.MaxUnavailable - if *in == nil { - *out = nil - } else { - *out = new(intstr.IntOrString) - **out = **in - } - } - if in.MaxSurge != nil { - in, out := &in.MaxSurge, &out.MaxSurge - if *in == nil { - *out = nil - } else { - *out = new(intstr.IntOrString) - **out = **in - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineRollingUpdateDeployment. -func (in *MachineRollingUpdateDeployment) DeepCopy() *MachineRollingUpdateDeployment { - if in == nil { - return nil - } - out := new(MachineRollingUpdateDeployment) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineSet) DeepCopyInto(out *MachineSet) { - *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 MachineSet. -func (in *MachineSet) DeepCopy() *MachineSet { - if in == nil { - return nil - } - out := new(MachineSet) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *MachineSet) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineSetList) DeepCopyInto(out *MachineSetList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]MachineSet, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineSetList. -func (in *MachineSetList) DeepCopy() *MachineSetList { - if in == nil { - return nil - } - out := new(MachineSetList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *MachineSetList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineSetSpec) DeepCopyInto(out *MachineSetSpec) { - *out = *in - if in.Replicas != nil { - in, out := &in.Replicas, &out.Replicas - if *in == nil { - *out = nil - } else { - *out = new(int32) - **out = **in - } - } - in.Selector.DeepCopyInto(&out.Selector) - in.Template.DeepCopyInto(&out.Template) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineSetSpec. -func (in *MachineSetSpec) DeepCopy() *MachineSetSpec { - if in == nil { - return nil - } - out := new(MachineSetSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineSetStatus) DeepCopyInto(out *MachineSetStatus) { - *out = *in - if in.ErrorReason != nil { - in, out := &in.ErrorReason, &out.ErrorReason - if *in == nil { - *out = nil - } else { - *out = new(common.MachineSetStatusError) - **out = **in - } - } - if in.ErrorMessage != nil { - in, out := &in.ErrorMessage, &out.ErrorMessage - if *in == nil { - *out = nil - } else { - *out = new(string) - **out = **in - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineSetStatus. -func (in *MachineSetStatus) DeepCopy() *MachineSetStatus { - if in == nil { - return nil - } - out := new(MachineSetStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineSpec) DeepCopyInto(out *MachineSpec) { - *out = *in - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - if in.Taints != nil { - in, out := &in.Taints, &out.Taints - *out = make([]v1.Taint, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - in.ProviderConfig.DeepCopyInto(&out.ProviderConfig) - out.Versions = in.Versions - if in.ConfigSource != nil { - in, out := &in.ConfigSource, &out.ConfigSource - if *in == nil { - *out = nil - } else { - *out = new(v1.NodeConfigSource) - (*in).DeepCopyInto(*out) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineSpec. -func (in *MachineSpec) DeepCopy() *MachineSpec { - if in == nil { - return nil - } - out := new(MachineSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineStatus) DeepCopyInto(out *MachineStatus) { - *out = *in - if in.NodeRef != nil { - in, out := &in.NodeRef, &out.NodeRef - if *in == nil { - *out = nil - } else { - *out = new(v1.ObjectReference) - **out = **in - } - } - in.LastUpdated.DeepCopyInto(&out.LastUpdated) - if in.Versions != nil { - in, out := &in.Versions, &out.Versions - if *in == nil { - *out = nil - } else { - *out = new(MachineVersionInfo) - **out = **in - } - } - if in.ErrorReason != nil { - in, out := &in.ErrorReason, &out.ErrorReason - if *in == nil { - *out = nil - } else { - *out = new(common.MachineStatusError) - **out = **in - } - } - if in.ErrorMessage != nil { - in, out := &in.ErrorMessage, &out.ErrorMessage - if *in == nil { - *out = nil - } else { - *out = new(string) - **out = **in - } - } - if in.ProviderStatus != nil { - in, out := &in.ProviderStatus, &out.ProviderStatus - if *in == nil { - *out = nil - } else { - *out = new(runtime.RawExtension) - (*in).DeepCopyInto(*out) - } - } - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]v1.NodeAddress, len(*in)) - copy(*out, *in) - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]v1.NodeCondition, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineStatus. -func (in *MachineStatus) DeepCopy() *MachineStatus { - if in == nil { - return nil - } - out := new(MachineStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineTemplateSpec) DeepCopyInto(out *MachineTemplateSpec) { - *out = *in - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineTemplateSpec. -func (in *MachineTemplateSpec) DeepCopy() *MachineTemplateSpec { - if in == nil { - return nil - } - out := new(MachineTemplateSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineVersionInfo) DeepCopyInto(out *MachineVersionInfo) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineVersionInfo. -func (in *MachineVersionInfo) DeepCopy() *MachineVersionInfo { - if in == nil { - return nil - } - out := new(MachineVersionInfo) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *NetworkRanges) DeepCopyInto(out *NetworkRanges) { - *out = *in - if in.CIDRBlocks != nil { - in, out := &in.CIDRBlocks, &out.CIDRBlocks - *out = make([]string, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NetworkRanges. -func (in *NetworkRanges) DeepCopy() *NetworkRanges { - if in == nil { - return nil - } - out := new(NetworkRanges) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ProviderConfig) DeepCopyInto(out *ProviderConfig) { - *out = *in - if in.Value != nil { - in, out := &in.Value, &out.Value - if *in == nil { - *out = nil - } else { - *out = new(runtime.RawExtension) - (*in).DeepCopyInto(*out) - } - } - if in.ValueFrom != nil { - in, out := &in.ValueFrom, &out.ValueFrom - if *in == nil { - *out = nil - } else { - *out = new(ProviderConfigSource) - **out = **in - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProviderConfig. -func (in *ProviderConfig) DeepCopy() *ProviderConfig { - if in == nil { - return nil - } - out := new(ProviderConfig) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ProviderConfigSource) DeepCopyInto(out *ProviderConfigSource) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProviderConfigSource. -func (in *ProviderConfigSource) DeepCopy() *ProviderConfigSource { - if in == nil { - return nil - } - out := new(ProviderConfigSource) - in.DeepCopyInto(out) - return out -} diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.defaults.go b/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.defaults.go deleted file mode 100644 index a557ec1ae..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/zz_generated.defaults.go +++ /dev/null @@ -1,32 +0,0 @@ -// +build !ignore_autogenerated - -/* -Copyright 2018 The Kubernetes Authors. - -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. -*/ - -// This file was autogenerated by defaulter-gen. Do not edit it manually! - -package cluster - -import ( - runtime "k8s.io/apimachinery/pkg/runtime" -) - -// RegisterDefaults adds defaulters functions to the given scheme. -// Public to allow building arbitrary schemes. -// All generated defaulters are covering - they call all nested defaulters. -func RegisterDefaults(scheme *runtime.Scheme) error { - return nil -} diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/BUILD.bazel deleted file mode 100644 index f9ad57694..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/BUILD.bazel +++ /dev/null @@ -1,18 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "clientset.go", - "doc.go", - ], - importpath = "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset", - visibility = ["//visibility:public"], - deps = [ - "//pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1:go_default_library", - "//vendor/github.com/golang/glog:go_default_library", - "//vendor/k8s.io/client-go/discovery:go_default_library", - "//vendor/k8s.io/client-go/rest:go_default_library", - "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", - ], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/scheme/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/scheme/BUILD.bazel deleted file mode 100644 index f506fee05..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/scheme/BUILD.bazel +++ /dev/null @@ -1,18 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "register.go", - ], - importpath = "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/scheme", - visibility = ["//visibility:public"], - deps = [ - "//pkg/apis/cluster/v1alpha1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - ], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1/BUILD.bazel deleted file mode 100644 index a1cdadc75..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1/BUILD.bazel +++ /dev/null @@ -1,25 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "cluster.go", - "cluster_client.go", - "doc.go", - "generated_expansion.go", - "machine.go", - "machinedeployment.go", - "machineset.go", - ], - importpath = "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1", - visibility = ["//visibility:public"], - deps = [ - "//pkg/apis/cluster/v1alpha1:go_default_library", - "//pkg/client/clientset_generated/clientset/scheme:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", - "//vendor/k8s.io/client-go/rest:go_default_library", - ], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/BUILD.bazel deleted file mode 100644 index 039490a15..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/BUILD.bazel +++ /dev/null @@ -1,21 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "factory.go", - "generic.go", - ], - importpath = "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions", - visibility = ["//visibility:public"], - deps = [ - "//pkg/apis/cluster/v1alpha1:go_default_library", - "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/informers_generated/externalversions/cluster:go_default_library", - "//pkg/client/informers_generated/externalversions/internalinterfaces:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//vendor/k8s.io/client-go/tools/cache:go_default_library", - ], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/BUILD.bazel deleted file mode 100644 index b8cbc69a9..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/BUILD.bazel +++ /dev/null @@ -1,12 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["interface.go"], - importpath = "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster", - visibility = ["//visibility:public"], - deps = [ - "//pkg/client/informers_generated/externalversions/cluster/v1alpha1:go_default_library", - "//pkg/client/informers_generated/externalversions/internalinterfaces:go_default_library", - ], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/v1alpha1/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/v1alpha1/BUILD.bazel deleted file mode 100644 index bb4ec9b86..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/v1alpha1/BUILD.bazel +++ /dev/null @@ -1,24 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "cluster.go", - "interface.go", - "machine.go", - "machinedeployment.go", - "machineset.go", - ], - importpath = "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/v1alpha1", - visibility = ["//visibility:public"], - deps = [ - "//pkg/apis/cluster/v1alpha1:go_default_library", - "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/informers_generated/externalversions/internalinterfaces:go_default_library", - "//pkg/client/listers_generated/cluster/v1alpha1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", - "//vendor/k8s.io/client-go/tools/cache:go_default_library", - ], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/internalinterfaces/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/internalinterfaces/BUILD.bazel deleted file mode 100644 index d6a8332c9..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/internalinterfaces/BUILD.bazel +++ /dev/null @@ -1,14 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["factory_interfaces.go"], - importpath = "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/internalinterfaces", - visibility = ["//visibility:public"], - deps = [ - "//pkg/client/clientset_generated/clientset:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//vendor/k8s.io/client-go/tools/cache:go_default_library", - ], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/client/listers_generated/cluster/v1alpha1/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/client/listers_generated/cluster/v1alpha1/BUILD.bazel deleted file mode 100644 index 549ed0e12..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/client/listers_generated/cluster/v1alpha1/BUILD.bazel +++ /dev/null @@ -1,20 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "cluster.go", - "expansion_generated.go", - "machine.go", - "machinedeployment.go", - "machineset.go", - ], - importpath = "sigs.k8s.io/cluster-api/pkg/client/listers_generated/cluster/v1alpha1", - visibility = ["//visibility:public"], - deps = [ - "//pkg/apis/cluster/v1alpha1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/tools/cache:go_default_library", - ], -) diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/controller/config/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/controller/config/BUILD.bazel deleted file mode 100644 index 67471d9dc..000000000 --- a/vendor/sigs.k8s.io/cluster-api/pkg/controller/config/BUILD.bazel +++ /dev/null @@ -1,13 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["configuration.go"], - importpath = "sigs.k8s.io/cluster-api/pkg/controller/config", - visibility = ["//visibility:public"], - deps = [ - "//vendor/github.com/spf13/pflag:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/client-go/tools/leaderelection/resourcelock:go_default_library", - ], -) diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_apache_2.go b/vendor/sigs.k8s.io/controller-runtime/LICENSE similarity index 88% rename from vendor/github.com/spf13/cobra/cobra/cmd/license_apache_2.go rename to vendor/sigs.k8s.io/controller-runtime/LICENSE index 38393d541..8dada3eda 100644 --- a/vendor/github.com/spf13/cobra/cobra/cmd/license_apache_2.go +++ b/vendor/sigs.k8s.io/controller-runtime/LICENSE @@ -1,37 +1,3 @@ -// Copyright © 2015 Steve Francia . -// -// 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. - -// Parts inspired by https://github.com/ryanuber/go-license - -package cmd - -func initApache2() { - Licenses["apache"] = License{ - Name: "Apache 2.0", - PossibleMatches: []string{"apache", "apache20", "apache 2.0", "apache2.0", "apache-2.0"}, - Header: ` -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.`, - Text: ` Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -212,7 +178,7 @@ limitations under the License.`, 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 "[]" + 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 @@ -220,7 +186,7 @@ limitations under the License.`, same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + 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. @@ -233,6 +199,3 @@ limitations under the License.`, 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/sigs.k8s.io/controller-runtime/pkg/runtime/scheme/scheme.go b/vendor/sigs.k8s.io/controller-runtime/pkg/runtime/scheme/scheme.go new file mode 100644 index 000000000..79868214e --- /dev/null +++ b/vendor/sigs.k8s.io/controller-runtime/pkg/runtime/scheme/scheme.go @@ -0,0 +1,56 @@ +/* +Copyright 2018 The Kubernetes Authors. + +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. +*/ + +package scheme + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" +) + +// Builder builds a new Scheme for mapping go types to Kubernetes GroupVersionKinds. +type Builder struct { + GroupVersion schema.GroupVersion + runtime.SchemeBuilder +} + +// Register adds one or objects to the SchemeBuilder so they can be added to a Scheme. Register mutates bld. +func (bld *Builder) Register(object ...runtime.Object) *Builder { + bld.SchemeBuilder.Register(func(scheme *runtime.Scheme) error { + scheme.AddKnownTypes(bld.GroupVersion, object...) + metav1.AddToGroupVersion(scheme, bld.GroupVersion) + return nil + }) + return bld +} + +// RegisterAll registers all types from the Builder argument. RegisterAll mutates bld. +func (bld *Builder) RegisterAll(b *Builder) *Builder { + bld.SchemeBuilder = append(bld.SchemeBuilder, b.SchemeBuilder...) + return bld +} + +// AddToScheme adds all registered types to s. +func (bld *Builder) AddToScheme(s *runtime.Scheme) error { + return bld.SchemeBuilder.AddToScheme(s) +} + +// Build returns a new Scheme containing the registered types. +func (bld *Builder) Build() (*runtime.Scheme, error) { + s := runtime.NewScheme() + return s, bld.AddToScheme(s) +} From 85649dbfa432cd73072378686e2c0f76c6648a11 Mon Sep 17 00:00:00 2001 From: Enxebre Date: Fri, 19 Oct 2018 00:15:14 +0200 Subject: [PATCH 2/8] update owned manifests for CRDs --- owned-manifests/cluster.crd.yaml | 92 ++++++++++++++ .../clusterapi-apiserver-role-binding.yaml | 14 -- owned-manifests/clusterapi-apiserver-svc.yaml | 16 --- owned-manifests/clusterapi-apiserver.yaml | 114 ----------------- owned-manifests/clusterapi-apiservice.yaml | 17 --- ...erapi-controller-cluster-role-binding.yaml | 14 -- .../clusterapi-controller-cluster-role.yaml | 28 ---- ...sterapi-manager-cluster-role-binding.yaml} | 7 +- .../clusterapi-manager-cluster-role.yaml | 90 +++++++++++++ ...ml => clusterapi-manager-controllers.yaml} | 6 +- owned-manifests/machine.crd.yaml | 91 +++++++++++++ owned-manifests/machinedeployment.crd.yaml | 120 ++++++++++++++++++ owned-manifests/machineset.crd.yaml | 102 +++++++++++++++ 13 files changed, 501 insertions(+), 210 deletions(-) create mode 100644 owned-manifests/cluster.crd.yaml delete mode 100644 owned-manifests/clusterapi-apiserver-role-binding.yaml delete mode 100644 owned-manifests/clusterapi-apiserver-svc.yaml delete mode 100644 owned-manifests/clusterapi-apiserver.yaml delete mode 100644 owned-manifests/clusterapi-apiservice.yaml delete mode 100644 owned-manifests/clusterapi-controller-cluster-role-binding.yaml delete mode 100644 owned-manifests/clusterapi-controller-cluster-role.yaml rename owned-manifests/{clusterapi-apiserver-cluster-role-binding.yaml => clusterapi-manager-cluster-role-binding.yaml} (64%) create mode 100644 owned-manifests/clusterapi-manager-cluster-role.yaml rename owned-manifests/{clusterapi-controller.yaml => clusterapi-manager-controllers.yaml} (95%) create mode 100644 owned-manifests/machine.crd.yaml create mode 100644 owned-manifests/machinedeployment.crd.yaml create mode 100644 owned-manifests/machineset.crd.yaml diff --git a/owned-manifests/cluster.crd.yaml b/owned-manifests/cluster.crd.yaml new file mode 100644 index 000000000..e55763902 --- /dev/null +++ b/owned-manifests/cluster.crd.yaml @@ -0,0 +1,92 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + labels: + controller-tools.k8s.io: "1.0" + name: clusters.cluster.k8s.io +spec: + group: cluster.k8s.io + names: + kind: Cluster + plural: clusters + scope: Namespaced + subresources: + status: {} + validation: + openAPIV3Schema: + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + properties: + clusterNetwork: + properties: + pods: + properties: + cidrBlocks: + items: + type: string + type: array + required: + - cidrBlocks + type: object + serviceDomain: + type: string + services: + properties: + cidrBlocks: + items: + type: string + type: array + required: + - cidrBlocks + type: object + required: + - services + - pods + - serviceDomain + type: object + providerConfig: + properties: + value: + type: object + valueFrom: + type: object + type: object + required: + - clusterNetwork + type: object + status: + properties: + apiEndpoints: + items: + properties: + host: + type: string + port: + format: int64 + type: integer + required: + - host + - port + type: object + type: array + errorMessage: + type: string + errorReason: + type: string + providerStatus: + type: object + type: object + version: v1alpha1 +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] \ No newline at end of file diff --git a/owned-manifests/clusterapi-apiserver-role-binding.yaml b/owned-manifests/clusterapi-apiserver-role-binding.yaml deleted file mode 100644 index 45c6bb536..000000000 --- a/owned-manifests/clusterapi-apiserver-role-binding.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: clusterapi - namespace: kube-system -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: extension-apiserver-authentication-reader -subjects: -- kind: ServiceAccount - name: default - namespace: {{ .TargetNamespace }} -# TODO: create specifics service accounts diff --git a/owned-manifests/clusterapi-apiserver-svc.yaml b/owned-manifests/clusterapi-apiserver-svc.yaml deleted file mode 100644 index e1bb3a7aa..000000000 --- a/owned-manifests/clusterapi-apiserver-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: clusterapi - namespace: {{ .TargetNamespace }} - labels: - api: clusterapi - apiserver: "true" -spec: - ports: - - port: 443 - protocol: TCP - targetPort: 6443 - selector: - api: clusterapi - apiserver: "true" diff --git a/owned-manifests/clusterapi-apiserver.yaml b/owned-manifests/clusterapi-apiserver.yaml deleted file mode 100644 index 2b04bbcdc..000000000 --- a/owned-manifests/clusterapi-apiserver.yaml +++ /dev/null @@ -1,114 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: clusterapi-apiserver - namespace: {{ .TargetNamespace }} - labels: - api: clusterapi - tectonic-operators.coreos.com/managed-by: machine-api-operator - apiserver: "true" -spec: - selector: - matchLabels: - api: clusterapi - apiserver: "true" - replicas: 1 - template: - metadata: - labels: - api: clusterapi - apiserver: "true" - spec: - nodeSelector: - node-role.kubernetes.io/master: "" - tolerations: - - effect: NoSchedule - key: node-role.kubernetes.io/master - - key: CriticalAddonsOnly - operator: Exists - - effect: NoExecute - key: node.alpha.kubernetes.io/notReady - operator: Exists - - effect: NoExecute - key: node.alpha.kubernetes.io/unreachable - operator: Exists - containers: - - name: apiserver - image: {{ .Images.ClusterAPIServer }} - volumeMounts: - - name: cluster-apiserver-certs - mountPath: /apiserver.local.config/certificates - readOnly: true - command: - - "./apiserver" - args: - - "--etcd-servers=http://localhost:2379" - - "--tls-cert-file=/apiserver.local.config/certificates/tls.crt" - - "--tls-private-key-file=/apiserver.local.config/certificates/tls.key" - - "--audit-log-path=-" - - "--audit-log-maxage=0" - - "--audit-log-maxbackup=0" - - "--secure-port=6443" - ports: - - containerPort: 6443 - protocol: TCP - resources: - requests: - cpu: 100m - memory: 50Mi - limits: - cpu: 300m - memory: 200Mi - - name: etcd - image: {{ .Images.Etcd }} - imagePullPolicy: Always - resources: - requests: - cpu: 100m - memory: 20Mi - limits: - cpu: 100m - memory: 30Mi - env: - - name: ETCD_DATA_DIR - value: /etcd-data-dir - command: - - /usr/local/bin/etcd - - --listen-client-urls - - http://0.0.0.0:2379 - - --advertise-client-urls - - http://localhost:2379 - ports: - - containerPort: 2379 - volumeMounts: - - name: etcd-data-dir - mountPath: /etcd-data-dir - readinessProbe: - httpGet: - port: 2379 - path: /health - failureThreshold: 1 - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 2 - livenessProbe: - httpGet: - port: 2379 - path: /health - failureThreshold: 3 - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 2 - dnsPolicy: ClusterFirst - restartPolicy: Always - securityContext: {} - terminationGracePeriodSeconds: 30 - volumes: - - name: etcd-data-dir - emptyDir: {} - - name: cluster-apiserver-certs - secret: - secretName: cluster-apiserver-certs -# TODO: add readiness and liveness probe diff --git a/owned-manifests/clusterapi-apiservice.yaml b/owned-manifests/clusterapi-apiservice.yaml deleted file mode 100644 index b3c98d9bb..000000000 --- a/owned-manifests/clusterapi-apiservice.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: apiregistration.k8s.io/v1beta1 -kind: APIService -metadata: - name: v1alpha1.cluster.k8s.io - labels: - api: clusterapi - apiserver: "true" -spec: - version: v1alpha1 - group: cluster.k8s.io - groupPriorityMinimum: 2000 - versionPriority: 200 - service: - name: clusterapi - namespace: {{ .TargetNamespace }} - versionPriority: 10 - caBundle: {{ .EncodedAPIServiceCA }} diff --git a/owned-manifests/clusterapi-controller-cluster-role-binding.yaml b/owned-manifests/clusterapi-controller-cluster-role-binding.yaml deleted file mode 100644 index fee883519..000000000 --- a/owned-manifests/clusterapi-controller-cluster-role-binding.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: "clusterapi:controller-manager" -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: "clusterapi:controller-manager" -subjects: -- apiGroup: "" - kind: ServiceAccount - name: default - namespace: {{ .TargetNamespace }} -# TODO: create specific service account diff --git a/owned-manifests/clusterapi-controller-cluster-role.yaml b/owned-manifests/clusterapi-controller-cluster-role.yaml deleted file mode 100644 index 5b59f5973..000000000 --- a/owned-manifests/clusterapi-controller-cluster-role.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: "clusterapi:controller-manager" -rules: -# configmaps for leader election -- apiGroups: [""] - resources: ["configmaps"] - verbs: ["create"] -- apiGroups: [""] - resources: ["configmaps"] - resourceNames: ["cluster-operator-controller-manager"] - verbs: ["get", "update"] -# events for recording events -- apiGroups: [""] - resources: ["events"] - verbs: ["create", "patch", "update"] -# allow all operations on all resources in our API group -- apiGroups: ["cluster.k8s.io"] - resources: ["*"] - verbs: ["create", "get", "list", "watch", "update", "patch", "delete"] -# allow operations on required resources in any namespace a cluster is created -- apiGroups: [""] - resources: ["configmaps", "pods", "secrets", "nodes"] - verbs: ["*"] -- apiGroups: ["batch"] - resources: ["jobs"] - verbs: ["*"] diff --git a/owned-manifests/clusterapi-apiserver-cluster-role-binding.yaml b/owned-manifests/clusterapi-manager-cluster-role-binding.yaml similarity index 64% rename from owned-manifests/clusterapi-apiserver-cluster-role-binding.yaml rename to owned-manifests/clusterapi-manager-cluster-role-binding.yaml index d9f7df97e..def4603e1 100644 --- a/owned-manifests/clusterapi-apiserver-cluster-role-binding.yaml +++ b/owned-manifests/clusterapi-manager-cluster-role-binding.yaml @@ -1,13 +1,12 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: "clusterapi:apiserver-auth-delegator" + name: cluster-api-manager-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: system:auth-delegator + name: cluster-api-manager-role subjects: -- apiGroup: "" - kind: ServiceAccount +- kind: ServiceAccount name: default namespace: {{ .TargetNamespace }} diff --git a/owned-manifests/clusterapi-manager-cluster-role.yaml b/owned-manifests/clusterapi-manager-cluster-role.yaml new file mode 100644 index 000000000..49cc1bac0 --- /dev/null +++ b/owned-manifests/clusterapi-manager-cluster-role.yaml @@ -0,0 +1,90 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + creationTimestamp: null + name: cluster-api-manager-role +rules: +- apiGroups: + - cluster.k8s.io + resources: + - clusters + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - cluster.k8s.io + resources: + - machines + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - cluster.k8s.io + resources: + - machinedeployments + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - cluster.k8s.io + resources: + - machinesets + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - cluster.k8s.io + resources: + - machines + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - "" + resources: + - nodes + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - cluster.k8s.io + resources: + - machines + verbs: + - get + - list + - watch + - create + - update + - patch + - delete \ No newline at end of file diff --git a/owned-manifests/clusterapi-controller.yaml b/owned-manifests/clusterapi-manager-controllers.yaml similarity index 95% rename from owned-manifests/clusterapi-controller.yaml rename to owned-manifests/clusterapi-manager-controllers.yaml index 9838843f4..42b3c6d7a 100644 --- a/owned-manifests/clusterapi-controller.yaml +++ b/owned-manifests/clusterapi-manager-controllers.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: clusterapi-controllers + name: clusterapi-manager-controllers namespace: {{ .TargetNamespace }} labels: api: clusterapi @@ -45,7 +45,7 @@ spec: image: {{ .Images.ClusterAPIControllerManagerLibvirt }} {{- end}} command: - - "./controller-manager" + - "./manager" resources: requests: cpu: 100m @@ -69,7 +69,7 @@ spec: fieldRef: fieldPath: spec.nodeName command: - - /machine-controller + - /machine-controller-manager args: - --log-level=debug resources: diff --git a/owned-manifests/machine.crd.yaml b/owned-manifests/machine.crd.yaml new file mode 100644 index 000000000..b57ea0899 --- /dev/null +++ b/owned-manifests/machine.crd.yaml @@ -0,0 +1,91 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + labels: + controller-tools.k8s.io: "1.0" + name: machines.cluster.k8s.io +spec: + group: cluster.k8s.io + names: + kind: Machine + plural: machines + scope: Namespaced + subresources: + status: {} + validation: + openAPIV3Schema: + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + properties: + configSource: + type: object + metadata: + type: object + providerConfig: + properties: + value: + type: object + valueFrom: + type: object + type: object + taints: + items: + type: object + type: array + versions: + properties: + controlPlane: + type: string + kubelet: + type: string + required: + - kubelet + type: object + required: + - providerConfig + type: object + status: + properties: + addresses: + items: + type: object + type: array + conditions: + items: + type: object + type: array + errorMessage: + type: string + errorReason: + type: string + lastUpdated: + format: date-time + type: string + nodeRef: + type: object + providerStatus: + type: object + versions: + properties: + controlPlane: + type: string + kubelet: + type: string + required: + - kubelet + type: object + type: object + version: v1alpha1 +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] \ No newline at end of file diff --git a/owned-manifests/machinedeployment.crd.yaml b/owned-manifests/machinedeployment.crd.yaml new file mode 100644 index 000000000..79c0c0670 --- /dev/null +++ b/owned-manifests/machinedeployment.crd.yaml @@ -0,0 +1,120 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + labels: + controller-tools.k8s.io: "1.0" + name: machinedeployments.cluster.k8s.io +spec: + group: cluster.k8s.io + names: + kind: MachineDeployment + plural: machinedeployments + scope: Namespaced + subresources: + status: {} + validation: + openAPIV3Schema: + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + properties: + minReadySeconds: + format: int32 + type: integer + paused: + type: boolean + progressDeadlineSeconds: + format: int32 + type: integer + replicas: + format: int32 + type: integer + revisionHistoryLimit: + format: int32 + type: integer + selector: + type: object + strategy: + properties: + rollingUpdate: + properties: + maxSurge: + type: object + maxUnavailable: + type: object + type: object + type: + type: string + type: object + template: + properties: + metadata: + type: object + spec: + properties: + configSource: + type: object + metadata: + type: object + providerConfig: + properties: + value: + type: object + valueFrom: + type: object + type: object + taints: + items: + type: object + type: array + versions: + properties: + controlPlane: + type: string + kubelet: + type: string + required: + - kubelet + type: object + required: + - providerConfig + type: object + type: object + required: + - selector + - template + type: object + status: + properties: + availableReplicas: + format: int32 + type: integer + observedGeneration: + format: int64 + type: integer + readyReplicas: + format: int32 + type: integer + replicas: + format: int32 + type: integer + unavailableReplicas: + format: int32 + type: integer + updatedReplicas: + format: int32 + type: integer + type: object + version: v1alpha1 +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] \ No newline at end of file diff --git a/owned-manifests/machineset.crd.yaml b/owned-manifests/machineset.crd.yaml new file mode 100644 index 000000000..d406af7f0 --- /dev/null +++ b/owned-manifests/machineset.crd.yaml @@ -0,0 +1,102 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + labels: + controller-tools.k8s.io: "1.0" + name: machinesets.cluster.k8s.io +spec: + group: cluster.k8s.io + names: + kind: MachineSet + plural: machinesets + scope: Namespaced + subresources: + status: {} + validation: + openAPIV3Schema: + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + properties: + minReadySeconds: + format: int32 + type: integer + replicas: + format: int32 + type: integer + selector: + type: object + template: + properties: + metadata: + type: object + spec: + properties: + configSource: + type: object + metadata: + type: object + providerConfig: + properties: + value: + type: object + valueFrom: + type: object + type: object + taints: + items: + type: object + type: array + versions: + properties: + controlPlane: + type: string + kubelet: + type: string + required: + - kubelet + type: object + required: + - providerConfig + type: object + type: object + required: + - selector + type: object + status: + properties: + availableReplicas: + format: int32 + type: integer + errorMessage: + type: string + errorReason: + type: string + fullyLabeledReplicas: + format: int32 + type: integer + observedGeneration: + format: int64 + type: integer + readyReplicas: + format: int32 + type: integer + replicas: + format: int32 + type: integer + required: + - replicas + type: object + version: v1alpha1 +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] \ No newline at end of file From 3ae75a8664ece90b465fd48379f497565fecdcdc Mon Sep 17 00:00:00 2001 From: Enxebre Date: Fri, 19 Oct 2018 00:15:32 +0200 Subject: [PATCH 3/8] drop api server in favour of CRDs in sync loops --- pkg/operator/operator.go | 12 ++--- pkg/operator/sync.go | 111 +++++++++------------------------------ 2 files changed, 30 insertions(+), 93 deletions(-) diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index 1c594b91d..88fd09fb2 100644 --- a/pkg/operator/operator.go +++ b/pkg/operator/operator.go @@ -267,10 +267,6 @@ func (optr *Operator) sync(key string) error { glog.V(4).Infof("Finished syncing operator %q (%v)", key, time.Since(startTime)) }() - if err := optr.syncCustomResourceDefinitions(); err != nil { - return err - } - // TODO(alberto) operatorConfig as CRD? glog.Infof("Getting operator config using kubeclient") operatorConfig, err := optr.getOperatorConfig() @@ -284,12 +280,12 @@ func (optr *Operator) sync(key string) error { return err } - err = optr.syncClusterAPIServer(*operatorConfig) - if err != nil { - glog.Fatalf("Failed sync-up cluster apiserver: %v", err) + if err := optr.syncCustomResourceDefinitions(*operatorConfig); err != nil { + glog.Fatalf("Failed sync-up custom resources definitions: %v", err) return err } - glog.Info("Synched up cluster api server") + + glog.Info("Synched up cluster api CRDs") err = optr.syncClusterAPIController(*operatorConfig) if err != nil { glog.Fatalf("Failed sync-up cluster api controller: %v", err) diff --git a/pkg/operator/sync.go b/pkg/operator/sync.go index 178f46f50..ed44200e4 100644 --- a/pkg/operator/sync.go +++ b/pkg/operator/sync.go @@ -24,8 +24,6 @@ func (optr *Operator) syncAll(rconfig render.OperatorConfig) error { // syncFuncs is the list of sync functions that are executed in order. // any error marks sync as failure but continues to next syncFunc syncFuncs := []syncFunc{ - // TODO(alberto): implement this once https://github.com/kubernetes-sigs/cluster-api/pull/488/files gets in - //optr.syncMachineClasses, optr.syncCluster, } glog.Infof("Syncing operatorstatus") @@ -56,31 +54,30 @@ func (optr *Operator) syncAll(rconfig render.OperatorConfig) error { }) } -func (optr *Operator) syncCustomResourceDefinitions() error { - // TODO(alberto): implement this once https://github.com/kubernetes-sigs/cluster-api/pull/494 gets in - //crds := []string{ - // "manifests/machine.crd.yaml", - // "manifests/machineSet.crd.yaml", - // "manifests/cluster.crd.yaml", - //} - // - //for _, crd := range crds { - // crdBytes, err := assets.Asset(crd) - // if err != nil { - // return fmt.Errorf("error getting asset %s: %v", crd, err) - // } - // c := resourceread.ReadCustomResourceDefinitionV1Beta1OrDie(crdBytes) - // _, updated, err := resourceapply.ApplyCustomResourceDefinition(optr.apiExtClient.ApiextensionsV1beta1(), c) - // if err != nil { - // return err - // } - // if updated { - // if err := optr.waitForCustomResourceDefinition(c); err != nil { - // return err - // } - // } - //} +func (optr *Operator) syncCustomResourceDefinitions(config render.OperatorConfig) error { + crds := []string{ + "/machine.crd.yaml", + "/machineset.crd.yaml", + "/machinedeployment.crd.yaml", + "/cluster.crd.yaml", + } + for _, crd := range crds { + crdBytes, err := render.PopulateTemplate(&config, ownedManifestsDir+crd) + if err != nil { + return fmt.Errorf("error getting asset %s: %v", crd, err) + } + c := resourceread.ReadCustomResourceDefinitionV1Beta1OrDie(crdBytes) + _, updated, err := resourceapply.ApplyCustomResourceDefinition(optr.apiExtClient.ApiextensionsV1beta1(), c) + if err != nil { + return err + } + if updated { + if err := optr.waitForCustomResourceDefinition(c); err != nil { + return err + } + } + } return nil } @@ -142,64 +139,8 @@ func (optr *Operator) syncCluster(config render.OperatorConfig) error { return nil } -func (optr *Operator) syncClusterAPIServer(config render.OperatorConfig) error { - crbBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-apiserver-cluster-role-binding.yaml", ownedManifestsDir)) - if err != nil { - return err - } - crb := resourceread.ReadClusterRoleBindingV1OrDie(crbBytes) - _, _, err = resourceapply.ApplyClusterRoleBinding(optr.kubeClient.RbacV1(), crb) - if err != nil { - return err - } - - rbBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-apiserver-role-binding.yaml", ownedManifestsDir)) - if err != nil { - return err - } - rb := resourceread.ReadRoleBindingV1OrDie(rbBytes) - _, _, err = resourceapply.ApplyRoleBinding(optr.kubeClient.RbacV1(), rb) - if err != nil { - return err - } - - svcBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-apiserver-svc.yaml", ownedManifestsDir)) - if err != nil { - return err - } - svc := resourceread.ReadServiceV1OrDie(svcBytes) - _, _, err = resourceapply.ApplyService(optr.kubeClient.CoreV1(), svc) - if err != nil { - return err - } - - apiServiceBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-apiservice.yaml", ownedManifestsDir)) - if err != nil { - return err - } - apiService := resourceread.ReadAPIServiceDefinitionV1Beta1OrDie(apiServiceBytes) - _, _, err = resourceapply.ApplyAPIServiceDefinition(optr.apiregistrationClient, apiService) - if err != nil { - return err - } - - controllerBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-apiserver.yaml", ownedManifestsDir)) - if err != nil { - return err - } - controller := resourceread.ReadDeploymentV1OrDie(controllerBytes) - _, updated, err := resourceapply.ApplyDeployment(optr.kubeClient.AppsV1(), controller) - if err != nil { - return err - } - if updated { - return optr.waitForDeploymentRollout(controller) - } - return nil -} - func (optr *Operator) syncClusterAPIController(config render.OperatorConfig) error { - crBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-controller-cluster-role.yaml", ownedManifestsDir)) + crBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-manager-cluster-role.yaml", ownedManifestsDir)) if err != nil { return err } @@ -208,7 +149,7 @@ func (optr *Operator) syncClusterAPIController(config render.OperatorConfig) err if err != nil { return err } - crbBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-controller-cluster-role-binding.yaml", ownedManifestsDir)) + crbBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-manager-cluster-role-binding.yaml", ownedManifestsDir)) if err != nil { return err } @@ -217,7 +158,7 @@ func (optr *Operator) syncClusterAPIController(config render.OperatorConfig) err if err != nil { return err } - controllerBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-controller.yaml", ownedManifestsDir)) + controllerBytes, err := render.PopulateTemplate(&config, fmt.Sprintf("%s/clusterapi-manager-controllers.yaml", ownedManifestsDir)) if err != nil { return err } From 8df24f51f541265a2e56b4351c0beacc1f3975ff Mon Sep 17 00:00:00 2001 From: Enxebre Date: Fri, 19 Oct 2018 00:15:43 +0200 Subject: [PATCH 4/8] update tests for CRDs --- tests/e2e/main.go | 23 ++++--------------- .../manifests/clusterapi-apiserver-certs.yaml | 13 ----------- tests/e2e/manifests/images.configmap.yaml | 8 +++---- 3 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 tests/e2e/manifests/clusterapi-apiserver-certs.yaml diff --git a/tests/e2e/main.go b/tests/e2e/main.go index 0885a87d6..c961b5b5e 100644 --- a/tests/e2e/main.go +++ b/tests/e2e/main.go @@ -251,7 +251,7 @@ var rootCmd = &cobra.Command{ } } - // genereate mao config + // generate mao config maoConfigTemplateData, err := ioutil.ReadFile(filepath.Join(assetsPath, "manifests/mao-config.yaml")) if err != nil { glog.Fatalf("Error reading %#v", err) @@ -295,21 +295,6 @@ var rootCmd = &cobra.Command{ return err } } - // secrets - // create cluster api server secrets - if secretData, err := ioutil.ReadFile(filepath.Join(assetsPath, "manifests/clusterapi-apiserver-certs.yaml")); err != nil { - glog.Fatalf("Error reading %#v", err) - } else { - secretObj, _, err := decode([]byte(secretData), nil, nil) - if err != nil { - glog.Fatalf("Error decoding %#v", err) - } - secret := secretObj.(*apiv1.Secret) - - if err := createSecret(testConfig, secret); err != nil { - return err - } - } // create aws creds secret if secretData, err := ioutil.ReadFile(filepath.Join(assetsPath, "manifests/aws-credentials.yaml")); err != nil { @@ -368,16 +353,16 @@ var rootCmd = &cobra.Command{ // TESTS // verify the cluster-api is running err = wait.Poll(pollInterval, timeoutPoolClusterAPIDeploymentInterval, func() (bool, error) { - if clusterAPIDeployment, err := testConfig.KubeClient.AppsV1beta2().Deployments(targetNamespace).Get("clusterapi-apiserver", metav1.GetOptions{}); err == nil { + if clusterAPIDeployment, err := testConfig.KubeClient.AppsV1beta2().Deployments(targetNamespace).Get("clusterapi-manager-controllers", metav1.GetOptions{}); err == nil { // Check all the pods are running - log.Infof("Waiting for all cluster-api deployment pods to be ready, have %v, expecting 1", clusterAPIDeployment.Status.ReadyReplicas) + log.Infof("Waiting for all clusterapi-manager-controllers deployment pods to be ready, have %v, expecting 1", clusterAPIDeployment.Status.ReadyReplicas) if clusterAPIDeployment.Status.ReadyReplicas < 1 { return false, nil } return true, nil } - log.Info("Waiting for cluster-api deployment to be created") + log.Info("Waiting for clusterapi-manager-controllers deployment to be created") return false, nil }) diff --git a/tests/e2e/manifests/clusterapi-apiserver-certs.yaml b/tests/e2e/manifests/clusterapi-apiserver-certs.yaml deleted file mode 100644 index fb0ce242f..000000000 --- a/tests/e2e/manifests/clusterapi-apiserver-certs.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -type: kubernetes.io/tls -metadata: - name: cluster-apiserver-certs - namespace: openshift-cluster-api - labels: - api: clusterapi - apiserver: "true" -data: - tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURWRENDQWp3Q0NRRHNiVVNjRmFXTmlUQU5CZ2txaGtpRzl3MEJBUVVGQURCcU1Rc3dDUVlEVlFRR0V3SjEKYmpFTE1Ba0dBMVVFQ0F3Q2MzUXhDakFJQmdOVkJBY01BV3d4Q2pBSUJnTlZCQW9NQVc4eEN6QUpCZ05WQkFzTQpBbTkxTVNrd0p3WURWUVFERENCamJIVnpkR1Z5WVhCcExXTmxjblJwWm1sallYUmxMV0YxZEdodmNtbDBlVEFlCkZ3MHhPREV3TURNeE5ESXdOREJhRncweE9URXdNRE14TkRJd05EQmFNRzR4Q3pBSkJnTlZCQVlUQW5WdU1Rc3cKQ1FZRFZRUUlEQUp6ZERFS01BZ0dBMVVFQnd3QmJERUtNQWdHQTFVRUNnd0JiekVMTUFrR0ExVUVDd3dDYjNVeApMVEFyQmdOVkJBTU1KR05zZFhOMFpYSmhjR2t1YjNCbGJuTm9hV1owTFdOc2RYTjBaWEl0WVhCcExuTjJZekNDCkFTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTitNZCt1UjhrOGVXcU9JWWhFRk1yM1QKamExdTBxNHlJc3hKdnVQN0thOVZ6SzJIQTMzL1grb29XVzFZWkVXTktOdVNDcU01cG1ESnBIWFR2K3Z5ek1wbAp3akRRNjBSd0RwS0lIejZKVTRiNHlpTjczWnB1cEpqYUk1amVyMXNYR1N2M2lVTVVxeS9LbVJkbXFXK1hzNmF0CllPUGdLZkEwR1Jqa3J6MVVoWFE4aGdXK0huYmJEdUNVMk5jdm44V3M0eHJpWnRUdXVULzNqRHQyeDBhTWdHMlUKaHoyTFZLbnBaVnFiZytURDQyQzRySHZhbWVYTGRxRGVQTjl0VXltUTE4YXFhWEVCN1R5Q2pTWG1MRHNReXNkSwp2TWtPRzFWb1pSMFhrRWkzTmg0Q3dFVDVINERXSURZWDN5dktWOWRwVEhPVzQwbkFtSUQyK3NrcWZCdllaaXNDCkF3RUFBVEFOQmdrcWhraUc5dzBCQVFVRkFBT0NBUUVBSjhHQUxqZ3lPd3Z6Y1VZdUphamlIWU9UOWl5Y3VKdUgKaEZocGMzaXg5Nk5ZbVlBeWVxZTQzRDRIZlhzME9PYXYySUhId0haeWNqVlR3R3djajRZMEhBUjNpRVBGNTVZSwppbEZNU1V6ZXV0ZjBsVDFUN2ZCaVNMQXhLbDZCMWMwUTJ6UTNMRGlwSjFIOVhERmU4bFJJL3AySGtsVUdZSWJUCmVQREl1N1V1TkdxNHhjc0FXMkVpa09WY21rRVNNU0ZzU2djejE0K3IxQzlsekx3djhhUFkwYkxTRzgwdDlOMHIKY1NiajVtNDJYMWZOTUxFR2dQUlhGbFAzd2gxbTE0S2dKb05aOGtlaCswME56SWRlN2VmVTljNnBmN0FkcnF0RwpBbHhoZWtBWGxwUTI2bTlvVlZvYm5Zb1d5N3Y1OHY2UXE0UXFGS1JxS20xQURuWTY0YnNpcmc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRRGZqSGZya2ZKUEhscWoKaUdJUkJUSzkwNDJ0YnRLdU1pTE1TYjdqK3ltdlZjeXRod045LzEvcUtGbHRXR1JGalNqYmtncWpPYVpneWFSMQowNy9yOHN6S1pjSXcwT3RFY0E2U2lCOCtpVk9HK01vamU5MmFicVNZMmlPWTNxOWJGeGtyOTRsREZLc3Z5cGtYClpxbHZsN09tcldEajRDbndOQmtZNUs4OVZJVjBQSVlGdmg1MjJ3N2dsTmpYTDUvRnJPTWE0bWJVN3JrLzk0dzcKZHNkR2pJQnRsSWM5aTFTcDZXVmFtNFBrdytOZ3VLeDcycG5seTNhZzNqemZiVk1wa05mR3FtbHhBZTA4Z28wbAo1aXc3RU1ySFNyekpEaHRWYUdVZEY1Qkl0elllQXNCRStSK0ExaUEyRjk4cnlsZlhhVXh6bHVOSndKaUE5dnJKCktud2IyR1lyQWdNQkFBRUNnZ0VBR2N0Umd3TUNISkw2RG1pTU9ENkxUay84eHdoRWt3a0I3dVNMZkM3YzduaE4KOTYvZWZVbGNQZDZPQXdueDkveUR2R0lyakEzNDNxNGxwZHJiQ0ZTcHdLamhNVlRKOE1tbFJNOGtHOGtvdENnOAoycjlPSUtXbnBHTjNQQXBsM1hMYTJySGpTclExMUh2aUVrc3NQYzRaVXFBcXorQnJ0bVdzaDZ6TGM1NHZEK3c4CmxvdE1CYUNkb2pmMk9kMDllcUx4RkMyZ2dkMXJreU1adXl6VURha1kzalRrZkFhK2Q4c1NNamtObkF2TXcrMDQKNWV4VWNpT01sVU15aVp0MVA4bGN0a1ByTmtXYVovV0RoeXBLSlRTeVRqb1FvbTNIY29EUGtNMjlCeGltNXlLRgpUb1hxRDlwRjA0Rm5waWx5cE40OXNpNnNDL2VsUklTaVpHdG5od0R5Y1FLQmdRRDlVZnhyNlRiUTk5WFN1clNLCmdoL2JBb1kvcnZXTUZUV2ZkeHM5WUo0ZnNSU05PL0IwZzVmZEwzYWRUcnNKOS9adnZPeDJWZWN1dWM3U0xxNnMKL1B0UzdQMDVvVThGS1NwWUFiYVBZSTdkN0k1RVRMUDVndzRHbjlTS1ZDWGdvaW5yZHMzQlBrVGloTVQ4RlVWZwp3amZFaWdLM2RBSDVPcmdWTlZERE1GVlBsUUtCZ1FEaDZkdSsyRHVvMjUvdWEzSDNBTWNRN1VaQ3A1RWhPMUtuCko2b3NMTmxlN29zZjlYR2dGS21lZDlCWEpVRTR2L2M1VWxxNmR3c2V4dWduUzNTTWVKa29ncmdzU0xzMktCREwKU3RwVFJlNFIyOS9yZ002R1NnelhvVTR6VzhPU2tBc09ETk1nVU9qdXI2ZzUrSHp5em5vNnBQcXIrNGtYaEROcwphZ096MUFCdXZ3S0JnR2JBVmFvVHk5ZFJYOXI5UG5RY09mMms5WDFwWTFJeDNERlZwNmZxdzlqSkJEUVJod1JMCnlGTEFpTlZmOVFBakkwUEpsd1NjN1l3SGREdlBFYTA3WkZvTHBOODJiZzRDMTVraEFNTUJnSkhGL1NMNUZkdDAKYkVFRm5ibUtUbDdpaUN4cFlTWXNNdGJLMGZnS1RMemxxcWMrNzhFbi9oRHczM0JDMHdLSlhXRk5Bb0dCQUpCYwpsMzZKd1AzemNteXhuajdmOFZWQXVuQW5raGN4U0d6bWJOa1R3OGZsR1dSUHZNODF4UG90eUNXWCtlaWd5d09ICk85RUI5MG93Z3ZOeFJVWHFYcnpEWTV0dzBxa1Z5ejJOVkp4NENGekRLNERiYTUzbXZmUWc4TTdpNmNQRFpqMFIKTnV6a3B5UzNmUUdtWjNubE5iZzU2ckZ4NkRYdDFjcUdxRjBHc1V3VEFvR0FIT2k5RmZJZzJvL2JNaGpQZXlnagp1RzY4ZC9GTmVXOXViWDM3bXB2djJVbmtBTEw0ZUxMaEw3OFF1azZKMGJtVFNBZi9aR1FEMkovQXlrWURjcVJlCm1TVnZQeEVQb0JBV3VRVEQ3QVpUU0hnbnplV2ZOZk5ld0RGck11Nm1mbW44MTVUYVRQdWhPbUJzMFhYM0NPSDkKQTJybjdhMlV3Q1pVWnZQN0I4K1JUek09Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K -# TODO: generate this dynamically diff --git a/tests/e2e/manifests/images.configmap.yaml b/tests/e2e/manifests/images.configmap.yaml index 36647edcf..98f731bdc 100644 --- a/tests/e2e/manifests/images.configmap.yaml +++ b/tests/e2e/manifests/images.configmap.yaml @@ -5,10 +5,8 @@ metadata: namespace: openshift-cluster-api data: images.json: '{ - "clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", - "clusterAPIControllerManagerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", + "clusterAPIControllerAWS": "quay.io/alberto_lamela/origin-aws-machine-controllers:7bc2a82", + "clusterAPIControllerManagerAWS": "quay.io/alberto_lamela/origin-aws-machine-controllers:7bc2a82", "clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", - "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", - "clusterAPIServer": "gcr.io/k8s-cluster-api/cluster-apiserver:0.0.6", - "Etcd": "quay.io/coreos/etcd:latest" + "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0" }' \ No newline at end of file From c62c337b6d078296bf98d88893711cb3f1412996 Mon Sep 17 00:00:00 2001 From: Enxebre Date: Fri, 19 Oct 2018 00:16:02 +0200 Subject: [PATCH 5/8] update actuator images for CRDs --- install/0000_50_machine-api-operator_01_images.configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/0000_50_machine-api-operator_01_images.configmap.yaml b/install/0000_50_machine-api-operator_01_images.configmap.yaml index 0851d4beb..0d8794824 100644 --- a/install/0000_50_machine-api-operator_01_images.configmap.yaml +++ b/install/0000_50_machine-api-operator_01_images.configmap.yaml @@ -4,4 +4,4 @@ metadata: name: machine-api-operator-images namespace: openshift-cluster-api data: - images.json: '{"clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerManagerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIServer": "gcr.io/k8s-cluster-api/cluster-apiserver:0.0.6", "Etcd": "quay.io/coreos/etcd:latest"}' + images.json: '{"clusterAPIControllerAWS": "quay.io/alberto_lamela/origin-aws-machine-controllers:7bc2a82", "clusterAPIControllerManagerAWS": "quay.io/alberto_lamela/origin-aws-machine-controllers:7bc2a82", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"}' From 32545b077ccf8d597d5b6d5e6cd8edf4b04d282d Mon Sep 17 00:00:00 2001 From: Enxebre Date: Fri, 19 Oct 2018 10:09:43 +0200 Subject: [PATCH 6/8] update unit test --- pkg/render/render_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/render/render_test.go b/pkg/render/render_test.go index 81cac3fbf..13fccf796 100644 --- a/pkg/render/render_test.go +++ b/pkg/render/render_test.go @@ -252,11 +252,11 @@ func TestClusterapiControllerManifest(t *testing.T) { }, } - testRenderManifest(t, "../../owned-manifests/clusterapi-controller.yaml", &config, ` + testRenderManifest(t, "../../owned-manifests/clusterapi-manager-controllers.yaml", &config, ` apiVersion: apps/v1 kind: Deployment metadata: - name: clusterapi-controllers + name: clusterapi-manager-controllers namespace: go-test labels: api: clusterapi @@ -294,7 +294,7 @@ spec: - name: controller-manager image: docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0 command: - - "./controller-manager" + - "./manager" resources: requests: cpu: 100m @@ -310,7 +310,7 @@ spec: fieldRef: fieldPath: spec.nodeName command: - - /machine-controller + - /machine-controller-manager args: - --log-level=debug resources: From 0d024ab1b68c6b0f4f6a0b8917c913ff8fcccd95 Mon Sep 17 00:00:00 2001 From: Enxebre Date: Fri, 19 Oct 2018 14:47:35 +0200 Subject: [PATCH 7/8] bump to images build by CI --- install/0000_50_machine-api-operator_01_images.configmap.yaml | 2 +- tests/e2e/manifests/images.configmap.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install/0000_50_machine-api-operator_01_images.configmap.yaml b/install/0000_50_machine-api-operator_01_images.configmap.yaml index 0d8794824..71d35ca1e 100644 --- a/install/0000_50_machine-api-operator_01_images.configmap.yaml +++ b/install/0000_50_machine-api-operator_01_images.configmap.yaml @@ -4,4 +4,4 @@ metadata: name: machine-api-operator-images namespace: openshift-cluster-api data: - images.json: '{"clusterAPIControllerAWS": "quay.io/alberto_lamela/origin-aws-machine-controllers:7bc2a82", "clusterAPIControllerManagerAWS": "quay.io/alberto_lamela/origin-aws-machine-controllers:7bc2a82", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"}' + images.json: '{"clusterAPIControllerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerManagerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"}' diff --git a/tests/e2e/manifests/images.configmap.yaml b/tests/e2e/manifests/images.configmap.yaml index 98f731bdc..c29d75b37 100644 --- a/tests/e2e/manifests/images.configmap.yaml +++ b/tests/e2e/manifests/images.configmap.yaml @@ -5,8 +5,8 @@ metadata: namespace: openshift-cluster-api data: images.json: '{ - "clusterAPIControllerAWS": "quay.io/alberto_lamela/origin-aws-machine-controllers:7bc2a82", - "clusterAPIControllerManagerAWS": "quay.io/alberto_lamela/origin-aws-machine-controllers:7bc2a82", + "clusterAPIControllerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", + "clusterAPIControllerManagerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0" }' \ No newline at end of file From 3a9961e8bf8e616f9db233607a434f57679065a4 Mon Sep 17 00:00:00 2001 From: Enxebre Date: Mon, 22 Oct 2018 09:33:30 +0200 Subject: [PATCH 8/8] update for CRD libvirt image --- install/0000_50_machine-api-operator_01_images.configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/0000_50_machine-api-operator_01_images.configmap.yaml b/install/0000_50_machine-api-operator_01_images.configmap.yaml index 71d35ca1e..52a09430a 100644 --- a/install/0000_50_machine-api-operator_01_images.configmap.yaml +++ b/install/0000_50_machine-api-operator_01_images.configmap.yaml @@ -4,4 +4,4 @@ metadata: name: machine-api-operator-images namespace: openshift-cluster-api data: - images.json: '{"clusterAPIControllerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerManagerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"}' + images.json: '{"clusterAPIControllerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerManagerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "registry.svc.ci.openshift.org/openshift/libvirt-machine-controllers:crd", "clusterAPIControllerLibvirt": "registry.svc.ci.openshift.org/openshift/libvirt-machine-controllers:crd"}'