diff --git a/Makefile b/Makefile index 1112ba9d..1733f889 100644 --- a/Makefile +++ b/Makefile @@ -82,10 +82,10 @@ pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go: $(MANIFESTS) go generate ./pkg/apis/wksprovider/controller/manifests CRDS=$(shell find pkg/apis/cluster-api/config/crds -name '*.yaml' -print) -pkg/apis/wksprovider/machine/os/crds_vfsdata.go: $(CRDS) +pkg/apis/wksprovider/machine/crds/crds_vfsdata.go: $(CRDS) go generate ./pkg/apis/wksprovider/machine/crds -generated: pkg/addons/assets/assets_vfsdata.go pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go pkg/apis/wksprovider/machine/scripts/scripts_vfsdata.go pkg/apis/wksprovider/machine/os/crds_vfsdata.go +generated: pkg/addons/assets/assets_vfsdata.go pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go pkg/apis/wksprovider/machine/scripts/scripts_vfsdata.go pkg/apis/wksprovider/machine/crds/crds_vfsdata.go cmd/wksctl/wksctl: $(DEPS) generated cmd/wksctl/wksctl: cmd/wksctl/*.go diff --git a/examples/footloose/repo-config.yaml b/examples/footloose/repo-config.yaml index 52495c77..355da918 100644 --- a/examples/footloose/repo-config.yaml +++ b/examples/footloose/repo-config.yaml @@ -99,27 +99,48 @@ data: gpgkey=https://download.docker.com/linux/centos/gpg cloud-google-com.gpg.b64: | - mQENBFUd6rIBCAD6mhKRHDn3UrCeLDp7U5IE7AhhrOCPpqGF7mfTemZYHf/5JdjxcOxoSFlK7zwm - Fr3lVqJ+tJ9L1wd1K6P7RrtaNwCiZyeNPf/Y86AJ5NJwBe0VD0xHTXzPNTqRSByVYtdN94NoltXU - YFAAPZYQls0x0nUD1hLMlOlC2HdTPrD1PMCnYq/NuL/Vk8sWrcUt4DIS+0RDQ8tKKe5PSV0+Pnma - JvdF5CKawhh0qGTklS2MXTyKFoqjXgYDfY2EodI9ogT/LGr9Lm/+u4OFPvmN9VN6UG+s0DgJjWvp - bmuHL/ZIRwMEn/tpuneaLTO7h1dCrXC849PiJ8wSkGzBnuJQUbXnABEBAAG0QEdvb2dsZSBDbG91 - ZCBQYWNrYWdlcyBBdXRvbWF0aWMgU2lnbmluZyBLZXkgPGdjLXRlYW1AZ29vZ2xlLmNvbT6JAT4E - EwECACgFAlUd6rICGy8FCQWjmoAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEDdGwginMXsP - cLcIAKi2yNhJMbu4zWQ2tM/rJFovazcY28MF2rDWGOnc9giHXOH0/BoMBcd8rw0lgjmOosBdM2JT - 0HWZIxC/Gdt7NSRA0WOlJe04u82/o3OHWDgTdm9MS42noSP0mvNzNALBbQnlZHU0kvt3sV1Ysnrx - ljoIuvxKWLLwren/GVshFLPwONjw3f9Fan6GWxJyn/dkX3OSUGaduzcygw51vksBQiUZLCD2Tlxy - r9NvkZYTqiaWW78L6regvATsLc9L/dQUiSMQZIK6NglmHE+cuSaoK0H4ruNKeTiQUw/EGFaLecay - 6Qy/s3Hk7K0QLd+gl0hZ1w1VzIeXLo2BRlqnjOYFX4CwAgADmQENBFrBaNsBCADrF18KCbsZlo4N - jAvVecTBCnp6WcBQJ5oSh7+E98jX9YznUCrNrgmeCcCMUvTDRDxfTaDJybaHugfba43nqhkbNpJ4 - 7YXsIa+YL6eEE9emSmQtjrSWIiY+2YJYwsDgsgckF3duqkb02OdBQlh6IbHPoXB6H//b1PgZYsom - B+841XW1LSJPYlYbIrWfwDfQvtkFQI90r6NknVTQlpqQh5GLNWNYqRNrGQPmsB+NrUYrkl1nUt1L - RGu+rCe4bSaSmNbwKMQKkROE4kTiB72DPk7zH4Lm0uo0YFFWG4qsMIuqEihJ/9KNX8GYBr+tWgyL - ooLlsdK3l+4dVqd8cjkJM1ExABEBAAG0QEdvb2dsZSBDbG91ZCBQYWNrYWdlcyBBdXRvbWF0aWMg - U2lnbmluZyBLZXkgPGdjLXRlYW1AZ29vZ2xlLmNvbT6JAT4EEwECACgFAlrBaNsCGy8FCQWjmoAG - CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEGoDCyG6B/T78e8H/1WH2LN/nVNhm5TS1VYJG8B+ - IW8zS4BqyozxC9iJAJqZIVHXl8g8a/Hus8RfXR7cnYHcg8sjSaJfQhqO9RbKnffiuQgGrqwQxuC2 - jBa6M/QKzejTeP0Mgi67pyrLJNWrFI71RhritQZmzTZ2PoWxfv6b+Tv5v0rPaG+ut1J47pn+kYgt - UaKdsJz1umi6HzK6AacDf0C0CksJdKG7MOWsZcB4xeOxJYuy6NuO6KcdEz8/XyEUjIuIOlhYTd0h - H8E/SEBbXXft7/VBQC5wNq40izPi+6WFK/e1O42DIpzQ749ogYQ1eodexPNhLzekKR3XhGrNXJ95 - r5KO10VrsLFNd8KwAgAD + xsBNBF/Jfl4BCADTPUXdkNu057X+P3STVxCzJpU2Mn+tUamKdSdVambGeYFINcp/EGwNGhdb0a1B + bHs1SWYZbzwh4d6+p3k4ABzVMO+RpMu/aBx9E5aOn5c8GzHjZ/VEaheqLLhSUcSCzChSZcN5jz0h + TGhmAGaviMt6RMzSfbIhZPj1kDzBiGd0Qwd/rOPnJr4taPruR3ecBjhHti1/BMGd/lj0F7zQnCjp + 7PrqgpEPBT8jo9wX2wvOyXswSI/GsfbFiaOJfDnYengaEg8sF+u3WOs0Z20cSr6kS76KHpTfa3Jj + YsfHt8NDw8w4e3H8PwQzNiRP9tXeMASKQz3emMj/ek6HxjihY9qFABEBAAHNumdMaW51eCBSYXB0 + dXJlIEF1dG9tYXRpYyBTaWduaW5nIEtleSAoLy9kZXBvdC9nb29nbGUzL3Byb2R1Y3Rpb24vYm9y + Zy9jbG91ZC1yYXB0dXJlL2tleXMvY2xvdWQtcmFwdHVyZS1wdWJrZXlzL2Nsb3VkLXJhcHR1cmUt + c2lnbmluZy1rZXktMjAyMC0xMi0wMy0xNl8wOF8wNS5wdWIpIDxnbGludXgtdGVhbUBnb29nbGUu + Y29tPsLAaAQTAQgAHAUCX8l+XgkQi1fFwoNvS+sCGwMFCQPDCrACGQEAAEF6CACaekro6aUJJd3m + VtrtLOOewV8et1jep5ewmpOrew/pajRVBeIbV1awVn0/8EcenFejmP6WFcdCWouDVIS/QmRFQV9N + 6YXN8PiwalrRV3bTKFBHkwa1cEH4AafCGo0cDvJb8N3JnM/Rmb1KSGKr7ZXpmkLtYVqr6Hgzl+sn + rlH0Xwsl5r3SyvqBgvRYTQKZpKqmBEd1udieVoLSF988kKeNDjFa+Q1SjZPGW+XukgE8kBUbSDx8 + Y8q6Cszh3VVY+5JUeqimRgJ2ADY2/3lEtAZOtmwcBlhY0cPWVqga14E7kTGSWKC6W96Nfy9K7L4Y + pp8nTMErus181aqwwNfMqnpnzsBNBF/Jfl4BCADDSh+KdBeNjIclVVnRKt0QT5593yF4WVZt/TgN + uaEZ5vKknooVVIq+cJIfY/3lUqq8Te4dEjodtFyKe5Xuego6qjzs8TYFdCAHXpXRoUolT14m+qkJ + 8rhSrpN0TxIjWJbJdm3NlrgTam5RKJw3ShypNUxyolnHelXxqyKDCkxBSDmR6xcdft3wdQl5IkIA + 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 + NEj2nJu128U2JUB8CQhGvR3+P57ogWscFyrnP8s= diff --git a/go.mod b/go.mod index a56c0852..7e2229ae 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.1 // indirect github.com/hashicorp/golang-lru v0.5.3 // indirect github.com/imdario/mergo v0.3.7 // indirect - github.com/oleiade/reflections v1.0.0 // indirect + github.com/oleiade/reflections v1.0.1 github.com/pelletier/go-toml v1.2.0 github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.8.1 @@ -31,7 +31,7 @@ require ( github.com/sirupsen/logrus v1.4.2 github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.3 - github.com/stretchr/testify v1.4.0 + github.com/stretchr/testify v1.6.1 github.com/thanhpk/randstr v0.0.0-20190104161604-ac5b2d62bffb github.com/weaveworks/footloose v0.0.0-20190903132036-efbcbb7a6390 github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab @@ -45,7 +45,6 @@ require ( gomodules.xyz/jsonpatch/v2 v2.0.1 // indirect google.golang.org/appengine v1.4.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/oleiade/reflections.v1 v1.0.0 gopkg.in/src-d/go-git.v4 v4.10.0 k8s.io/api v0.0.0-20190831074750-7364b6bdad65 k8s.io/apiextensions-apiserver v0.0.0-20190831115834-b8e250c992fa // indirect diff --git a/go.sum b/go.sum index df33077e..d5617f7b 100644 --- a/go.sum +++ b/go.sum @@ -217,8 +217,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/oleiade/reflections v1.0.0 h1:0ir4pc6v8/PJ0yw5AEtMddfXpWBXg9cnG7SgSoJuCgY= -github.com/oleiade/reflections v1.0.0/go.mod h1:RbATFBbKYkVdqmSFtx13Bb/tVhR0lgOBXunWTZKeL4w= +github.com/oleiade/reflections v1.0.1 h1:D1XO3LVEYroYskEsoSiGItp9RUxG6jWnCVvrqH0HHQM= +github.com/oleiade/reflections v1.0.1/go.mod h1:rdFxbxq4QXVZWj0F+e9jqjDkc7dbp97vkRixKo2JR60= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c h1:Hww8mOyEKTeON4bZn7FrlLismspbPc1teNRUVH7wLQ8= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c h1:eSfnfIuwhxZyULg1NNuZycJcYkjYVGYe7FczwQReM6U= @@ -298,8 +298,8 @@ github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/thanhpk/randstr v0.0.0-20190104161604-ac5b2d62bffb h1:Ih4dkfHqv5m1/CH8jFhRq83P/z1AKCKrTuWDFUmw2LY= github.com/thanhpk/randstr v0.0.0-20190104161604-ac5b2d62bffb/go.mod h1:M/H2P1eNLZzlDwAzpkkkUvoyNNMbzRGhESZuEQk3r0U= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -428,8 +428,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/oleiade/reflections.v1 v1.0.0 h1:nV9NFaFd5bXKjilVvPvA+/V/tNQk1pOEEc9gGWDkj+s= -gopkg.in/oleiade/reflections.v1 v1.0.0/go.mod h1:SpA8pv+LUnF0FbB2hyRxc8XSng78D6iLBZ11PDb8Z5g= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/src-d/go-billy.v4 v4.2.1 h1:omN5CrMrMcQ+4I8bJ0wEhOBPanIRWzFC953IiXKdYzo= gopkg.in/src-d/go-billy.v4 v4.2.1/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk= @@ -442,6 +440,8 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -482,7 +482,6 @@ modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= sigs.k8s.io/cluster-api v0.0.0-20181211193542-3547f8dd9307 h1:JZJOppRhof1HiN8OBmn7DWZKjI0QhqpOCZePcyDWP3o= sigs.k8s.io/cluster-api v0.0.0-20181211193542-3547f8dd9307/go.mod h1:aEXstFx3krpj6/AOcV/rOP2VLKdrtSNUMDR2Kmt6YSs= -sigs.k8s.io/cluster-api v0.3.6 h1:Md//qVTwPvJFIBzQ8Mnsro1510x4UFtOyx4t6sPoDnM= sigs.k8s.io/controller-runtime v0.1.12 h1:ovDq28E64PeY1yR+6H7DthakIC09soiDCrKvfP2tPYo= sigs.k8s.io/controller-runtime v0.1.12/go.mod h1:HFAYoOh6XMV+jKF1UjFwrknPbowfyHEHHRdJMf2jMX8= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= diff --git a/pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go b/pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go index 7aff74fa..8c75cb22 100644 --- a/pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go +++ b/pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go @@ -21,42 +21,42 @@ var Manifests = func() http.FileSystem { fs := vfsgen۰FS{ "/": &vfsgen۰DirInfo{ name: "/", - modTime: time.Date(2020, 5, 19, 22, 23, 27, 249616053, time.UTC), + modTime: time.Date(2021, 6, 16, 2, 59, 57, 57255255, time.UTC), }, "/01_namespace.yaml": &vfsgen۰FileInfo{ name: "01_namespace.yaml", - modTime: time.Date(2020, 5, 8, 13, 59, 12, 351060757, time.UTC), + modTime: time.Date(2019, 8, 22, 21, 31, 25, 627468262, time.UTC), content: []byte("\x2d\x2d\x2d\x0a\x61\x70\x69\x56\x65\x72\x73\x69\x6f\x6e\x3a\x20\x76\x31\x0a\x6b\x69\x6e\x64\x3a\x20\x4e\x61\x6d\x65\x73\x70\x61\x63\x65\x0a\x6d\x65\x74\x61\x64\x61\x74\x61\x3a\x0a\x20\x20\x6c\x61\x62\x65\x6c\x73\x3a\x0a\x20\x20\x20\x20\x63\x6f\x6e\x74\x72\x6f\x6c\x6c\x65\x72\x2d\x74\x6f\x6f\x6c\x73\x2e\x6b\x38\x73\x2e\x69\x6f\x3a\x20\x22\x31\x2e\x30\x22\x0a\x20\x20\x6e\x61\x6d\x65\x3a\x20\x73\x79\x73\x74\x65\x6d\x0a"), }, "/02_rbac.yaml": &vfsgen۰CompressedFileInfo{ name: "02_rbac.yaml", - modTime: time.Date(2020, 5, 8, 13, 59, 12, 351927700, time.UTC), + modTime: time.Date(2021, 6, 16, 2, 59, 57, 57069723, time.UTC), uncompressedSize: 1131, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x53\xb1\x92\xd3\x30\x10\xed\xfd\x15\x3b\x77\xb5\x93\xa1\x63\xdc\x01\x05\x05\xdd\x1d\x03\xf5\x5a\x7a\x89\x45\x64\xad\x90\x56\xce\x1c\x5f\xcf\x58\x8e\xc3\xe5\x02\x19\x18\x8a\xab\xfc\x56\x5a\xed\xbe\xf7\x3c\xaf\x6d\xdb\x86\xa3\xfb\x82\x94\x9d\x84\x8e\x52\xcf\x66\xc3\x45\x07\x49\xee\x07\xab\x93\xb0\x39\xbc\xcd\x1b\x27\xdb\xe9\x4d\x73\x70\xc1\x76\xf4\xc1\x97\xac\x48\x0f\xe2\xd1\x8c\x50\xb6\xac\xdc\x35\x44\x81\x47\x74\x74\x3c\xe4\xd6\x48\xd0\x24\xde\x23\xb5\x69\xee\x4a\xc5\x23\x77\x4d\x4b\x1c\xdd\xc7\x24\x25\xe6\xb9\xbf\x25\xb3\x4c\x3a\x6d\x68\x88\x12\xb2\x94\x64\x70\x79\x9f\x6b\x31\xb2\x19\x5c\xc0\x65\xb1\xcd\xca\x5a\x2e\xce\x2c\xa2\x97\xa7\x11\x41\x2f\x5b\x51\xeb\x09\xa9\x3f\x4d\xdf\x43\xeb\xd7\xbb\xbc\x80\x23\xab\x19\x96\xc5\x09\xac\xa8\xb0\x44\xbb\xc2\x78\xbe\xb7\xf0\x50\x5c\x0b\xba\xbb\x7b\x29\xe2\x9e\xa2\xd8\xbc\xc5\xe4\xcc\x6c\x26\xb9\x4c\x09\xdf\x8b\x4b\xb0\xb4\x93\x44\x3a\x80\xbe\x7e\x7a\xa4\x5f\x96\x91\x0a\xf5\x20\xee\x3d\x66\x58\x5f\xd6\x21\x75\x5a\x89\x12\x56\x49\x0b\x0d\x27\x21\x6f\x16\x7e\xcf\x37\x9d\x4f\x2a\x08\x62\x4f\xce\x61\x3a\x3b\x93\x61\xd2\xeb\xb8\xd2\xce\x7a\x77\x6e\x3f\x72\xbc\xb5\xfe\x9e\x3e\x0f\xa0\x1e\x5e\x8e\xff\x6e\xdc\xc2\x86\x2c\x63\x94\x50\xff\xfe\x9f\xdd\xbb\xa2\xcc\xb1\x12\x7b\x41\xfa\xd9\xac\xdf\x92\x5e\x0d\xf8\xaf\x4c\xbd\x77\xc1\xba\xb0\xff\xbb\x68\xf5\xa7\xe6\x19\x3f\x60\x37\xf7\xae\x4a\x6e\xec\x6d\x88\xae\xa3\x7c\x2b\xc0\xb9\xf4\xdf\x60\xb4\x66\x78\x79\xf9\x88\x34\x39\x83\x77\xc6\x48\x09\x7a\x7e\x6c\xb1\xe3\xe2\xd7\x3a\x47\x36\xe8\x28\x3f\x65\xc5\xd8\xfc\x0c\x00\x00\xff\xff\x3c\x15\x72\x25\x6b\x04\x00\x00"), }, "/03_secrets.yaml": &vfsgen۰FileInfo{ name: "03_secrets.yaml", - modTime: time.Date(2020, 5, 8, 13, 59, 12, 352098811, time.UTC), + modTime: time.Date(2019, 8, 22, 21, 31, 25, 627652588, time.UTC), content: []byte("\x2d\x2d\x2d\x0a\x61\x70\x69\x56\x65\x72\x73\x69\x6f\x6e\x3a\x20\x76\x31\x0a\x6b\x69\x6e\x64\x3a\x20\x53\x65\x63\x72\x65\x74\x0a\x6d\x65\x74\x61\x64\x61\x74\x61\x3a\x0a\x20\x20\x6e\x61\x6d\x65\x3a\x20\x77\x6b\x73\x2d\x63\x6f\x6e\x74\x72\x6f\x6c\x6c\x65\x72\x2d\x73\x65\x63\x72\x65\x74\x73\x0a\x20\x20\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x3a\x20\x73\x79\x73\x74\x65\x6d\x0a\x74\x79\x70\x65\x3a\x20\x4f\x70\x61\x71\x75\x65\x0a\x64\x61\x74\x61\x3a\x0a\x20\x20\x73\x73\x68\x4b\x65\x79\x3a\x20\x22\x22\x0a"), }, "/04_controller.yaml": &vfsgen۰CompressedFileInfo{ name: "04_controller.yaml", - modTime: time.Date(2020, 5, 19, 22, 23, 27, 249283676, time.UTC), + modTime: time.Date(2021, 6, 16, 2, 59, 57, 57339584, time.UTC), uncompressedSize: 1532, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x54\x49\x73\xdb\x3a\x0c\xbe\xfb\x57\x60\xfc\xae\x91\x97\xf7\x2e\x6f\x78\xcb\xb4\xb9\x35\xed\x4c\xd3\xe9\x1d\xa6\x90\x88\x15\xb7\x02\x90\x15\xfd\xfb\x0e\x65\x45\xb6\x3b\x4e\x9c\x56\x37\x61\xf9\x16\x90\x60\x55\x55\x0b\xcc\xee\x3b\xb1\xb8\x14\x0d\x60\xce\xb2\xde\x6f\x17\xad\x8b\xb5\x81\x8f\x94\x7d\x1a\x02\x45\x5d\x04\x52\xac\x51\xd1\x2c\x00\x22\x06\x32\xd0\xb7\x52\xd9\x14\x95\x93\xf7\xc4\x53\x58\x32\x5a\x32\x20\x83\x28\x85\x05\x80\xc7\x1d\x79\x29\x4d\xaf\xb6\x01\x4c\xbf\x55\xf6\x18\xdf\xac\xf0\xc4\x95\xa6\xe4\x65\xd5\xfe\x2f\x2b\x97\x0c\x2c\xb7\xab\xcd\x72\x21\x99\x6c\xe1\x60\xca\xde\x59\x14\x03\xdb\x05\x80\x90\x27\xab\x89\x0f\xec\x01\xd5\x36\x9f\x4e\xe4\xbc\x2a\x48\x29\x64\x8f\x4a\x53\xdf\x89\xf1\xf2\xf9\x33\x88\x37\x5c\xbd\xcf\xd9\x3b\xdc\x95\x92\x17\x87\x23\x63\xaa\xe9\xe1\xcc\xdb\x4b\xb4\xe2\xe4\x69\xd5\x76\x3b\xe2\x48\x4a\x05\x64\x1d\x50\x94\xd8\xc0\x72\x39\x95\x6a\xf2\xc4\xa8\x2e\xc5\xd9\xc5\x3f\x70\xeb\x7d\xea\x41\x6c\x43\x75\xe7\x5d\x7c\x82\x14\xe1\xd0\x39\x02\xcb\x0a\xbe\x35\x4e\xc0\x09\x30\xfd\xec\x1c\x53\x0d\x3b\xb2\xd8\x09\x41\xdd\xb1\x8b\x4f\x33\xd2\x2e\x25\x15\x65\xcc\x79\x84\x79\x04\x6d\x08\xac\xef\x0a\xd6\x0d\xf4\x04\x01\x07\x70\xd1\xa9\x43\xef\x07\x68\x70\x4f\xf0\xa3\x13\x85\x14\x69\xa2\xbc\x99\xc1\x30\xd6\xd0\xa7\xce\xd7\x05\x25\x42\x24\xaa\x41\x13\xd4\xe3\xbd\x04\x2d\x92\x8e\xc3\x2b\x35\x4c\x25\x2f\xa4\x23\x2d\x45\x75\x4c\x33\xda\xa4\x02\xba\xbc\x9a\x62\x15\xd0\xe3\x23\x59\x35\xf0\x39\x3d\x1c\xcc\xd3\x3c\xd1\x96\x06\x73\x65\xac\x73\x6d\xca\x65\xa6\x89\x0d\xdc\x3d\x3b\x51\x99\x39\xef\x91\xdb\x83\x50\x14\x40\xb0\xec\xd4\x59\xf4\x80\x75\x9d\xa2\x99\x65\x8c\x5c\x1f\xa6\xe4\x6d\xc9\xc9\x97\xe8\x87\xeb\xf8\xa5\xea\xe5\xdc\xa8\x9c\xda\x78\x5c\xd0\x37\xce\x36\x80\x4c\xc0\x84\xf5\x30\x0e\x92\x09\x6d\x83\x3b\x4f\xe6\x82\xfb\xbb\x67\xb2\x9d\x5e\x30\xbf\x42\x9f\x1b\xfc\xcd\x7d\x4c\xfa\xb5\xe0\x5e\xd3\xf7\xf7\x0c\x5d\x9c\xe5\x5e\x23\x29\x37\x00\x5d\x24\x96\xa3\xb1\xc3\x56\x5e\xd8\x35\x17\xf0\x89\x0c\xd4\xc9\xb6\xc4\x85\xa8\x27\xdc\x53\x9f\xb8\x95\x75\xdf\x8a\x55\x7f\xb2\xa1\xa6\x3c\x03\xa2\x27\x8b\x1a\x02\xc6\xfa\xb8\x74\x15\xac\x77\x2e\xae\x2f\xf0\x54\x50\x55\x7b\xe2\x5d\x92\xa3\x7e\x26\x49\x1d\x5b\x3a\x79\x3d\x00\xbc\x0b\x4e\xcf\x22\x00\x36\x77\x06\xb6\x9b\x4d\x38\x8b\x06\x0a\x89\x07\x03\xff\x6d\xee\xdd\x49\xa2\x2c\x24\xc9\x9f\x41\xfc\x5b\x20\x7e\x05\x00\x00\xff\xff\x51\x54\xb6\xf7\xfc\x05\x00\x00"), }, "/05_sealed_secret_crd.yaml": &vfsgen۰CompressedFileInfo{ name: "05_sealed_secret_crd.yaml", - modTime: time.Date(2020, 5, 8, 13, 59, 12, 352480401, time.UTC), + modTime: time.Date(2020, 4, 8, 23, 22, 58, 85629556, time.UTC), uncompressedSize: 302, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\xd0\xbd\x4e\xc5\x30\x0c\x05\xe0\x3d\x4f\xe1\x17\x68\x51\x37\x94\x15\x36\x10\x03\x57\x62\xf7\x4d\x0f\x17\xab\xf9\x53\xec\x54\x3c\x3e\x6a\x2a\x24\x7e\xc6\xe4\xb3\xcf\x91\x3c\x4d\x93\xe3\x2a\x6f\x68\x2a\x25\x7b\xe2\x2a\xf8\x34\xe4\xe3\xa5\xf3\x76\xaf\xb3\x94\xbb\x7d\xb9\xc2\x78\x71\x9b\xe4\xd5\xd3\x43\x57\x2b\xe9\x15\x5a\x7a\x0b\x78\xc4\xbb\x64\x31\x29\xd9\x25\x18\xaf\x6c\xec\x1d\x51\xe6\x04\x4f\x0a\x8e\x58\x15\xa1\xc1\x74\xbe\x8a\x65\x4e\x32\x87\x92\x9c\x56\x84\x63\xee\xd6\x4a\xaf\x9e\x7e\xd2\xb9\xac\x87\x12\x9d\x95\x97\x91\x73\x19\x39\xe3\x3b\x8a\xda\xd3\x3f\x7a\x16\x3d\xb9\xc6\xde\x38\xfe\xe9\x1f\xa2\x92\x6f\x3d\x72\xfb\x6d\x8e\x48\x43\xa9\xf0\xf4\x72\x54\x57\x0e\x58\x1d\xd1\xfe\x7d\x95\x7d\xe1\x58\x3f\x78\xf9\x0a\x00\x00\xff\xff\x7b\xe7\x31\x16\x2e\x01\x00\x00"), }, "/06_sealed_secret_controller.yaml": &vfsgen۰CompressedFileInfo{ name: "06_sealed_secret_controller.yaml", - modTime: time.Date(2020, 5, 8, 13, 59, 12, 352634417, time.UTC), + modTime: time.Date(2020, 7, 22, 21, 5, 9, 373397079, time.UTC), uncompressedSize: 4505, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x57\x5d\x53\x5b\x37\x10\x7d\xf7\xaf\xd8\x49\xa7\x93\x97\x5c\x83\x9b\xd2\x61\xf4\x46\x49\x4b\x3b\x93\x52\x0f\x94\xbe\x74\xfa\x20\x4b\x6b\x5b\x41\x5f\x91\x56\x86\x9b\x4e\xff\x7b\x47\xf2\xf5\xfd\x00\x3b\x35\x90\x0c\xf8\xe9\xb2\x5a\xed\x9e\x3d\x3a\x5a\x2d\x55\x55\x8d\xb8\x57\x7f\x62\x88\xca\x59\x06\xab\xc9\xe8\x5a\x59\xc9\xe0\x12\xc3\x4a\x09\x1c\x19\x24\x2e\x39\x71\x36\x02\xe0\xd6\x3a\xe2\xa4\x9c\x8d\x0c\xfe\xf9\x77\x04\xa0\xf9\x0c\x75\xcc\x6b\x00\x96\x1b\x64\x10\x91\x6b\x94\x55\x44\x11\x90\x62\x25\x9c\xa5\xe0\xb4\xc6\x30\xda\xd7\x23\x7a\x2e\x90\xc1\x75\x9a\x61\x15\xeb\x48\x68\x46\xd1\xa3\xc8\x49\xbc\x0b\x54\xb2\x55\xe5\x93\xc1\xf1\xe1\xf1\x61\x49\x4e\x3c\x2c\x90\xa6\x7d\x63\x44\x8d\x82\x5c\xd8\x17\x1d\xd5\x1e\x19\x9c\xea\x14\x09\xc3\xaf\xd3\xd1\x5d\x6a\xc2\x8c\x8b\x31\x4f\xb4\x74\x41\x7d\x2a\x2c\x8c\xaf\x8f\xe3\x58\xb9\x83\x96\xb4\x0b\xa7\xf1\x47\x65\xa5\xb2\x8b\xa7\x12\x17\xd7\xfc\x57\x3e\xb8\x5b\xb5\x9b\xbd\xed\x6e\x5b\x28\x0c\x4e\xe3\x05\xce\x0b\x1a\xaf\xce\x82\x4b\xfe\x33\x25\x8d\x00\xba\x8a\xf6\xcd\x1d\xd3\xec\x03\x8a\x7c\x40\xd5\x83\x72\x14\xc7\x2e\x49\xc1\xcb\xf2\x0e\xb4\xa4\x04\x27\x94\xf7\xce\x82\x7b\x1f\x3b\xda\xdf\xa1\xd7\xae\x36\x68\xe9\x65\xc9\xd5\x28\x7b\x81\x5c\xd6\x97\x28\x9c\x95\x91\xc1\xdb\xac\xcb\x80\x5e\x2b\xc1\x23\x83\x49\xf9\x6b\xa5\x72\x4d\xbf\xa8\x48\x2e\xd4\xef\x95\x51\xc4\x60\x72\x5f\xc0\x86\x93\x58\xbe\xef\x15\xb0\x0f\xc0\x48\x81\x13\x2e\xea\xf5\x8e\x6c\x56\x76\x71\xe5\x25\x27\xdc\x04\x31\xfc\xf6\x32\x85\x05\x32\xf8\xee\xe8\xdb\xce\x76\x65\xf9\x8a\x2b\xcd\x67\xba\xb7\xb2\xbe\x22\x17\xfd\x30\xf9\xe2\xa0\xf1\xba\x8d\xd8\x3f\x81\xfc\xbb\x7f\x0a\xf9\xa7\x07\x85\xec\x53\x0a\xc0\x86\xd6\x82\xc4\x69\x0c\x4d\xd4\xc6\xf4\x0d\x9c\x68\xed\x6e\x20\x8a\x25\xca\x94\x11\x82\xb3\x60\x78\xbe\xce\x60\x9d\xc4\x38\x86\x3f\x96\x2a\x82\x8a\x10\xf0\x63\x52\x01\x25\xcc\x50\xf0\x14\x11\x64\x0a\xf9\xd2\x6e\x22\xcd\x9c\xa3\xcc\x9d\xf7\x25\xcc\x1c\x68\x89\x20\xd6\xad\xe1\x0d\xdc\x20\x18\x5e\x83\xb2\x8a\x14\xd7\xba\x86\x25\x5f\x21\x7c\x48\x91\xc0\x59\x6c\x52\xbe\x69\x83\x71\x2b\xe1\xc6\x25\x2d\x73\x14\x0b\x16\x51\x02\x39\x90\x45\xb5\x40\x19\x52\x57\x69\xf6\x09\x98\xd7\x23\x52\x49\x9b\x6f\x41\xc0\x36\x5a\x83\x02\x92\x1f\x37\xb6\x0a\x70\x3e\x47\x41\x0c\xce\xdd\xe5\xba\x78\x6c\x89\xbd\xc6\x9a\x95\xea\xab\xdc\x01\xc6\x59\xa6\xc1\x22\x61\x69\x5c\x6b\xa4\xad\xaf\xf3\x99\x53\x17\x18\xfc\x74\xab\x22\xc5\x66\x21\x83\xe3\xca\x62\x68\xa9\xae\x80\x87\x45\x64\xf0\xd7\xdf\xed\x5e\xe1\x8c\xe1\x56\x76\x27\x5a\xc1\x9d\xe3\xcb\x3f\xb4\xab\xc1\x2e\x65\x78\x56\xde\xc7\xc4\xeb\x8c\x67\xa6\xc8\x72\xa3\x0e\x76\xea\x80\xad\x0e\xc7\x93\xc9\xf8\x70\x18\x60\x9a\xb4\x9e\x3a\xad\x44\xcd\xe0\x44\xdf\xf0\x3a\xb6\xeb\x5a\xad\xd0\x62\x8c\xd3\xe0\x66\xd8\x81\x03\x58\x12\xf9\x33\xa4\xbe\x09\xc0\x73\x5a\x32\x38\x58\x22\xd7\xb4\xfc\x34\x5c\x2a\x4f\x4b\xde\xf5\x20\xcd\x6e\xb6\xc6\xbb\xc4\x14\x42\xa7\xc3\x47\xac\x1f\x76\x90\x29\x20\x97\xea\x6b\x95\x11\x51\xa4\xa0\xa8\x3e\x75\x96\xf0\x76\x10\x2a\xe7\xfd\xdd\xea\xfa\xc2\x39\xfa\x59\x69\x6c\x7a\x33\x50\x48\xd8\x77\x4b\xf6\x24\x9e\x3b\x9b\xdd\xb6\x2f\x5e\x45\x0c\xb9\xab\x1d\x4e\xba\xb4\x24\x95\x65\x30\xe7\x3a\x76\xee\x44\xf5\x5d\xd3\xca\xe9\x64\xf0\x37\x97\xec\x90\x44\x93\x2d\xd3\x75\xa5\x64\xfc\x3d\x02\x3b\x5b\xab\x91\xcb\xf5\x19\xf5\x14\x98\xaf\xf0\x69\x27\xef\x6e\x61\x27\x29\xf3\xd8\xbc\x6b\x3f\x1c\x1d\xbd\xfd\xbe\xf5\x2e\x2f\xe1\x89\x10\x19\xd4\xf9\x5e\xba\x20\x0c\x46\xd9\xd2\xc2\xce\x02\x17\x38\xc5\xa0\x9c\x1c\x3e\x15\x5d\xfd\xbd\xab\x87\xc6\x53\xfd\x4e\x85\x5e\x37\xed\xd7\xfc\xbc\x63\xcb\x97\x79\x40\xbf\xc2\xb0\x72\x8d\x75\xc5\xa5\x51\x76\x30\xa6\x0c\x66\xdd\xe6\xf8\x9e\x02\xfc\x91\xe4\x3f\x95\xf5\xae\xb8\x3d\x1d\xb6\x71\x9e\x34\x0e\x46\xb7\x66\xd0\x7e\xf5\xaa\x4c\x29\xd1\xa5\x20\xb0\xb1\x35\x61\x47\x00\x2b\x0c\xb3\xc6\x28\x02\xae\xe7\x81\x0a\xb4\x8a\xf4\x18\x2e\x9a\xe1\xfb\xb9\xf4\xf8\x48\xd9\xf5\x50\xf7\x92\xac\xa3\x27\x5b\xd2\x85\x97\xa6\xba\x3e\xe6\x87\x53\x7c\xa7\xb6\x9d\x0b\xbb\x34\xd5\xbc\xf3\x63\xe1\xcc\x36\x71\x65\x02\xb6\x4a\x6c\x81\xd4\xe9\x2b\x7f\xdc\xe4\xa1\xb8\x7c\xa5\xf5\x34\xfa\x78\xf9\x6e\x62\xf7\x64\x9c\x36\x13\x6e\x05\x12\x35\xee\x1b\x1e\x57\x68\x3f\x73\x39\x7c\xc1\xfc\x7f\xff\x78\x6f\x64\xf1\x22\xfa\xf1\x33\xb5\xb5\x2f\xfe\x3f\xf0\x3e\x2d\x2e\xbf\xde\x8d\xfd\x75\x9e\x93\xd8\xee\x61\xf4\x75\x4f\xaf\xdb\xf9\xbc\x27\xbc\x82\x34\x1e\x64\xa8\xf5\x4e\x85\x64\x29\xfe\x17\x00\x00\xff\xff\xd1\x93\xfb\x19\x99\x11\x00\x00"), diff --git a/pkg/apis/wksprovider/controller/wksctl/machine_actuator.go b/pkg/apis/wksprovider/controller/wksctl/machine_actuator.go index a8de2044..48f728e0 100644 --- a/pkg/apis/wksprovider/controller/wksctl/machine_actuator.go +++ b/pkg/apis/wksprovider/controller/wksctl/machine_actuator.go @@ -594,13 +594,41 @@ func (a *MachineActuator) clearUpdateCount(node *corev1.Node) error { func (a *MachineActuator) kubeadmUpOrDowngrade(machine *clusterv1.Machine, node *corev1.Node, installer *os.OS, k8sVersion, planKey, planJSON string, ntype nodeType) error { b := plan.NewBuilder() - b.AddResource( - "upgrade:node-unlock-kubernetes", - &resource.Run{Script: object.String("yum versionlock delete 'kube*' || true")}) - b.AddResource( - "upgrade:node-install-kubeadm", - &resource.RPM{Name: "kubeadm", Version: k8sVersion, DisableExcludes: "kubernetes"}, - plan.DependOn("upgrade:node-unlock-kubernetes")) + //TODO add OS check and + switch installer.PkgType { + case resource.PkgTypeRPM, resource.PkgTypeRHEL: + b.AddResource( + "upgrade:node-unlock-kubernetes", + &resource.Run{Script: object.String("yum versionlock delete 'kube*' || true")}) + b.AddResource( + "upgrade:node-kubelet", + &resource.RPM{Name: "kubelet", Version: k8sVersion, DisableExcludes: "kubernetes"}, + plan.DependOn("upgrade:node-unlock-kubernetes")) + b.AddResource( + "upgrade:node-kubectl", + &resource.RPM{Name: "kubectl", Version: k8sVersion, DisableExcludes: "kubernetes"}, + plan.DependOn("upgrade:node-kubelet")) + b.AddResource( + "upgrade:node-install-kubeadm", + &resource.RPM{Name: "kubeadm", Version: k8sVersion, DisableExcludes: "kubernetes"}, + plan.DependOn("upgrade:node-kubectl")) + b.AddResource( + "upgrade:node-lock-kubernetes", + &resource.Run{Script: object.String("yum versionlock add 'kube*' || true")}, + plan.DependOn("upgrade:node-install-kubeadm")) + case resource.PkgTypeDeb: + b.AddResource( + "upgrade:node-kubelet", + &resource.Deb{Name: "kubelet", Suffix: "=" + k8sVersion + "-00"}) + b.AddResource( + "upgrade:node-kubectl", + &resource.Deb{Name: "kubectl", Suffix: "=" + k8sVersion + "-00"}, + plan.DependOn("upgrade:node-kubelet")) + b.AddResource( + "upgrade:node-install-kubeadm", + &resource.Deb{Name: "kubeadm", Suffix: "=" + k8sVersion + "-00"}, + plan.DependOn("upgrade:node-kubectl")) + } // // For secondary masters @@ -629,22 +657,10 @@ func (a *MachineActuator) kubeadmUpOrDowngrade(machine *clusterv1.Machine, node &resource.Run{Script: object.String(fmt.Sprintf("kubeadm upgrade node config --kubelet-version %s", k8sVersion))}, plan.DependOn("upgrade:node-install-kubeadm")) } - b.AddResource( - "upgrade:node-kubelet", - &resource.RPM{Name: "kubelet", Version: k8sVersion, DisableExcludes: "kubernetes"}, - plan.DependOn("upgrade:node-kubeadm-upgrade")) b.AddResource( "upgrade:node-restart-kubelet", &resource.Run{Script: object.String("systemctl restart kubelet")}, - plan.DependOn("upgrade:node-kubelet")) - b.AddResource( - "upgrade:node-kubectl", - &resource.RPM{Name: "kubectl", Version: k8sVersion, DisableExcludes: "kubernetes"}, - plan.DependOn("upgrade:node-restart-kubelet")) - b.AddResource( - "upgrade:node-lock-kubernetes", - &resource.Run{Script: object.String("yum versionlock add 'kube*' || true")}, - plan.DependOn("upgrade:node-kubectl")) + plan.DependOn("upgrade:node-kubeadm-upgrade")) p, err := b.Plan() if err != nil { diff --git a/pkg/apis/wksprovider/machine/crds/crds_vfsdata.go b/pkg/apis/wksprovider/machine/crds/crds_vfsdata.go index 2c13f662..3375cea2 100644 --- a/pkg/apis/wksprovider/machine/crds/crds_vfsdata.go +++ b/pkg/apis/wksprovider/machine/crds/crds_vfsdata.go @@ -21,39 +21,39 @@ var CRDs = func() http.FileSystem { fs := vfsgen۰FS{ "/": &vfsgen۰DirInfo{ name: "/", - modTime: time.Date(2020, 6, 3, 14, 6, 49, 548960221, time.UTC), + modTime: time.Date(2021, 6, 15, 17, 18, 11, 44738656, time.UTC), }, "/cluster_v1alpha1_cluster.yaml": &vfsgen۰CompressedFileInfo{ name: "cluster_v1alpha1_cluster.yaml", - modTime: time.Date(2020, 6, 3, 14, 6, 49, 548960221, time.UTC), + modTime: time.Date(2021, 6, 15, 17, 18, 11, 43723995, time.UTC), uncompressedSize: 2469, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x56\x4d\x8f\x13\x31\x0c\xbd\xcf\xaf\xb0\x7a\x6f\xa1\x02\x21\x34\x37\xd8\x05\x89\x03\x2b\xb4\x8b\xf6\x82\x38\xb8\x19\x6f\x1b\x9a\x89\x83\xe3\x19\x58\x21\xfe\x3b\x9a\xaf\x6e\xb7\x33\xe9\x2c\x9c\xc9\xa9\xf3\xfc\xec\x38\xcf\x89\x6b\x0c\xf6\x96\x24\x5a\xf6\x39\x60\xb0\xf4\x53\xc9\x37\x5f\x71\xb5\x7f\x1d\x57\x96\x9f\xd5\xeb\x0d\x29\xae\xb3\xbd\xf5\x45\x0e\x17\x55\x54\x2e\xaf\x29\x72\x25\x86\x2e\xe9\xce\x7a\xab\x96\x7d\x56\x92\x62\x81\x8a\x79\x06\x60\x84\xb0\x01\x3f\xdb\x92\xa2\x62\x19\x72\xf0\x95\x73\x19\x80\xc3\x0d\xb9\xd8\x70\x00\x0c\x7b\x15\x76\x8e\x64\xa9\xcc\x6e\xd8\x30\x87\xc5\x7a\xf5\x7c\x91\x01\x78\x2c\x29\x07\xe3\xaa\xa8\x24\x71\xd5\xff\xe8\x69\x59\x0c\x64\x9a\x40\x5b\xe1\x2a\x1c\x68\x83\xb5\xf3\xee\x77\xea\x53\xef\x18\x2d\x12\x5c\x25\xe8\x1e\x82\x67\x00\xd1\x70\xa0\x1c\xae\x1a\xb7\x80\x86\x8a\x06\xab\x36\xd2\x1f\xb5\x0f\x15\x15\xb5\x8a\x39\xfc\xfa\x9d\x01\xd4\xe8\x6c\xd1\x9e\xb4\x33\x72\x20\xff\xe6\xd3\x87\xdb\x17\x37\x66\x47\x25\x76\x20\x40\x10\x0e\x24\x6a\x87\x18\xcd\x3a\x92\xfd\x80\x01\xe8\x7d\x93\x42\x54\xb1\x7e\x7b\x80\xdb\xec\xe7\x48\xc7\xf2\x3f\x26\xf2\xe6\x1b\x19\x3d\xc0\x83\x6c\xc3\x9a\x4a\xae\xad\x4e\xa7\xcc\x15\xe9\x0f\x96\xfd\x63\x5b\xda\xab\xb5\x71\x31\x81\x9e\xf7\x69\x77\xb4\x85\xbc\x75\x6c\xf6\x09\x3b\x80\x55\x2a\x93\xc6\x84\x30\x53\x14\x14\xc1\xfb\x09\x86\xd0\xf7\xca\x0a\x15\x53\x5b\x2c\x8f\xf2\x9b\x30\x4f\x6a\x3d\xac\x48\x52\x5b\x43\x97\x5c\xa2\xf5\x53\xc1\xcf\x66\xde\x7b\xff\xd7\xf4\x09\x51\x97\x07\xb5\x46\x86\xe6\x5a\xa6\xd8\x5d\x65\xb2\x27\x6e\x1f\x84\x6b\x5b\x90\xdc\x9c\x3c\x25\x98\x29\x48\x8d\xae\xa2\x74\xf9\x13\x97\xa7\xf5\x7a\x2f\x5c\xfe\x4b\xfd\x4b\x34\x3b\xeb\xe9\xc2\x61\x4c\x16\x79\x2e\xc6\xf1\x91\xd3\x8c\xbf\xb8\x2a\x89\x83\x9e\x35\x27\x4c\x53\xf7\x60\x79\xd2\xbb\x66\x3b\x62\xd7\xd2\x9f\xd0\x13\x31\xd8\x77\xbe\x08\x6c\xbd\x8e\xb4\x4a\xbc\xa3\xf3\xe2\xee\x38\xea\xb4\xa4\x33\x62\x06\x96\x84\xe3\x1d\x4b\x89\x9a\x83\xf5\xfa\xea\xe5\x99\xd0\xd6\x2b\x6d\xfb\x7f\xc3\xe3\x95\x7e\xaf\xcb\x36\xdd\x09\xb8\x49\x66\x04\xcf\xd6\x72\xdc\x30\x48\x84\xe5\x23\xc5\x88\xdb\xd1\x33\x49\xea\xd1\x3a\x5d\x13\x46\x1e\x75\xd6\xa4\xcf\xe1\x01\x8f\x2a\x7f\x26\xf3\x13\xb8\x1e\x86\xa6\x7a\x8d\x2e\xec\x70\x9d\x3d\xdc\x23\x34\x86\x82\x52\x71\x75\x3a\x82\x2c\x16\x8f\xa6\x8f\xf6\xd3\xb0\x2f\xda\x11\x2a\xe6\xf0\xe5\x6b\x33\x74\x28\x0b\x15\xfd\x74\xd0\x81\x7f\x02\x00\x00\xff\xff\x28\xd8\xc3\xb7\xa5\x09\x00\x00"), }, "/cluster_v1alpha1_machine.yaml": &vfsgen۰CompressedFileInfo{ name: "cluster_v1alpha1_machine.yaml", - modTime: time.Date(2020, 6, 3, 14, 6, 49, 548960221, time.UTC), + modTime: time.Date(2021, 6, 15, 17, 18, 11, 44391266, time.UTC), uncompressedSize: 2719, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xe4\x56\xcd\x8e\xd3\x30\x10\xbe\xe7\x29\x46\xbd\xb7\x50\x71\x41\xb9\xa1\x45\x48\x1c\x76\x59\xed\xc2\x5e\x10\x87\xa9\x3d\x6d\xcd\x3a\xb6\x19\x4f\x22\x56\x88\x77\x47\x4e\x9a\xfe\x26\x6e\x2b\xc1\x09\xdf\x32\x33\xdf\x37\xbf\x9e\x18\x83\x79\x22\x8e\xc6\xbb\x12\x30\x18\xfa\x29\xe4\xd2\x57\x9c\x3d\xbf\x8d\x33\xe3\x5f\x35\xf3\x05\x09\xce\x8b\x67\xe3\x74\x09\x37\x75\x14\x5f\x3d\x50\xf4\x35\x2b\x7a\x4f\x4b\xe3\x8c\x18\xef\x8a\x8a\x04\x35\x0a\x96\x05\x80\x62\xc2\x24\xfc\x6c\x2a\x8a\x82\x55\x28\xc1\xd5\xd6\x16\x00\x16\x17\x64\x63\xb2\x01\x50\xde\x09\x7b\x6b\x89\xa7\xe2\xbd\xed\x1d\x96\x30\x99\xcf\x5e\x4f\x0a\x00\x87\x15\x95\x50\xa1\x5a\x1b\x47\x71\xa6\x6c\x1d\x85\x78\x63\x56\xc4\x40\x2a\x11\xad\xd8\xd7\xa1\x84\x23\x6d\x87\xde\x78\xea\x42\xbf\xed\x88\x5a\x49\xb0\x35\xa3\xdd\x91\x17\x00\x51\xf9\x40\x25\xdc\x25\x58\x40\x45\x3a\xc9\xea\x05\x6f\x52\xdd\x50\x45\x41\xa9\x63\x09\xbf\x7e\x17\x00\x0d\x5a\xa3\xdb\x4c\x3b\xa5\x0f\xe4\xde\xdd\x7f\x7c\x7a\xf3\xa8\xd6\x54\x61\x27\x04\x08\xec\x03\xb1\x98\x9e\x23\x9d\xbd\xb2\x6f\x65\x00\xf2\x92\x42\x88\xc2\xc6\xad\xb6\xe2\x36\xfa\x73\x46\xfb\xe5\x3f\x34\xf4\x8b\xef\xa4\x64\x2b\xee\xcb\xd6\x9f\xa1\xe0\x36\xdd\x59\x9a\xd5\x63\x9b\xfb\xa1\x66\x84\x78\x2c\x8a\x2c\x20\xb0\x6f\x8c\x26\x7e\x3c\x8a\x2a\x17\x59\x3a\x0d\xda\xfa\x24\xac\xac\xa7\x2d\xea\x03\xfb\x6a\x08\x99\x73\xd7\xe6\xd6\x8d\xca\x8d\xc5\x38\x62\x71\x9e\x63\x3f\xe5\x71\x8b\x91\x16\x5f\x91\x68\x56\x3d\xaa\x12\x34\x4e\x4e\x22\x37\x42\xd5\x40\x3a\x67\x1d\x20\x33\xbe\x1c\x68\x9a\x6e\xe0\x4f\xc8\x72\x55\xdb\x2c\x89\x7b\x8b\x2e\xd3\xef\x91\x4a\x3d\xd7\x0b\xb2\x24\x57\xe2\x98\x7e\xd4\x86\x49\x1f\xc3\xa6\x3d\xdf\x65\xf5\x1c\xa2\x99\x1e\x0c\xfc\xd9\xab\xda\xed\x9a\x0b\x2e\x2b\x6a\xcd\x14\xe3\x69\x01\xff\x5e\xf3\x94\x77\xba\xdd\xf4\xff\xd0\x07\x31\x7b\xbe\xa5\x18\x71\x35\xb2\x73\x06\x1a\xd6\x82\x1e\x08\xe3\xe1\x2a\xcd\x62\x2c\x46\xf9\x14\x88\xf7\x76\xf7\xee\xe4\xc6\x51\x53\x54\x6c\xc2\x10\x2c\xeb\xb0\x77\xfa\x25\x68\x94\xd3\xd1\x4a\x67\xe9\xb9\x42\x29\x21\x19\x4c\xc5\x54\x74\x2d\x7f\x1a\x97\xeb\xef\x48\xab\xbc\x0e\x34\xda\xd9\x4c\x86\xe7\xb2\x1b\x75\xe7\xbc\xa6\x07\x5a\x5e\xfe\x47\x59\x63\xbc\x7c\x78\xb6\xd7\xf1\xe4\xaa\x65\x9d\xfc\x5f\x9b\xec\x48\xdc\xf4\xcf\xc5\x66\x8e\x36\xac\x71\x5e\xec\x16\x15\x2a\x45\x41\x48\xdf\x1d\x3f\xbe\x26\x93\x83\x77\x57\xfb\xb9\xb7\x52\xe0\xeb\xb7\xf4\xdc\x12\xcf\xa4\x9f\xfa\xe2\x26\xe1\x9f\x00\x00\x00\xff\xff\x8b\x40\xfd\xc2\x9f\x0a\x00\x00"), }, "/cluster_v1alpha1_machineclass.yaml": &vfsgen۰CompressedFileInfo{ name: "cluster_v1alpha1_machineclass.yaml", - modTime: time.Date(2020, 6, 3, 14, 6, 49, 548960221, time.UTC), + modTime: time.Date(2021, 6, 15, 17, 18, 11, 44552181, time.UTC), uncompressedSize: 667, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x52\xb1\x8e\x14\x31\x0c\xed\xf3\x15\xd6\xf6\x37\x30\xa2\x41\xe9\xd0\xd1\x50\x70\x42\x1c\xba\x06\x51\x78\x13\x73\x1b\x2e\x13\x07\xdb\x19\xc1\xdf\xa3\xcc\xcc\x8e\x76\xb7\xe0\xd2\xf9\xe5\xe5\xbd\xbc\x27\x63\x4d\x4f\x24\x9a\xb8\x78\xc0\x9a\xe8\x8f\x51\xe9\x93\x0e\x2f\xef\x75\x48\xfc\x66\x1e\x8f\x64\x38\xba\x97\x54\xa2\x87\xfb\xa6\xc6\xd3\x57\x52\x6e\x12\xe8\x23\xfd\x4c\x25\x59\xe2\xe2\x26\x32\x8c\x68\xe8\x1d\x40\x10\xc2\x0e\x7e\x4b\x13\xa9\xe1\x54\x3d\x94\x96\xb3\x03\xc8\x78\xa4\xac\x9d\x03\x10\xb8\x98\x70\xce\x24\x77\xc6\x9c\xcf\x86\x1e\x0e\xe3\xf0\xf6\xe0\x00\x0a\x4e\xe4\x61\xc2\x70\x4a\x85\x42\x46\x55\xd2\x21\xe4\xa6\x46\xb2\x91\x9d\x56\x0a\x5d\xee\x59\xb8\x55\x0f\x37\xb7\xab\xc6\xe6\xb7\x06\xf8\xbc\xca\xdd\x77\xb9\x05\xae\xb9\x09\xe6\x5b\x1f\x07\xa0\x81\x2b\x79\x78\xe8\x0a\x15\x03\x45\x07\x30\x63\x4e\x71\xc9\xb6\x6a\x72\xa5\xf2\xe1\xcb\xa7\xa7\x77\x8f\xe1\x44\x13\xae\x20\x40\x15\xae\x24\x96\xce\xd6\xfd\x5c\x14\xbd\x63\x00\xf6\xb7\x7b\xa8\x49\x2a\xcf\x3b\xbc\xfc\xf4\x35\xd2\x65\xe1\xd7\x44\x3e\xfe\xa2\x60\x3b\x5c\x85\xe7\x14\x49\x1e\xb7\xaa\xfe\x43\x16\xfa\xdd\x92\xd0\x6e\x7e\x77\xf5\xb8\xe7\x3f\xaf\xca\x3c\x62\xae\x27\x1c\x9d\x1a\x5a\x5b\x62\x62\x08\x54\x8d\xe2\xc3\x6d\xe5\x87\xc3\x55\xd1\xcb\x18\xb8\xc4\x65\x71\xd4\xc3\xf7\x1f\xbd\x6d\x63\xa1\xb8\x35\xb4\x82\xff\x02\x00\x00\xff\xff\x7d\x29\x91\x1c\x9b\x02\x00\x00"), }, "/cluster_v1alpha1_machinedeployment.yaml": &vfsgen۰CompressedFileInfo{ name: "cluster_v1alpha1_machinedeployment.yaml", - modTime: time.Date(2020, 6, 3, 14, 6, 49, 548960221, time.UTC), + modTime: time.Date(2021, 6, 15, 17, 18, 11, 44670881, time.UTC), uncompressedSize: 3749, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x57\x4b\x8f\xd3\x30\x10\xbe\xe7\x57\x58\xbd\xb7\x50\x16\x21\x94\x1b\xda\x15\x0f\x09\x96\x55\xcb\xee\x05\x71\x98\xd8\xd3\xd4\xac\x63\x1b\x7b\x12\x6d\x85\xf8\xef\xc8\x79\xd1\x64\x93\x26\x8b\x8a\xf0\xa9\x99\xf9\xfc\xcd\xb3\xf6\x18\xac\xbc\x43\xe7\xa5\xd1\x31\x03\x2b\xf1\x81\x50\x87\x2f\xbf\xba\x7f\xed\x57\xd2\x3c\x2b\xd6\x09\x12\xac\xa3\x7b\xa9\x45\xcc\x2e\x73\x4f\x26\xdb\xa0\x37\xb9\xe3\x78\x85\x3b\xa9\x25\x49\xa3\xa3\x0c\x09\x04\x10\xc4\x11\x63\xdc\x21\x04\xe1\x17\x99\xa1\x27\xc8\x6c\xcc\x74\xae\x54\xc4\x98\x82\x04\x95\x0f\x18\xc6\xb8\xd1\xe4\x8c\x52\xe8\x96\x64\x8c\x6a\x0c\xc6\x6c\xb1\x5e\x3d\x5f\x44\x8c\x69\xc8\x30\x66\x19\xf0\xbd\xd4\x28\xd0\x2a\x73\xc8\x50\x93\x5f\x71\x95\x7b\x42\x57\x6f\x88\xbc\x45\x1e\x28\x53\x67\x72\x1b\xb3\x9e\xb6\xe2\xa9\x6d\x56\x41\x7c\xaa\x28\xaf\x5a\xca\x52\x67\x55\xee\x40\x0d\x19\x8c\x18\xf3\xdc\x58\x8c\xd9\x75\xa0\xb2\xc0\x51\x04\x59\x9e\xb8\x3a\x11\x35\xbd\xe7\xa0\xb0\xfa\x59\xc7\xba\x45\x85\x9c\x8c\xbb\x01\xda\xc7\x6c\xe5\x09\x28\xf7\xab\x8e\xaa\x86\x87\x28\x36\x68\x95\xe4\xe0\x1b\xb4\x45\xbe\x72\xb5\xac\x81\x95\x0c\x7d\x60\x45\xdb\x81\x56\xb2\x98\xfd\xfc\x15\x31\x56\x80\x92\xa2\xac\x49\xe5\x9d\xb1\xa8\xdf\xdc\x7c\xb8\xbb\xd8\xf2\x3d\x66\xd0\xb8\x6c\x9d\xb1\xe8\x48\x36\xf1\x84\x75\xd4\x20\xad\x8c\x31\x3a\x84\x74\x78\x72\x52\xa7\xad\xb8\xcc\xee\x14\xe8\xb8\x51\xba\x40\x93\x7c\x47\x4e\xad\xb8\x29\x6b\xb3\x86\x9c\x2b\x09\xa5\xde\x20\x88\xc3\x16\xb9\xd1\xa2\xa7\x64\x6c\x67\x5c\x06\x14\x33\xa9\xe9\xe2\x45\x4f\x57\xd9\x95\x9a\x30\x45\xd7\xd1\x59\xc8\x3d\x8a\x3e\x57\x85\x4f\x8c\x51\x08\xba\x8b\x77\x26\x75\xe8\xfd\x15\x82\x50\x52\xe3\x59\x9d\x69\xea\x7a\x2e\xb6\x42\x86\x72\xbe\x97\x9e\x8c\x3b\x7c\x94\x99\xa4\xf3\x30\xfb\xba\xa3\x87\xd3\xd6\x2b\x6f\xb9\x81\x1c\x10\xa6\x87\xfe\x86\xb1\x52\x97\xee\x1b\xa5\xa4\x4e\x6f\xad\x00\xc2\xc7\xea\xd3\x9b\xc3\xca\xe0\x61\x9b\xbb\x74\x70\x6f\x58\x46\xe3\xe7\xdd\x98\x72\x39\xdc\xd4\xc3\xa0\xa1\x1c\x1d\x79\x71\xab\xa1\x00\xa9\x20\x51\xff\xd5\x97\xd1\xea\xb4\xca\xd1\x4d\x83\x96\x47\xf9\x08\x33\xab\x06\x8a\x76\xaa\x60\x43\xa7\xc5\x2c\xc7\xfb\xa7\xc7\x1c\x63\xac\xba\x95\x76\x32\xdd\x96\xa7\xfa\x58\xe2\x4f\x1a\x9e\xf2\x7a\x16\x81\x75\xa6\x90\x02\xdd\x76\x24\x8a\x39\x91\x84\x55\x80\xca\x47\xc3\x98\xe5\x49\xcb\xf2\xd6\x99\xec\x14\xd3\x1c\x77\x58\xd9\xf8\xe5\xf5\x7a\xa9\xc0\x4f\x20\xe7\x73\xb2\xa3\x94\x4d\x23\x4f\x76\xef\x30\x74\x22\x41\xb3\x60\x93\x10\x02\xa9\x69\x34\x52\x49\x98\x9d\x48\xc3\x6c\x07\xc0\x39\x38\x0c\x22\x8a\xea\x9a\x1f\x35\x32\xa7\x1a\xf5\x50\x77\xa3\x40\xcf\xe8\xbb\x89\x0a\xdc\xe7\x09\x2a\x7c\x74\x39\x3d\x91\xc7\xe1\x8f\x5c\xba\xc7\x97\x79\xb3\x96\x8d\x9d\xbf\xab\xdb\x29\xfa\x65\xe7\x8f\xfc\xb4\x23\x6c\x44\x35\x64\x6e\xd9\xde\xbc\x1d\x61\x73\xde\x4e\x0e\x5a\xd5\xa4\x38\x63\xd4\x6a\xef\xab\xcd\x59\x27\x12\x93\x78\x74\x05\x8a\x77\xa8\xd1\x1d\x4d\xa9\x83\xbc\xaf\x5e\x3e\x61\xd2\x01\x71\x38\xaf\xab\xe7\x1d\xc5\x72\xfd\x8f\x32\x9a\x97\xd3\x91\x38\x27\x69\xaf\x75\x8a\xe6\xd1\x58\xac\x41\xd9\x3d\xac\xa3\x3f\x6d\x04\x9c\xa3\x25\x14\xd7\xfd\x87\xd7\x62\xd1\x79\x69\x95\x9f\x61\x4e\x2e\x9f\x90\x3e\x66\x5f\xbf\x85\x67\x15\x19\x87\xe2\xae\x39\x8c\x82\xf0\x77\x00\x00\x00\xff\xff\xa6\xa2\xeb\xe1\xa5\x0e\x00\x00"), }, "/cluster_v1alpha1_machineset.yaml": &vfsgen۰CompressedFileInfo{ name: "cluster_v1alpha1_machineset.yaml", - modTime: time.Date(2020, 6, 3, 14, 6, 49, 548960221, time.UTC), + modTime: time.Date(2021, 6, 15, 17, 18, 11, 44789565, time.UTC), uncompressedSize: 3044, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x56\xcd\x8e\xdb\x36\x10\xbe\xeb\x29\x06\xbe\xdb\xad\xbb\x45\x51\xe8\x56\x6c\xd1\xa2\x40\x77\xb1\xb0\x83\xbd\x04\x39\x8c\xa9\xb1\xcd\x2c\x45\x32\xc3\x91\x10\x23\xc8\xbb\x07\xd4\x8f\x63\x69\x25\x4b\x9b\x98\x27\x69\xe6\xe3\x37\x3f\x1c\x72\x06\xbd\x7e\x26\x0e\xda\xd9\x14\xd0\x6b\xfa\x2c\x64\xe3\x5f\x58\xbd\xfc\x19\x56\xda\xfd\x52\xae\x77\x24\xb8\x4e\x5e\xb4\xcd\x52\xb8\x2f\x82\xb8\x7c\x43\xc1\x15\xac\xe8\x6f\xda\x6b\xab\x45\x3b\x9b\xe4\x24\x98\xa1\x60\x9a\x00\x28\x26\x8c\xc2\x77\x3a\xa7\x20\x98\xfb\x14\x6c\x61\x4c\x02\x60\x70\x47\x26\x44\x0c\x80\x72\x56\xd8\x19\x43\xbc\x14\xe7\x4c\x6b\x30\x85\xc5\x7a\xf5\xeb\x22\x01\xb0\x98\x53\x0a\x39\xaa\xa3\xb6\x14\x48\xc2\x4a\x99\x22\x08\x71\x83\x4c\x82\x27\x15\xb9\x0e\xec\x0a\x9f\x42\x4f\x5b\x13\x34\xc6\x6a\xef\x1f\x6a\xae\x2d\x49\x25\xf4\xa6\x60\x34\x1d\x13\x09\x40\x50\xce\x53\x0a\x8f\x71\xb3\x47\x45\x59\x94\x15\x3b\x6e\x62\x6e\x08\x83\x42\x43\xf5\x67\x13\xd6\x96\x0c\x29\x71\xfc\x84\x72\x4c\x61\x15\x04\xa5\x08\xab\x8e\xaa\x81\x47\xbf\x37\xe4\x8d\x56\x18\x5a\xb4\x27\xb5\xe2\x46\xd6\xc2\x2a\x86\x3e\xb0\xa6\xed\x40\x6b\x59\x0a\x5f\xbe\x26\x00\x25\x1a\x9d\x55\xe9\xaf\xbd\x73\x9e\xec\x5f\x4f\xff\x3d\xdf\x6d\xd5\x91\x72\x6c\x5d\xf6\xec\x3c\xb1\xe8\x36\x9e\xb8\x2e\x6a\xe1\x2c\x03\x90\x53\x4c\x47\x10\xd6\xf6\x70\x16\x57\xf9\x9c\x02\x5d\xd6\x44\x17\xe8\x76\x1f\x49\xc9\x59\xdc\x1e\x64\xbb\x86\x9c\xab\x08\xb5\xdd\x10\x66\xa7\x2d\x29\x67\xb3\x9e\x12\x60\xef\x38\x47\x49\x41\x5b\xb9\xfb\xad\xa7\xab\xed\x6a\x2b\x74\x20\xee\xe8\xda\x54\xde\x86\x2d\x34\x47\xdd\x67\x1b\x8c\xbb\x52\x50\xee\x0d\x0a\xf5\x37\x8c\xe5\x00\x46\x12\x3b\x69\x08\x06\x12\x3d\xc7\x18\xd4\x77\x75\xaf\x0f\xdb\xea\x02\x0c\x23\x26\x0c\x4f\x79\x3d\x8b\xc0\xb3\x2b\x75\x46\xbc\x1d\x89\x62\x4e\x24\x71\x95\x68\x8a\xd1\x30\x66\x79\x72\x66\xf9\x87\x5d\x7e\x8d\x69\x8e\x3b\x71\x35\x4f\xd0\xbd\xc1\x30\x81\x9c\xcf\x09\x17\x29\x9b\x46\x8e\xdc\xe1\x6b\xd0\x89\x04\xcd\x82\x4d\x42\x04\xb5\x95\xd1\x48\xb5\x50\x7e\x25\x0d\xb3\x1d\x40\x66\x3c\x0d\x22\xca\xfa\x45\x1c\x35\x32\xe7\x34\x9a\x56\xf7\x64\xd0\xce\xa8\xbb\x89\x13\x78\x29\x76\x64\x48\x7e\x92\x87\xe9\x53\xa1\x99\xb2\x31\x9a\x65\x6b\xe7\xc7\xce\xed\x1a\xfd\xb2\x73\x91\xdf\xf6\x84\x8d\xa8\x86\xcc\x2d\xcf\x6f\xf1\x64\xfb\xa9\xfb\xe7\x8c\x06\x84\x25\x6a\x83\x3b\x43\x9b\x9b\x36\x0d\x62\x76\xfc\x40\x21\xe0\xe1\x55\x7d\x8c\x9e\x65\xb5\x69\x43\x18\xba\xed\xfa\xea\x9e\x7d\x61\xcc\xe9\xff\x38\x92\x50\x76\xdb\x10\xdc\x2e\x10\x97\x94\xfd\x4b\x96\xf8\x62\xfc\x18\xe4\xfd\xe3\xf7\x37\x74\x67\xcc\x4e\xb7\x75\xf5\x96\x0d\x7f\xb8\xf0\x7a\x83\x1c\xbc\x2e\xbc\xb2\x9d\xb9\xcb\x35\x1a\x7f\xc4\x75\xf2\xbd\x08\x51\x29\xf2\x42\xd9\x63\x7f\x7c\x5d\x2c\x3a\x63\x6b\xf5\x1b\x07\xa1\x6a\x02\x0f\x29\xbc\xff\x10\x47\x55\x71\x4c\xd9\x73\xfb\x6a\x45\xe1\xb7\x00\x00\x00\xff\xff\x32\xcc\xbc\x93\xe4\x0b\x00\x00"), diff --git a/pkg/plan/resource/os.go b/pkg/plan/resource/os.go index f02f8646..604d1bb1 100644 --- a/pkg/plan/resource/os.go +++ b/pkg/plan/resource/os.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" + reflections "github.com/oleiade/reflections" "github.com/pkg/errors" log "github.com/sirupsen/logrus" "github.com/weaveworks/wksctl/pkg/plan" - reflections "gopkg.in/oleiade/reflections.v1" ) // OS is a set of OS properties. diff --git a/pkg/utilities/manifest/manifest.go b/pkg/utilities/manifest/manifest.go index 45c860cb..65cd99bc 100644 --- a/pkg/utilities/manifest/manifest.go +++ b/pkg/utilities/manifest/manifest.go @@ -8,9 +8,9 @@ import ( "strings" "sync" + "github.com/oleiade/reflections" "github.com/pkg/errors" bmv1alpha1 "github.com/weaveworks/wksctl/pkg/baremetalproviderspec/v1alpha1" - "gopkg.in/oleiade/reflections.v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/test/integration/test/assets/repo-config.yaml b/test/integration/test/assets/repo-config.yaml index 52495c77..355da918 100644 --- a/test/integration/test/assets/repo-config.yaml +++ b/test/integration/test/assets/repo-config.yaml @@ -99,27 +99,48 @@ data: gpgkey=https://download.docker.com/linux/centos/gpg cloud-google-com.gpg.b64: | - mQENBFUd6rIBCAD6mhKRHDn3UrCeLDp7U5IE7AhhrOCPpqGF7mfTemZYHf/5JdjxcOxoSFlK7zwm - Fr3lVqJ+tJ9L1wd1K6P7RrtaNwCiZyeNPf/Y86AJ5NJwBe0VD0xHTXzPNTqRSByVYtdN94NoltXU - YFAAPZYQls0x0nUD1hLMlOlC2HdTPrD1PMCnYq/NuL/Vk8sWrcUt4DIS+0RDQ8tKKe5PSV0+Pnma - JvdF5CKawhh0qGTklS2MXTyKFoqjXgYDfY2EodI9ogT/LGr9Lm/+u4OFPvmN9VN6UG+s0DgJjWvp - bmuHL/ZIRwMEn/tpuneaLTO7h1dCrXC849PiJ8wSkGzBnuJQUbXnABEBAAG0QEdvb2dsZSBDbG91 - ZCBQYWNrYWdlcyBBdXRvbWF0aWMgU2lnbmluZyBLZXkgPGdjLXRlYW1AZ29vZ2xlLmNvbT6JAT4E - EwECACgFAlUd6rICGy8FCQWjmoAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEDdGwginMXsP - cLcIAKi2yNhJMbu4zWQ2tM/rJFovazcY28MF2rDWGOnc9giHXOH0/BoMBcd8rw0lgjmOosBdM2JT - 0HWZIxC/Gdt7NSRA0WOlJe04u82/o3OHWDgTdm9MS42noSP0mvNzNALBbQnlZHU0kvt3sV1Ysnrx - ljoIuvxKWLLwren/GVshFLPwONjw3f9Fan6GWxJyn/dkX3OSUGaduzcygw51vksBQiUZLCD2Tlxy - r9NvkZYTqiaWW78L6regvATsLc9L/dQUiSMQZIK6NglmHE+cuSaoK0H4ruNKeTiQUw/EGFaLecay - 6Qy/s3Hk7K0QLd+gl0hZ1w1VzIeXLo2BRlqnjOYFX4CwAgADmQENBFrBaNsBCADrF18KCbsZlo4N - jAvVecTBCnp6WcBQJ5oSh7+E98jX9YznUCrNrgmeCcCMUvTDRDxfTaDJybaHugfba43nqhkbNpJ4 - 7YXsIa+YL6eEE9emSmQtjrSWIiY+2YJYwsDgsgckF3duqkb02OdBQlh6IbHPoXB6H//b1PgZYsom - B+841XW1LSJPYlYbIrWfwDfQvtkFQI90r6NknVTQlpqQh5GLNWNYqRNrGQPmsB+NrUYrkl1nUt1L - RGu+rCe4bSaSmNbwKMQKkROE4kTiB72DPk7zH4Lm0uo0YFFWG4qsMIuqEihJ/9KNX8GYBr+tWgyL - ooLlsdK3l+4dVqd8cjkJM1ExABEBAAG0QEdvb2dsZSBDbG91ZCBQYWNrYWdlcyBBdXRvbWF0aWMg - U2lnbmluZyBLZXkgPGdjLXRlYW1AZ29vZ2xlLmNvbT6JAT4EEwECACgFAlrBaNsCGy8FCQWjmoAG - CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEGoDCyG6B/T78e8H/1WH2LN/nVNhm5TS1VYJG8B+ - IW8zS4BqyozxC9iJAJqZIVHXl8g8a/Hus8RfXR7cnYHcg8sjSaJfQhqO9RbKnffiuQgGrqwQxuC2 - jBa6M/QKzejTeP0Mgi67pyrLJNWrFI71RhritQZmzTZ2PoWxfv6b+Tv5v0rPaG+ut1J47pn+kYgt - UaKdsJz1umi6HzK6AacDf0C0CksJdKG7MOWsZcB4xeOxJYuy6NuO6KcdEz8/XyEUjIuIOlhYTd0h - H8E/SEBbXXft7/VBQC5wNq40izPi+6WFK/e1O42DIpzQ749ogYQ1eodexPNhLzekKR3XhGrNXJ95 - r5KO10VrsLFNd8KwAgAD + xsBNBF/Jfl4BCADTPUXdkNu057X+P3STVxCzJpU2Mn+tUamKdSdVambGeYFINcp/EGwNGhdb0a1B + bHs1SWYZbzwh4d6+p3k4ABzVMO+RpMu/aBx9E5aOn5c8GzHjZ/VEaheqLLhSUcSCzChSZcN5jz0h + TGhmAGaviMt6RMzSfbIhZPj1kDzBiGd0Qwd/rOPnJr4taPruR3ecBjhHti1/BMGd/lj0F7zQnCjp + 7PrqgpEPBT8jo9wX2wvOyXswSI/GsfbFiaOJfDnYengaEg8sF+u3WOs0Z20cSr6kS76KHpTfa3Jj + YsfHt8NDw8w4e3H8PwQzNiRP9tXeMASKQz3emMj/ek6HxjihY9qFABEBAAHNumdMaW51eCBSYXB0 + dXJlIEF1dG9tYXRpYyBTaWduaW5nIEtleSAoLy9kZXBvdC9nb29nbGUzL3Byb2R1Y3Rpb24vYm9y + Zy9jbG91ZC1yYXB0dXJlL2tleXMvY2xvdWQtcmFwdHVyZS1wdWJrZXlzL2Nsb3VkLXJhcHR1cmUt + c2lnbmluZy1rZXktMjAyMC0xMi0wMy0xNl8wOF8wNS5wdWIpIDxnbGludXgtdGVhbUBnb29nbGUu + Y29tPsLAaAQTAQgAHAUCX8l+XgkQi1fFwoNvS+sCGwMFCQPDCrACGQEAAEF6CACaekro6aUJJd3m + VtrtLOOewV8et1jep5ewmpOrew/pajRVBeIbV1awVn0/8EcenFejmP6WFcdCWouDVIS/QmRFQV9N + 6YXN8PiwalrRV3bTKFBHkwa1cEH4AafCGo0cDvJb8N3JnM/Rmb1KSGKr7ZXpmkLtYVqr6Hgzl+sn + rlH0Xwsl5r3SyvqBgvRYTQKZpKqmBEd1udieVoLSF988kKeNDjFa+Q1SjZPGW+XukgE8kBUbSDx8 + Y8q6Cszh3VVY+5JUeqimRgJ2ADY2/3lEtAZOtmwcBlhY0cPWVqga14E7kTGSWKC6W96Nfy9K7L4Y + pp8nTMErus181aqwwNfMqnpnzsBNBF/Jfl4BCADDSh+KdBeNjIclVVnRKt0QT5593yF4WVZt/TgN + uaEZ5vKknooVVIq+cJIfY/3lUqq8Te4dEjodtFyKe5Xuego6qjzs8TYFdCAHXpXRoUolT14m+qkJ + 8rhSrpN0TxIjWJbJdm3NlrgTam5RKJw3ShypNUxyolnHelXxqyKDCkxBSDmR6xcdft3wdQl5IkIA + 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 + NEj2nJu128U2JUB8CQhGvR3+P57ogWscFyrnP8s=