diff --git a/hack/generate-asset-hashes.sh b/hack/generate-asset-hashes.sh index 4b78ebe1ae381..708c4797d8f51 100755 --- a/hack/generate-asset-hashes.sh +++ b/hack/generate-asset-hashes.sh @@ -88,12 +88,16 @@ EOF done } +# Generate k8s hashes. +# The first argument is the major and minor version, the second is the maximum patch version. generate_k8s_hashes 1.25 16 generate_k8s_hashes 1.26 15 generate_k8s_hashes 1.27 16 -generate_k8s_hashes 1.28 14 -generate_k8s_hashes 1.29 9 -generate_k8s_hashes 1.30 5 -generate_k8s_hashes 1.31 1 +generate_k8s_hashes 1.28 15 +generate_k8s_hashes 1.29 11 +generate_k8s_hashes 1.30 7 +generate_k8s_hashes 1.31 3 +# Generate runc hashes. +# The first argument is the major and minor version, the second is the maximum patch version. generate_runc_hashes 1.1 14 diff --git a/pkg/apis/kops/util/taints.go b/pkg/apis/kops/util/taints.go index 4ead2959d9b1a..a1fdd245e5321 100644 --- a/pkg/apis/kops/util/taints.go +++ b/pkg/apis/kops/util/taints.go @@ -21,7 +21,7 @@ import ( "strings" ) -// parseTaint takes a string and returns a map of its value +// ParseTaint takes a string and returns a map of its value // it mimics the function from https://github.com/kubernetes/kubernetes/blob/master/pkg/util/taints/taints.go // but returns a map instead of a v1.Taint func ParseTaint(st string) (map[string]string, error) { diff --git a/pkg/assets/assetdata/README.md b/pkg/assets/assetdata/README.md index 7a4020c98b370..7274af3e5322d 100644 --- a/pkg/assets/assetdata/README.md +++ b/pkg/assets/assetdata/README.md @@ -8,4 +8,4 @@ e.g. by [kpromo](https://github.com/kubernetes-sigs/promo-tools/blob/main/docs/f However, this should be treated as an implementation detail. Currently many hash files are manually curated. Some of them can be automatically generated, -and we have scripts named `generate-.sh` to generate them. \ No newline at end of file +and we have a script `hack/generate-asset-hashes.sh` to generate them. \ No newline at end of file diff --git a/pkg/assets/assetdata/k8s-1.28.yaml b/pkg/assets/assetdata/k8s-1.28.yaml index 47a0fb5948a05..b956b0af3dbfc 100644 --- a/pkg/assets/assetdata/k8s-1.28.yaml +++ b/pkg/assets/assetdata/k8s-1.28.yaml @@ -859,3 +859,60 @@ files: sha256: 3abc8a9fdc4f2fa7a45995be4be5f6b4797f99205cd605c5721a346d7ac65a7e - name: v1.28.14/bin/linux/arm64/mounter sha256: 4fdf92823b51d0bbbda9d332f53ae016e6a544b61003a72fbfa17c58ec290321 +# kubernetes 1.28.15 +- name: v1.28.15/bin/darwin/amd64/kubectl + sha256: 3180c84131002037d60fe7322794c20297d0e1b1514eaea20e33f77a00d8f2f4 +- name: v1.28.15/bin/darwin/amd64/kubectl-convert + sha256: e71c013d4b31e633c695899b44853811226e50978f3de24db15ce9a9bcb48d76 +- name: v1.28.15/bin/darwin/arm64/kubectl + sha256: 06a276bdb6da95af148d589f6c983ec8ea10c38f277ced6d97123938c8146078 +- name: v1.28.15/bin/darwin/arm64/kubectl-convert + sha256: 576aa91804457593cbd0f40bf3da8f34f6589fcd8f5b878be2b38a655796eb0e +- name: v1.28.15/bin/linux/amd64/apiextensions-apiserver + sha256: a2f8f7cf06c39a09f04796613b8babb61241a7a047e7c354c7fc18e78e2679b3 +- name: v1.28.15/bin/linux/amd64/kube-aggregator + sha256: 81c4969e2c30036565d85a7cc446417dbc590f951b0f09e52b126178602f8369 +- name: v1.28.15/bin/linux/amd64/kube-apiserver + sha256: a6bed06d5307bb1b8a4e5bdc8eaeb852a40a19a694579f9aa9080cbdaf62b310 +- name: v1.28.15/bin/linux/amd64/kube-controller-manager + sha256: e825d8e073085a72f093ee313348ffa59c97580470998db9a4b86b12be27f988 +- name: v1.28.15/bin/linux/amd64/kube-log-runner + sha256: ed57505967ab4a1e8a2fb5cd838cf82ca70803d8fd17272083eccea9c4c1e595 +- name: v1.28.15/bin/linux/amd64/kube-proxy + sha256: d800f4116328a906ced61eb37d1260d9d415c15dd707ccfc0ed132ca22605609 +- name: v1.28.15/bin/linux/amd64/kube-scheduler + sha256: 52d79cc61368f8f9f7e72483169ae52b9ad97e99f4e158b7862adbf0496ee269 +- name: v1.28.15/bin/linux/amd64/kubeadm + sha256: 0555b2c2fd30efcdb44b7fba5460c3dc3d3e39f2301e1eef7894a9f8976e1b4c +- name: v1.28.15/bin/linux/amd64/kubectl + sha256: 1f7651ad0b50ef4561aa82e77f3ad06599b5e6b0b2a5fb6c4f474d95a77e41c5 +- name: v1.28.15/bin/linux/amd64/kubectl-convert + sha256: e10df412a54161061b91f948d74cb9852d8ed69c3748f2661488173701f4a076 +- name: v1.28.15/bin/linux/amd64/kubelet + sha256: b07a27fd5bd2419c9c623de15c1dd339af84eb27e9276c81070071065db00036 +- name: v1.28.15/bin/linux/amd64/mounter + sha256: a494eb3dfdf5415f92bf7a693deb60d1379d1356ca0f6f25634d6901168e6d80 +- name: v1.28.15/bin/linux/arm64/apiextensions-apiserver + sha256: 1ce03c95688ca1bbf305bd7dbce3adb98fdfb17f911b4431f499f144871f4d65 +- name: v1.28.15/bin/linux/arm64/kube-aggregator + sha256: d0962f0e6c6c78f60099345cca2d5b81bf19089a024d904f4429984a7cd6f2ec +- name: v1.28.15/bin/linux/arm64/kube-apiserver + sha256: 1f818256ca73b84d18111918a41ddbb626d860d8165874540dedcc7deaf848b7 +- name: v1.28.15/bin/linux/arm64/kube-controller-manager + sha256: 106ac56597cf0a5d5c7712d964d20787a57cb01d14c1b36bd3aca638fd7b670a +- name: v1.28.15/bin/linux/arm64/kube-log-runner + sha256: f512ea74310aaa4480ac0b28865ede9f5cc824f430bdcc8a06403017a04e2ec3 +- name: v1.28.15/bin/linux/arm64/kube-proxy + sha256: edaf585fad5efe571aea3bbc335e214e81c538f0efbe82a200ca4e408b5db30d +- name: v1.28.15/bin/linux/arm64/kube-scheduler + sha256: 654fe80bb266601dad5e4b4a81791536d2d3c42257495fb952c041f4367380ab +- name: v1.28.15/bin/linux/arm64/kubeadm + sha256: e907b9e8e47a42ea5c1a15d0f7f493337dd35fc53540d344af6fecf191f5764e +- name: v1.28.15/bin/linux/arm64/kubectl + sha256: 7d45d9620e67095be41403ed80765fe47fcfbf4b4ed0bf0d1c8fe80345bda7d3 +- name: v1.28.15/bin/linux/arm64/kubectl-convert + sha256: b6baff6bc8f5f8f613ad0f76c15b10d51fc68b6b214eab13d6299d3a2b7e93c2 +- name: v1.28.15/bin/linux/arm64/kubelet + sha256: 7dfb8087ee0eff9a3f667e1ec749b5a57a0848e59ce9ed42ad00e7ece1c55274 +- name: v1.28.15/bin/linux/arm64/mounter + sha256: 501a9ea58a2dc0eaa0bc151c37227538ef49d0f407ee570aec8e4d44be12193e diff --git a/pkg/assets/assetdata/k8s-1.29.yaml b/pkg/assets/assetdata/k8s-1.29.yaml index a77933c608364..d0d43a524877f 100644 --- a/pkg/assets/assetdata/k8s-1.29.yaml +++ b/pkg/assets/assetdata/k8s-1.29.yaml @@ -574,3 +574,117 @@ files: sha256: 2bfcfc069bc0ea86a5cecc14c8f442dcc0871a7ba5cc3161b6311592967c040f - name: v1.29.9/bin/linux/arm64/mounter sha256: 6c968ae395d75b300d331f951b0376f6de4a288fcc6dacef07364b6383344cf0 +# kubernetes 1.29.10 +- name: v1.29.10/bin/darwin/amd64/kubectl + sha256: 20cfa105fab897fccfdd67f10bcd9a1767c221c0156bd18b75d60be1302c08cf +- name: v1.29.10/bin/darwin/amd64/kubectl-convert + sha256: 61befabcaf81e2d947320a3177d8ad58e2d3f752f8150079b45df42ed2aa206d +- name: v1.29.10/bin/darwin/arm64/kubectl + sha256: babfa4db278d48ced9ef52cac235bdd788180ac125c83663dc3d9e92a9c87ee1 +- name: v1.29.10/bin/darwin/arm64/kubectl-convert + sha256: 2b67e5ac92be390d2fcc58189834706acb143f40845a8cb1ce0347bc41849a38 +- name: v1.29.10/bin/linux/amd64/apiextensions-apiserver + sha256: 723b769fa2a30fb4f693d1caf159bc591ae755cc6179344bf8ccd8aff1476709 +- name: v1.29.10/bin/linux/amd64/kube-aggregator + sha256: 6c75bec4a2178475695678f735989ecba56e7a69cf3dc705c89170a14edce908 +- name: v1.29.10/bin/linux/amd64/kube-apiserver + sha256: 40cc05d45ef4513edc9920e15cd00d7a92aab81793fcf0a564eab6479291e573 +- name: v1.29.10/bin/linux/amd64/kube-controller-manager + sha256: 7b515c8ef4e2b5236dd638c48d369f66d9889fc0f4f89b31d9f7b1550ac57752 +- name: v1.29.10/bin/linux/amd64/kube-log-runner + sha256: cb4a428a599f1fb131f39f00c902410bd9501ee79395d40d975b84f481ad2206 +- name: v1.29.10/bin/linux/amd64/kube-proxy + sha256: 3adbe04ca2ed11423f981c34814bd6bbba53c97f838f356e7c9d420e2ed8e2ca +- name: v1.29.10/bin/linux/amd64/kube-scheduler + sha256: af213fa9b444f9e260ed180c89a76bb01f0ec1f988c0db30d9ff694541c4bc18 +- name: v1.29.10/bin/linux/amd64/kubeadm + sha256: 9098c908e0f3a601e8bef9b2cdb4a9777e18204595a6542be58b3928c7b51440 +- name: v1.29.10/bin/linux/amd64/kubectl + sha256: 24f2f09a635d36b2ce36eaebf191326e2b25097eec541a3e47fee6726ef06cef +- name: v1.29.10/bin/linux/amd64/kubectl-convert + sha256: e132002278537cc9f1c5b4de438ddfbfffee0f6c5a3292efda921ed38e186185 +- name: v1.29.10/bin/linux/amd64/kubelet + sha256: 4cc094062cd1cff49ca551208635669ab86e3982d38e8d0a77ab833a941ff708 +- name: v1.29.10/bin/linux/amd64/mounter + sha256: 4787136ca64176f9195c412da705137ebd2159cf4947d303a496cf6d3754dc65 +- name: v1.29.10/bin/linux/arm64/apiextensions-apiserver + sha256: 931add628a0cf1b688f880a4e520eda82862632dba321f35cdaf4c0565b1ab3e +- name: v1.29.10/bin/linux/arm64/kube-aggregator + sha256: 78b206acc06e8cba9afda65492b769eb46beb4d2af5cee86330cdd04f43d3949 +- name: v1.29.10/bin/linux/arm64/kube-apiserver + sha256: c6907c0c020b9cc7a19d6ec98e5605a42350b060039ebb3fd2e7edec2bf45f89 +- name: v1.29.10/bin/linux/arm64/kube-controller-manager + sha256: 5c212ef8d4a632680bc43063171d6821bf34fd00f64aaf38c6dea4b1821ca10b +- name: v1.29.10/bin/linux/arm64/kube-log-runner + sha256: 9944f7f1bfb9502b81483cfd1010658319eeca3e52bfdf06b365bf7b00535363 +- name: v1.29.10/bin/linux/arm64/kube-proxy + sha256: 80038a05fe2ba0a67310cfa83429164c6a93328a99bac6220c6484ac55f0a957 +- name: v1.29.10/bin/linux/arm64/kube-scheduler + sha256: 46f884388473c5fa9b8404a4a621c1f3d3fa187bffcb8bf98fa04a6295fbb42a +- name: v1.29.10/bin/linux/arm64/kubeadm + sha256: a10b015db9b5b5a29420a9f8e696c39f11d171bb9d67ad39c1a6b05f7da6d823 +- name: v1.29.10/bin/linux/arm64/kubectl + sha256: 4cfa950fbd354bdc655cc425494aa77fe81710bc8f7d3f95285338aac223cc82 +- name: v1.29.10/bin/linux/arm64/kubectl-convert + sha256: 289f000798a0e55a58b77488297eed004abc64a8d85bd71c3b9371328ebb6981 +- name: v1.29.10/bin/linux/arm64/kubelet + sha256: 1c750d983e3d2fddeb829d1b9bdcf83c7d81e6f9cf7e1b50ccd9daad47807915 +- name: v1.29.10/bin/linux/arm64/mounter + sha256: 7552a39e7aadc1cb02ed1b822cc99b8f34aacc4797da400f2444858740b3155b +# kubernetes 1.29.11 +- name: v1.29.11/bin/darwin/amd64/kubectl + sha256: 2c0c7a5ff6d8e899db643c74498587791632b1c414359ab731fac5f3c0ddfd8f +- name: v1.29.11/bin/darwin/amd64/kubectl-convert + sha256: b3682dc2fe04bf127c7f2d7ab7eaebe654e3d90af8bc57777e5a514151b0c5b7 +- name: v1.29.11/bin/darwin/arm64/kubectl + sha256: 8e5fcc918ae8933bcc88fdd1a79270ea7e46ad2598aa6852bc4b24fe41d308f1 +- name: v1.29.11/bin/darwin/arm64/kubectl-convert + sha256: d33f50b4bfd16740ca396c99200cc6f762c6894b10abf6a0cdc66706e1e54a0a +- name: v1.29.11/bin/linux/amd64/apiextensions-apiserver + sha256: cdd04ee4d4d6a51a592d2404aa8fbb0e4cbb259a2c8731ba3bfebfdc0149e704 +- name: v1.29.11/bin/linux/amd64/kube-aggregator + sha256: 4d52bf40959ac45dc4abb30e4e5c7330ff654c0b5cb954ebce70dc9fb50c3148 +- name: v1.29.11/bin/linux/amd64/kube-apiserver + sha256: 167f87635756ab7bb6c04f3e25034f0c8b9bc481c371ea275172241c7f783385 +- name: v1.29.11/bin/linux/amd64/kube-controller-manager + sha256: 7e4f5c3e05efca3fb62e46718587338c264478e072e55819032e9e58a1385831 +- name: v1.29.11/bin/linux/amd64/kube-log-runner + sha256: 010430d540f73aad691e79ab21093e71ad78b9b280e9f620a2e073176fcbcea8 +- name: v1.29.11/bin/linux/amd64/kube-proxy + sha256: c125d5fdc6eae1821e6a1251624db35f72f12986cf54b822b5cafed8ecceed61 +- name: v1.29.11/bin/linux/amd64/kube-scheduler + sha256: 5317f2027765231a656fc5b6a354a0967c8be36ed055de2ffa1964eb3d2e20ad +- name: v1.29.11/bin/linux/amd64/kubeadm + sha256: 6cf3567bd69a14859fb80fb39a09196dc2de1729ae72566e7e4819c5600e49c6 +- name: v1.29.11/bin/linux/amd64/kubectl + sha256: 14d7ea4ada60ff15ef3b7734a83c4d05cff164d4843b6f4c081a50b86547c17d +- name: v1.29.11/bin/linux/amd64/kubectl-convert + sha256: 5ba43454686777d68164d663de7d46b6f7ecf398cd6f2a13f28939682da10e5f +- name: v1.29.11/bin/linux/amd64/kubelet + sha256: 1aaa9025cceac0c9a4df295a58aa79d8932a5b13a43c8910412c9ef970c42d21 +- name: v1.29.11/bin/linux/amd64/mounter + sha256: faeba03eb2df0d86c2349fb2706e4585558bd8e296d8eccbb41bcc4483c29220 +- name: v1.29.11/bin/linux/arm64/apiextensions-apiserver + sha256: 002a6f17e47b53fc2337234b62305dcbe84e25deb1ca2bb9b0ecba06af284284 +- name: v1.29.11/bin/linux/arm64/kube-aggregator + sha256: e8ad00c5fe4b16c53cc7be7a09a3340d76a09e108d9458225d1305bc41b87720 +- name: v1.29.11/bin/linux/arm64/kube-apiserver + sha256: 217a7021139340713fa4abd1c5a3d0dc57a0128bf7e6238b8c2ed7730a8bb8b9 +- name: v1.29.11/bin/linux/arm64/kube-controller-manager + sha256: 3cf707401d07f0c488390a749b3b99e0d65d5fa15ff98ed0e0ac68cf8c68d1bf +- name: v1.29.11/bin/linux/arm64/kube-log-runner + sha256: 8862cef18b8ae5f7b027459d6eeba1f9f5e6aba56a278e7ffcee394a1299fc76 +- name: v1.29.11/bin/linux/arm64/kube-proxy + sha256: 368dee51cd17b4189376f53947618541c63865a3a9225c471a8e0f4099f1e19f +- name: v1.29.11/bin/linux/arm64/kube-scheduler + sha256: 8b453c37b174ce9114699bf186db7b5f7107cdef54890539fe9a9a1ea0802b6f +- name: v1.29.11/bin/linux/arm64/kubeadm + sha256: c1482dec2a478e7142b4c4d6fe9434cc04b02e4f760c19bab9287ec05df2d539 +- name: v1.29.11/bin/linux/arm64/kubectl + sha256: d0fcb8ead20f45ffab2d680b84a93c8e459b2c7c1d6dadf566769cf59f04c506 +- name: v1.29.11/bin/linux/arm64/kubectl-convert + sha256: 95d5bd9c2be8f249231424acd0c5fe0f502668eb6f90710a4539c14e6206264e +- name: v1.29.11/bin/linux/arm64/kubelet + sha256: c0d0a26a4e0c2e0ec00a26afe7cd0b667bd52c6b2629314a9a93164e02f8f69a +- name: v1.29.11/bin/linux/arm64/mounter + sha256: bf39b23ad60726630eae0762c7db2f01053d6d63c51d01cfa185361fc983ff24 diff --git a/pkg/assets/assetdata/k8s-1.30.yaml b/pkg/assets/assetdata/k8s-1.30.yaml index 6d85d7853d27c..cc771ba78448a 100644 --- a/pkg/assets/assetdata/k8s-1.30.yaml +++ b/pkg/assets/assetdata/k8s-1.30.yaml @@ -346,3 +346,117 @@ files: sha256: 6d11af618f410a186a681b95865539a75146cb908522211520df584f3c09d5cc - name: v1.30.5/bin/linux/arm64/mounter sha256: 5ef6dc19c59ef38a2d2b16810ec837b77365e42d6cd91238d9e9ed955c208563 +# kubernetes 1.30.6 +- name: v1.30.6/bin/darwin/amd64/kubectl + sha256: 344786fb21056465b4d0d7a255872d70ff66d3ba85f395b682a9601822bb1d0e +- name: v1.30.6/bin/darwin/amd64/kubectl-convert + sha256: ae48acba57a2768519dd3280c1cddb9763dfb24e15a9ca7a6815d02352eb8a67 +- name: v1.30.6/bin/darwin/arm64/kubectl + sha256: 9437e12a652cca29f31687afd607843224b33c3db5cd133d75bcd4ad2e90ee2e +- name: v1.30.6/bin/darwin/arm64/kubectl-convert + sha256: 18fcf684f7d62efbd8d6ed12644f047d7d9303e442dcaf9fb95edd31433f1ac5 +- name: v1.30.6/bin/linux/amd64/apiextensions-apiserver + sha256: b48ca60c600907b01e4255e1b4397d6355a23ae7f74dca3369c9e1ac803c4310 +- name: v1.30.6/bin/linux/amd64/kube-aggregator + sha256: dd043e0e6189d6dda2579635d395696d18515702bf2ffff354071bdd1f564c49 +- name: v1.30.6/bin/linux/amd64/kube-apiserver + sha256: 229c5643164fba81285f49d40004da0cb04b27ab05e80c4d01356ff208de33d6 +- name: v1.30.6/bin/linux/amd64/kube-controller-manager + sha256: c17e81d242b7b356290f6e9ed50a277d6511f5198889fef81dd805f3d7d354b6 +- name: v1.30.6/bin/linux/amd64/kube-log-runner + sha256: c2d094a1659f85ebfaf029c87fcd93e59e088966ccf99c849f04aa219e512bf7 +- name: v1.30.6/bin/linux/amd64/kube-proxy + sha256: 75770cd6d7e16443ba7ee2188e31413aa43620b4cef6d3915652b4b8c308d361 +- name: v1.30.6/bin/linux/amd64/kube-scheduler + sha256: a7423d5b078b4a6bae74e49cbc4729faf32c4858e2f024f307bbd4f79466e22e +- name: v1.30.6/bin/linux/amd64/kubeadm + sha256: 216b7728c6eca12a6a21a7e4199d898d4b88cf8f489a63c2779e2e525302cca7 +- name: v1.30.6/bin/linux/amd64/kubectl + sha256: 7a3adf80ca74b1b2afdfc7f4570f0005ca03c2812367ffb6ee2f731d66e45e61 +- name: v1.30.6/bin/linux/amd64/kubectl-convert + sha256: dc9a50a1ee401b6a10a6e16e75f63af4bfbede6316487f17cc3eac0e7da7a97e +- name: v1.30.6/bin/linux/amd64/kubelet + sha256: 9d5585448bc34d37f70171c282febaa10d32687bfee4f8e4467c1bf149674d50 +- name: v1.30.6/bin/linux/amd64/mounter + sha256: 69b3de06bccb114bd928bbe7f3437a7898c4e361a74bc7993380395e33a236d7 +- name: v1.30.6/bin/linux/arm64/apiextensions-apiserver + sha256: 7f17542fadcae729c53750c93289f45387dc141a4549336c81c3f86d29c66238 +- name: v1.30.6/bin/linux/arm64/kube-aggregator + sha256: 47f1339f652743443c03ce13dc8607884246fa73d6d0e36f5d8b883e3f81f251 +- name: v1.30.6/bin/linux/arm64/kube-apiserver + sha256: 8413d01b07ff1109e60c981ce93d68a6bb25da654a5015e6fe719e545fe1aad6 +- name: v1.30.6/bin/linux/arm64/kube-controller-manager + sha256: e36d50954deb7f4484a3a091c302cb3291e411c3669ffbb16e05aa91c831e44b +- name: v1.30.6/bin/linux/arm64/kube-log-runner + sha256: e94ce662daf638d48833a7d2b7a471c8e4f5f3b46700118ea9e785b3df1062cc +- name: v1.30.6/bin/linux/arm64/kube-proxy + sha256: 75b7c01515f58d91ee9ade5bec232a2355cc1c3be62bbf3c00f08103e73b95d2 +- name: v1.30.6/bin/linux/arm64/kube-scheduler + sha256: 620cf42dae417d680dabcc99611756f030cb2104725684dfe8d08d2ff6d65ad9 +- name: v1.30.6/bin/linux/arm64/kubeadm + sha256: 6206938156e079d1c3031ba9a291e720c9f04031492753759b93bc3b67b3390b +- name: v1.30.6/bin/linux/arm64/kubectl + sha256: 0b448581f05f46d80219d1a73bd1966de09066c313f64e67e7b75b35e07191cd +- name: v1.30.6/bin/linux/arm64/kubectl-convert + sha256: 1f20740982a3fd235711647d2ea34b264dc3499ea969bb28183d86ea522ecc4f +- name: v1.30.6/bin/linux/arm64/kubelet + sha256: a35e5ab0701b84c03c5cffb142e5de78dc3a5a4af9ba503a6eb3bf8944ded26d +- name: v1.30.6/bin/linux/arm64/mounter + sha256: 34a99b51bb589bd23018bee8a78ce9cce074b8e1c47d7d6546dae1f38c6df744 +# kubernetes 1.30.7 +- name: v1.30.7/bin/darwin/amd64/kubectl + sha256: e25320f6ba5f89d427001845fc0e961a14fb56ac3225b39734b900d94ee65df4 +- name: v1.30.7/bin/darwin/amd64/kubectl-convert + sha256: a5b2b35ba5d9e3c8c7f9c7411ea0b44d0fae17d4517e8355aa05eb3f714046bb +- name: v1.30.7/bin/darwin/arm64/kubectl + sha256: 19be78a34127eeb583b1ea4adb93ffc243de1fa63c2e5996441d3621dcb0ca17 +- name: v1.30.7/bin/darwin/arm64/kubectl-convert + sha256: 6e73e336b0064c648557e9101b9616ad1a54e8169ba85e25e216c783f8e41894 +- name: v1.30.7/bin/linux/amd64/apiextensions-apiserver + sha256: 485db244157631a2958d811e7fdc7b64cdd9bdf8121241154fc6e3063368267d +- name: v1.30.7/bin/linux/amd64/kube-aggregator + sha256: f42f24ae06bc56c59bed268d24c017dad5c9bf18ccd3fb579776fc0df5ff38d6 +- name: v1.30.7/bin/linux/amd64/kube-apiserver + sha256: 3861438131aa603ba90123df7d790fc73511edfff0f5e6861f18b459af7affbd +- name: v1.30.7/bin/linux/amd64/kube-controller-manager + sha256: 33270ecbe904b57eed54734ddfb4cff8957e1efaf050ae14d0315b9feb550b63 +- name: v1.30.7/bin/linux/amd64/kube-log-runner + sha256: 234663816d4a8819d7e6dc271ef5406ea316150c33ac12ba19313c3774eab7a2 +- name: v1.30.7/bin/linux/amd64/kube-proxy + sha256: fd5af292b749f314cc4de1a15e5a339f1b708bc4cf4d9ec96a79c04ab1a989a5 +- name: v1.30.7/bin/linux/amd64/kube-scheduler + sha256: b89933189ca77476b70d8a770b59d6ccf394f35dde568c6c7c49ea13c3e87ec3 +- name: v1.30.7/bin/linux/amd64/kubeadm + sha256: 3635901a3a6e5b0124547151de700a1dbd4571531327a32edbec43bb155b877b +- name: v1.30.7/bin/linux/amd64/kubectl + sha256: 3950ec7b81b9aa5a3856dd6155e42e1ad12a2fa8b050502f5a9652050f94a8ee +- name: v1.30.7/bin/linux/amd64/kubectl-convert + sha256: 393e8ef4c290cc261b3256adcebc2c6ce4181ebaa6a3c4d2a1242c11b5ab8898 +- name: v1.30.7/bin/linux/amd64/kubelet + sha256: 4b2fb90661e2b7be8b34b5bd405652590f6351a9f55194430fa16d547a7c9d16 +- name: v1.30.7/bin/linux/amd64/mounter + sha256: c656b0d1bcc06b8f33be485dbbb552b597b48daf8f47298e4148f281909c5de3 +- name: v1.30.7/bin/linux/arm64/apiextensions-apiserver + sha256: 27235a1fde68e0ea5c4cbc711e57fd68385a59f0706d1eca86ff145d017783a1 +- name: v1.30.7/bin/linux/arm64/kube-aggregator + sha256: 906215fc2bb069252b50680a983f32f31b3eb277d4d2e88bf590ede30bdc50fb +- name: v1.30.7/bin/linux/arm64/kube-apiserver + sha256: dbb31249ec6b3ec78c3959386141d2eaa7ee69820aac2637b597b03e29f4d875 +- name: v1.30.7/bin/linux/arm64/kube-controller-manager + sha256: 7aad68dad498e2135972d7227fbf54af01ecbce9e8e82a61dc8f9c8190ad0a4f +- name: v1.30.7/bin/linux/arm64/kube-log-runner + sha256: 28df2d58c710efac3c5011c8e806aec8a2deea9f188dd47ae83a2389548f61ee +- name: v1.30.7/bin/linux/arm64/kube-proxy + sha256: fcffdc0eefba7734c610241ca09f727276e51d120ca4cbb2ed5d450b304637a9 +- name: v1.30.7/bin/linux/arm64/kube-scheduler + sha256: 45c2760106d09441f34474bdb6b00f82879719831257e6acfabe74f41764e36f +- name: v1.30.7/bin/linux/arm64/kubeadm + sha256: 3684d219d3398964038d87bf609266149cd898d810a52d21a4a6534f8a187ba8 +- name: v1.30.7/bin/linux/arm64/kubectl + sha256: 5e856defeac209ff82dd473ce46f91a3118df82b863de0d2ed59bdf3558cffca +- name: v1.30.7/bin/linux/arm64/kubectl-convert + sha256: a9f864859904f5f28482263038e66b21a0cb2a8db02d4908c427a21215d51996 +- name: v1.30.7/bin/linux/arm64/kubelet + sha256: cb9d916c3c3332a400b42271be342728d5660a4b78dfaaf7819db8a58cb4caa4 +- name: v1.30.7/bin/linux/arm64/mounter + sha256: 305d958390e6d7267dfd06bece315a23b2686f36ca68a4d2c0fc9a8c89e8391d diff --git a/pkg/assets/assetdata/k8s-1.31.yaml b/pkg/assets/assetdata/k8s-1.31.yaml index f993c3e8451ed..b585324b06fbf 100644 --- a/pkg/assets/assetdata/k8s-1.31.yaml +++ b/pkg/assets/assetdata/k8s-1.31.yaml @@ -118,3 +118,117 @@ files: sha256: fbd98311e96b9dcdd73d1688760d410cc70aefce26272ff2f20eef51a7c0d1da - name: v1.31.1/bin/linux/arm64/mounter sha256: 5f8429b6b93ef263558bfe4849b8120f788316fa35bbcf59e080668a71196bf7 +# kubernetes 1.31.2 +- name: v1.31.2/bin/darwin/amd64/kubectl + sha256: 6693ebdaba8d1eb1469c60b3eb9e9fdee1c49e01a56af517342192d4ee5a35b3 +- name: v1.31.2/bin/darwin/amd64/kubectl-convert + sha256: 0c148766b4359ef7f3f415767fa6f07efa926d791b4df9e980c2002722dd8ac5 +- name: v1.31.2/bin/darwin/arm64/kubectl + sha256: 0792d570d20fc495ea64baec26cd6bde961434b900038f2952f3334501872e80 +- name: v1.31.2/bin/darwin/arm64/kubectl-convert + sha256: 2e01d3a77557349cb7e9e3bbd21b9e59fe8eb57836051bd199d36f7a33a1881c +- name: v1.31.2/bin/linux/amd64/apiextensions-apiserver + sha256: d0ebc5d87025de93dfa500888fe7205d0e7e1ba08df1661488c977dc791f997b +- name: v1.31.2/bin/linux/amd64/kube-aggregator + sha256: 9b59970d28de82cc658afd1c8185a5dc40a31dad0c00fdc48785cbf187232e25 +- name: v1.31.2/bin/linux/amd64/kube-apiserver + sha256: 346cceb8d67c0b3efae3575d5addfd2a1086e8023013d1e6472e370b8951639d +- name: v1.31.2/bin/linux/amd64/kube-controller-manager + sha256: b1e16bceee2bc76a6f973784ca611d8e972aa7ed213ae75255097a60f85752fb +- name: v1.31.2/bin/linux/amd64/kube-log-runner + sha256: 9b8c14dca6cabc7c5ad5e6293f12013508e79414c4ff065c9327ed960022dae9 +- name: v1.31.2/bin/linux/amd64/kube-proxy + sha256: 4b6e5718b60f97868b691334f5909fee8a2aaffeb2eb2e5edceede6b4a8f8d76 +- name: v1.31.2/bin/linux/amd64/kube-scheduler + sha256: c08a2c34f8c4235d5a4e8e99586bb6d7ccb90dc3f88d7f5f4573b0b939624e9c +- name: v1.31.2/bin/linux/amd64/kubeadm + sha256: e3d3f1051d9f7e431aabaf433f121c76fcf6d8401b7ea51f4c7af65af44f1e54 +- name: v1.31.2/bin/linux/amd64/kubectl + sha256: 399e9d1995da80b64d2ef3606c1a239018660d8b35209fba3f7b0bc11c631c68 +- name: v1.31.2/bin/linux/amd64/kubectl-convert + sha256: 9f696f699e8f10b26111e9fa564d4dc02ef34e194cb90af58e7e14c4e9c2c2d6 +- name: v1.31.2/bin/linux/amd64/kubelet + sha256: b0de6290267bbb4f6bcd9c4d50bb331e335f8dc47653644ae278844bb04c1fb6 +- name: v1.31.2/bin/linux/amd64/mounter + sha256: 97b9d013727ace818b9c92032998003357f9883e5e2cc5df581ac1186d5b3185 +- name: v1.31.2/bin/linux/arm64/apiextensions-apiserver + sha256: 49300d94e85b7d4d32b3e56ec6e098359db37b57c20a0952f63f8fffefd4fc00 +- name: v1.31.2/bin/linux/arm64/kube-aggregator + sha256: ce0e5aac9ff641a09cd40e811f07d5e240cb58a69de9928bd1124987c4ad796c +- name: v1.31.2/bin/linux/arm64/kube-apiserver + sha256: 932e1a1ade8b4d25490cf0a1eca34bef00d1ffa7999863a17794bff25892bb78 +- name: v1.31.2/bin/linux/arm64/kube-controller-manager + sha256: 96f13d5ac9fb5950b60bee4b9458acffb226dbc7d68e89851cf45fcc97c4ffc2 +- name: v1.31.2/bin/linux/arm64/kube-log-runner + sha256: 90e78020b74a14dd07bb8938c298b49725de2acfe93f54e7486732a4eb9686a7 +- name: v1.31.2/bin/linux/arm64/kube-proxy + sha256: 288fad2b37865e28a92d1fcbe66d4c10a347c96d51d5e15772b588367a44627a +- name: v1.31.2/bin/linux/arm64/kube-scheduler + sha256: 46393cb8ff987e04ee2e739d5114e0a461e6ffdae222fffea096a65d0f9e58df +- name: v1.31.2/bin/linux/arm64/kubeadm + sha256: 0f9d231569b3195504f8458415e9b3080e23fb6a749fe7752abfc7a2884efadf +- name: v1.31.2/bin/linux/arm64/kubectl + sha256: bb9fd6e5a92c2e2378954a2f1a8b4ccb2e8ba5a3635f870c3f306a53b359f971 +- name: v1.31.2/bin/linux/arm64/kubectl-convert + sha256: 91839521bdea1fc2ceee8becd1656469453fc3ea80286c1379dff30a665a4ca5 +- name: v1.31.2/bin/linux/arm64/kubelet + sha256: 118e1b0e85357a81557f9264521c083708f295d7c5f954a4113500fd1afca8f8 +- name: v1.31.2/bin/linux/arm64/mounter + sha256: 872388242fc7ba918dc20f67cbbb3c6b375e82ca41cd664afa8ccef9a4abda52 +# kubernetes 1.31.3 +- name: v1.31.3/bin/darwin/amd64/kubectl + sha256: 66f49bbb19869f0735517a331c946fe1296d2f0f8cb5e7e7fb6ba33a8cee113c +- name: v1.31.3/bin/darwin/amd64/kubectl-convert + sha256: 7a8ed165909bcc2b074b4834a15473db1f75294772758f7542830692fa5ae440 +- name: v1.31.3/bin/darwin/arm64/kubectl + sha256: ef34c2c7debe346e5fd47065d9f66229edf164b043aa908fa5af0808f642ec7b +- name: v1.31.3/bin/darwin/arm64/kubectl-convert + sha256: 4687636074eaad49e46a03a03a62ca688344cd7e0d5d34fc9edc301c9d4edcc0 +- name: v1.31.3/bin/linux/amd64/apiextensions-apiserver + sha256: 3ba74738c076678c62b5ec1f99967ea788eb0439159b363e3e668006eb0a98a5 +- name: v1.31.3/bin/linux/amd64/kube-aggregator + sha256: 12fbde50f0663f59a75a7f23415d86b154cb2c61cbf2b6bb10fc16d7c25ddd4c +- name: v1.31.3/bin/linux/amd64/kube-apiserver + sha256: 5a87e82c497cdbb55a58f43a2897bf4584eab1e4ce45ee70b42ebe0e786ca0a5 +- name: v1.31.3/bin/linux/amd64/kube-controller-manager + sha256: 89a2475c4141716fea10054e9467c3829885404ece347c95a7bccafb60f3ead7 +- name: v1.31.3/bin/linux/amd64/kube-log-runner + sha256: d3442b2b8c30d188dcda8ed606dfb3a25316379454716cf0da25dcab05b697c0 +- name: v1.31.3/bin/linux/amd64/kube-proxy + sha256: 501206a1dff8782d68ed527c3cfc5d5d9e70d6bfed78f1102a0b9b56e506ca98 +- name: v1.31.3/bin/linux/amd64/kube-scheduler + sha256: fba0378dd8af153410b370db96d4b782b4da97229e5111eea20cba09d5de3b08 +- name: v1.31.3/bin/linux/amd64/kubeadm + sha256: dcfcc6eb79e94994d5f1b04a7746239214030ce8a2e8b0e21a4772938f911d12 +- name: v1.31.3/bin/linux/amd64/kubectl + sha256: 981f6b49577068bc174275184d8ee7105d8e54f40733792c519cd85023984c0f +- name: v1.31.3/bin/linux/amd64/kubectl-convert + sha256: 6d5ac7622de293d065b5bd65b1a34ad3f00da25d4cd576e63694d135f09e6150 +- name: v1.31.3/bin/linux/amd64/kubelet + sha256: a5c9e871541251db15436fc307d945217e160d12920730070417ba8037e090df +- name: v1.31.3/bin/linux/amd64/mounter + sha256: 6c5ad541bed68d7093c5b524268068943a1b3dd659b35f8a6619c6eca1325a81 +- name: v1.31.3/bin/linux/arm64/apiextensions-apiserver + sha256: e9ab5f8cf7bb7c6e54a2e0c681380d3b56e22411320e197e6281dc589c58859e +- name: v1.31.3/bin/linux/arm64/kube-aggregator + sha256: 1c41e48ddcfc7e2a7662d30ccdc41daa566269b6bca6a2ebe497a16a99a3a18e +- name: v1.31.3/bin/linux/arm64/kube-apiserver + sha256: 58a61e8e0d7c03798bddf1ac4b7725d9272aad9a3dcc72cf87e14b6bee2373de +- name: v1.31.3/bin/linux/arm64/kube-controller-manager + sha256: b26101b29be702aaf2ca97540e17895cdabe195e0340d261b119f0f2c88d26d4 +- name: v1.31.3/bin/linux/arm64/kube-log-runner + sha256: 3b3566cba4a1b4a6a31933287864c8de5fe38f3c0cb44aad2b41fc029a16c724 +- name: v1.31.3/bin/linux/arm64/kube-proxy + sha256: 7da5b222f56ab950123ce443bf95adb784657ae3a4a71b668c7b0d5e42c45fd6 +- name: v1.31.3/bin/linux/arm64/kube-scheduler + sha256: d3d0449b02df354839df07803db7e78e06994db4c51c0d1f7225f77316ec3e59 +- name: v1.31.3/bin/linux/arm64/kubeadm + sha256: 8113900524bd1c8b3ce0b3ece0d37f96291cbf359946afae58a596319a5575c8 +- name: v1.31.3/bin/linux/arm64/kubectl + sha256: a3953ad2b32eca0b429249a5fbdf4f8ef7d57223c45cc0401fd80fd12c7b9071 +- name: v1.31.3/bin/linux/arm64/kubectl-convert + sha256: b7c835ba2d6683111cadcd6ede4080d189ab47e2993190a0ae61bd96033339ee +- name: v1.31.3/bin/linux/arm64/kubelet + sha256: 0ec590052f2d1cee158a789d705ca931cbc2556ceed364c4ad754fd36c61be28 +- name: v1.31.3/bin/linux/arm64/mounter + sha256: 81ec14dad43fb678465bdef1e18448bb7059923cb052ed9c1f733445b704fa55 diff --git a/pkg/assets/builder.go b/pkg/assets/builder.go index 39926a7dfdf2b..7947ce969f039 100644 --- a/pkg/assets/builder.go +++ b/pkg/assets/builder.go @@ -314,7 +314,7 @@ func (a *AssetBuilder) findHash(file *FileAsset) (*hashing.Hash, error) { return knownHash, nil } - klog.Infof("asset %q is not well-known, downloading hash", file.CanonicalURL) + klog.V(2).Infof("asset %q is not well-known, downloading hash", file.CanonicalURL) // We now prefer sha256 hashes for backoffSteps := 1; backoffSteps <= 3; backoffSteps++ { diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go index 1a37ddd30c916..4b0f123ae1159 100644 --- a/pkg/model/awsmodel/autoscalinggroup.go +++ b/pkg/model/awsmodel/autoscalinggroup.go @@ -398,7 +398,7 @@ func (b *AutoscalingGroupModelBuilder) buildSecurityGroups(c *fi.CloudupModelBui return securityGroups, nil } -// buildAutoscalingGroupTask is responsible for building the autoscaling task into the model +// buildAutoScalingGroupTask is responsible for building the autoscaling task into the model func (b *AutoscalingGroupModelBuilder) buildAutoScalingGroupTask(c *fi.CloudupModelBuilderContext, name string, ig *kops.InstanceGroup) (*awstasks.AutoscalingGroup, error) { t := &awstasks.AutoscalingGroup{ Name: fi.PtrTo(name), diff --git a/pkg/resources/aws/filters.go b/pkg/resources/aws/filters.go index 875c07260731f..c4e58e0e82c8b 100644 --- a/pkg/resources/aws/filters.go +++ b/pkg/resources/aws/filters.go @@ -22,7 +22,7 @@ import ( "k8s.io/kops/upup/pkg/fi/cloudup/awsup" ) -// buildEc2FiltersForCluster returns the set of filters we must use to find all resources +// buildEC2FiltersForCluster returns the set of filters we must use to find all resources func buildEC2FiltersForCluster(clusterName string) [][]ec2types.Filter { var filterSets [][]ec2types.Filter diff --git a/protokube/pkg/gossip/dns/provider/zone.go b/protokube/pkg/gossip/dns/provider/zone.go index 326c5efbdd8f3..b93431a2a7d85 100644 --- a/protokube/pkg/gossip/dns/provider/zone.go +++ b/protokube/pkg/gossip/dns/provider/zone.go @@ -42,7 +42,7 @@ func (z *zone) ID() string { return "gossip:" + z.zoneInfo.Name } -// ResourceRecordsets returns the provider's ResourceRecordSets interface, or false if not supported. +// ResourceRecordSets returns the provider's ResourceRecordSets interface, or false if not supported. func (z *zone) ResourceRecordSets() (dnsprovider.ResourceRecordSets, bool) { return &resourceRecordSets{ zone: z, diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go index 2af4c894a2dda..cf7ae5bd2523a 100644 --- a/upup/pkg/fi/cloudup/template_functions.go +++ b/upup/pkg/fi/cloudup/template_functions.go @@ -896,7 +896,7 @@ func (tf *TemplateFunctions) KopsControllerEnv() []corev1.EnvVar { return envMap.ToEnvVars() } -// OpenStackCCM returns OpenStack external cloud controller manager current image +// OpenStackCCMTag returns OpenStack external cloud controller manager current image // with tag specified to k8s version func (tf *TemplateFunctions) OpenStackCCMTag() string { var tag string @@ -918,7 +918,7 @@ func (tf *TemplateFunctions) OpenStackCCMTag() string { return tag } -// OpenStackCSI returns OpenStack csi current image +// OpenStackCSITag returns OpenStack csi current image // with tag specified to k8s version func (tf *TemplateFunctions) OpenStackCSITag() string { var tag string