diff --git a/.final_builds/packages/k3s-images/index.yml b/.final_builds/packages/k3s-images/index.yml index 71d7bb0a..259f29b4 100644 --- a/.final_builds/packages/k3s-images/index.yml +++ b/.final_builds/packages/k3s-images/index.yml @@ -59,6 +59,10 @@ builds: version: c78a8c2e8cd3d8f69ec70c3f38db944e40cdd94f79ce9a32eef8325cf9c08311 blobstore_id: 33d21678-bde1-4b43-5283-d49ef23d4274 sha1: sha256:359a920d70cd47fa7ce7176a2fa4bb647c17c03b8f5191f7a22ab9be65b56a9c + cc947fc1aca491e1fc696aa661a401c15ce5750423a88726bc46dec91818531b: + version: cc947fc1aca491e1fc696aa661a401c15ce5750423a88726bc46dec91818531b + blobstore_id: 06097888-9941-4cc8-6b69-78ac49762be5 + sha1: sha256:780d77f69efdf213f71900a942c4174cd9b167f38accc7e871a57ee882dd421a f478de74d2582634ab54f245138e002e4f399dfedd5308661669647ce908b035: version: f478de74d2582634ab54f245138e002e4f399dfedd5308661669647ce908b035 blobstore_id: 29726908-787c-4d5b-6452-7563626f3e89 diff --git a/.final_builds/packages/k3s/index.yml b/.final_builds/packages/k3s/index.yml index 18d35b34..30583803 100644 --- a/.final_builds/packages/k3s/index.yml +++ b/.final_builds/packages/k3s/index.yml @@ -67,6 +67,10 @@ builds: version: ca2f1c2bf944fca181373694cfbd9d71351e41d5c067423fc7d2aadbceddfaf9 blobstore_id: 37a2c272-13a0-482d-66d5-463556ccfb7f sha1: sha256:b207bb222e2f6a240c766ad11ecc20defccb423d04b26a665bebcdc31799983d + d75468185c9989afd91e6c4c7dfdbbb2cf8c38b6930fe26befe4746ea96218f5: + version: d75468185c9989afd91e6c4c7dfdbbb2cf8c38b6930fe26befe4746ea96218f5 + blobstore_id: 2d76e4b3-261d-4db7-5cb4-5f7519fe1211 + sha1: sha256:57194c2334e518d1642b4297eb3fe6024df16abfcfb01072f1be48c22aa7c4c6 deafc4b71013993801c97617b8e57c5215062ae3d9a9a38d7efcfe038424d4a7: version: deafc4b71013993801c97617b8e57c5215062ae3d9a9a38d7efcfe038424d4a7 blobstore_id: 5f822676-9e90-4024-688f-8a2b5475495f diff --git a/.final_builds/packages/k9s/index.yml b/.final_builds/packages/k9s/index.yml index 8c64d2f4..62e2ee9d 100644 --- a/.final_builds/packages/k9s/index.yml +++ b/.final_builds/packages/k9s/index.yml @@ -7,6 +7,10 @@ builds: version: 42776078174c132d18bdbb55063988503c7fcaf66dcc2cba018f337faeb02cf9 blobstore_id: 3f7887dc-854a-42f4-7c60-d14d66c9b7c8 sha1: sha256:f21e9a160b6099f271888f8871663b201bee236d9350830ec910e4aac9e6e249 + 46007913d6b9fa47b9d8254f9b874fdd5eb980b4018c4bf8639a44e0d8d9f80c: + version: 46007913d6b9fa47b9d8254f9b874fdd5eb980b4018c4bf8639a44e0d8d9f80c + blobstore_id: 817856d5-bc7f-41cd-447a-5b3956e00b5d + sha1: sha256:c94b40e0b83fe9d1da8bdea01e31672638bd8dd9b5a671051ccf273a01e46e0b 8751b3231c52d45ea7efa35f7209b322e7f6ba009ace3759f052f0672d872fd2: version: 8751b3231c52d45ea7efa35f7209b322e7f6ba009ace3759f052f0672d872fd2 blobstore_id: 481d614c-eadc-476b-5619-a05ebdcf62d6 diff --git a/.final_builds/packages/kubectl-k3s/index.yml b/.final_builds/packages/kubectl-k3s/index.yml index e27b673a..7f636f09 100644 --- a/.final_builds/packages/kubectl-k3s/index.yml +++ b/.final_builds/packages/kubectl-k3s/index.yml @@ -15,6 +15,10 @@ builds: version: b744c9fb2cb552dda942fb982ac3efac6f68425bf7e1f5818ee9dc465576e88f blobstore_id: df57a1cd-8f60-4ee0-7678-0907d768810d sha1: sha256:ee47e9e8a74e8fb3f62089c80c50b5bf9c892deef50ee0f979060e78b4d37b0e + bfd15f2669c343c9a81bd633d3f829f262f8924a851954ea5aa96efdf21a6f2c: + version: bfd15f2669c343c9a81bd633d3f829f262f8924a851954ea5aa96efdf21a6f2c + blobstore_id: 36f7c9e4-84e3-4e08-4108-0bcc27d64c05 + sha1: sha256:9583aa53ccb2da187edc3ee84b520c3cb20544f9d7f44cd4edfc396653ecf4c8 d581d558a37afdc5289a59160b82c8823f18e6b8d4d06618137d4de444029d8f: version: d581d558a37afdc5289a59160b82c8823f18e6b8d4d06618137d4de444029d8f blobstore_id: da833117-d8f5-4ef5-60b3-bb19832cf1ed diff --git a/addblob.sh b/addblob.sh index d46e4d9d..65cdafad 100755 --- a/addblob.sh +++ b/addblob.sh @@ -18,7 +18,7 @@ popd bosh add-blob src/github.com/containerd/nerdctl/nerdctl nerdctl/nerdctl pushd src -curl -LO https://dl.k8s.io/release/v1.21.9/bin/linux/amd64/kubectl --output ./src/kubectl +curl -LO https://dl.k8s.io/release/v1.23.9/bin/linux/amd64/kubectl --output ./src/kubectl chmod ugo+x kubectl popd bosh add-blob src/kubectl kubectl/kubectl diff --git a/config/blobs.yml b/config/blobs.yml index d24de8c6..01868762 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -1,20 +1,20 @@ k3s-images/k3s-airgap-images-amd64.tar: size: 504174592 - object_id: 101e28d4-ae73-483e-48b0-f7722c8df5da - sha: sha256:bbc4dac4c6d8cdcf40296a98f6695fbb134900a1f10198753e070223f61ca3f4 + object_id: ba6295fe-907e-4255-4c3b-82f65b6c6e12 + sha: sha256:f04cc08824859e0e89d6084dd730ca4a130e191bdc0a8eae88742aab0029e77d k3s/k3s: - size: 62742528 - object_id: 622b3b17-7c00-4f34-7497-f06001fb2197 - sha: sha256:602a56b68fa525e5e06f169f49b84213c182dd5ee36a57fbc992bcb919451440 + size: 62701568 + object_id: c9a0054a-b843-413d-56dc-85833137df4d + sha: sha256:82470f7556863440a39342f6e0e53f518e88dbcdb2e6a4fd0854829d4ccb63b1 k9s/k9s: - size: 55824384 - object_id: 64a1d0d4-ed41-4610-63b7-a02e401f8e0b - sha: sha256:bfd558c97fbc9554bcf32ba70c77b48608cfed736222b733b2f73510f7fc6428 + size: 55881728 + object_id: 36394f30-ac2f-4b57-7d54-112ffe9a02ca + sha: sha256:f3f57053787ebb194a6b3956dd5e51a6c4da7073ef4ef9530ca2c5b4fdcee30f kubectl/kubectl: - size: 46682112 - object_id: bc159aa5-6913-4397-63f0-b23460aed1a1 - sha: sha256:195d5387f2a6ca7b8ab5c2134b4b6cc27f29372f54b771947ba7c18ee983fbe6 + size: 46596096 + object_id: 3abb177e-c6e6-49c6-5a68-61c894c506fd + sha: sha256:053561f7c68c5a037a69c52234e3cf1f91798854527692acd67091d594b616ce nerdctl/nerdctl: size: 26677248 - object_id: 62873a01-0971-48d1-4a12-471e7fc23622 + object_id: 8361a3a8-b12b-4fa4-70af-afd1bf77e6e6 sha: sha256:828c048c90c477b67d47961136a35e4a48f41c85c42244ea9e879676650d616a diff --git a/releases/k3s/index.yml b/releases/k3s/index.yml index f2f5cfe2..921468d8 100644 --- a/releases/k3s/index.yml +++ b/releases/k3s/index.yml @@ -1,4 +1,6 @@ builds: + 1642bc27-ed16-4272-5ee8-6b6d18f593e0: + version: "123.4" 1f11d32d-302c-4c7e-7dd4-0cadc1dae96a: version: "9" 2cb16202-97c5-4021-4228-e1f413e5b991: diff --git a/releases/k3s/k3s-123.4.yml b/releases/k3s/k3s-123.4.yml new file mode 100644 index 00000000..06a6e66a --- /dev/null +++ b/releases/k3s/k3s-123.4.yml @@ -0,0 +1,65 @@ +name: k3s +version: "123.4" +commit_hash: df2a3ee +uncommitted_changes: false +jobs: +- name: k3s-agent + version: 5da0dd0a241c8a49e715a511c5b20e6a75bf707964faa564b41aa5e87f20c578 + fingerprint: 5da0dd0a241c8a49e715a511c5b20e6a75bf707964faa564b41aa5e87f20c578 + sha1: sha256:58dbe0443169b2d36fa7ce3c8a900b7d4d341c4a55efcf13520ffe107b89a7fa + packages: + - k3s + - kubectl-k3s + - k3s-images + - nerdctl +- name: k3s-agent-airgaped-images + version: dac8160deeef67d642c67065cdb584c53ca84807717f4b7abb3e748badb97313 + fingerprint: dac8160deeef67d642c67065cdb584c53ca84807717f4b7abb3e748badb97313 + sha1: sha256:56989c04162b348ce691ad78d9ceaefc4b46338df95ebe87fda1e5ce0a30d429 + packages: + - k3s-images +- name: k3s-server + version: dff3f17902ee0c445c33474c63346bffff50b389f8f3a5b16e67cdf1af2dd7a8 + fingerprint: dff3f17902ee0c445c33474c63346bffff50b389f8f3a5b16e67cdf1af2dd7a8 + sha1: sha256:aeb4d59dad3d67a0150263fdf9f1779670d162894419496eb0f00cd994358a91 + packages: + - k3s + - k9s + - kubectl-k3s + - nerdctl +- name: k3s-server-airgaped-images + version: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef + fingerprint: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef + sha1: sha256:fbae88a6d6e06d8ac29288b73a971832e77d2483978c56481844e1c7f8e77c78 + packages: + - k3s-images +packages: +- name: k3s + version: d75468185c9989afd91e6c4c7dfdbbb2cf8c38b6930fe26befe4746ea96218f5 + fingerprint: d75468185c9989afd91e6c4c7dfdbbb2cf8c38b6930fe26befe4746ea96218f5 + sha1: sha256:57194c2334e518d1642b4297eb3fe6024df16abfcfb01072f1be48c22aa7c4c6 + dependencies: [] +- name: k3s-images + version: cc947fc1aca491e1fc696aa661a401c15ce5750423a88726bc46dec91818531b + fingerprint: cc947fc1aca491e1fc696aa661a401c15ce5750423a88726bc46dec91818531b + sha1: sha256:780d77f69efdf213f71900a942c4174cd9b167f38accc7e871a57ee882dd421a + dependencies: [] +- name: k9s + version: 46007913d6b9fa47b9d8254f9b874fdd5eb980b4018c4bf8639a44e0d8d9f80c + fingerprint: 46007913d6b9fa47b9d8254f9b874fdd5eb980b4018c4bf8639a44e0d8d9f80c + sha1: sha256:c94b40e0b83fe9d1da8bdea01e31672638bd8dd9b5a671051ccf273a01e46e0b + dependencies: [] +- name: kubectl-k3s + version: bfd15f2669c343c9a81bd633d3f829f262f8924a851954ea5aa96efdf21a6f2c + fingerprint: bfd15f2669c343c9a81bd633d3f829f262f8924a851954ea5aa96efdf21a6f2c + sha1: sha256:9583aa53ccb2da187edc3ee84b520c3cb20544f9d7f44cd4edfc396653ecf4c8 + dependencies: [] +- name: nerdctl + version: 873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61 + fingerprint: 873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61 + sha1: sha256:90396174af92ef2013bb4a4106b03760143b32ae3fd75564c0d16c784d37dea2 + dependencies: [] +license: + version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9 + fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9 + sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..e58fc34b --- /dev/null +++ b/renovate.json @@ -0,0 +1,57 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base", + ":disableRateLimiting" + ], + + "ignorePaths": [ + "packages/**", + "releases/**", + "manifests/**", + "jobs/**" + ], + "packageRules": [ + { + "matchDatasources": ["github-releases"], + "matchManagers": ["regex"], + "matchPaths": ["vendir.yml"], + "addLabels": ["vendir", "github-release"] + }, + { + "matchDatasources": ["github-tags"], + "matchManagers": ["regex"], + "matchPaths": ["vendir.yml"], + "addLabels": ["vendir", "github-tags"] + }, + { + "description": "Get distinct branches for each minor, e.g. 1.22.x and 1.23.x. See https://docs.renovatebot.com/presets-default/#separatepatchreleases", + "matchPackageNames": [ + "k3s-io/k3s" + ], + "separatePatchReleases": true + } + ], + + "regexManagers": [ + { + "description": "https://regex101.com/r/ms9hZL/1 for matchstring and https://regex101.com/r/NVqoci/1 for version", + "fileMatch": ["vendir.yml$"], + "matchStrings": [ + " +githubRelease:\\n +slug: (?[a-z0-9\\.\\/\\-]*?)\\n +tag: (?[a-z0-9\\.\\/\\-\\+]*?) *\\n" + ], + "datasourceTemplate": "github-releases", + "versioningTemplate": "regex:v?(?\\d+)\\.(?\\d+)\\.(?\\d+)(-(?[a-z0-9]+))?(\\+(?[a-z0-9]+))?$" + }, + { + "fileMatch": ["vendir.yml$"], + "matchStrings": [ + " +git:\\n +url: https:\\/\\/github\\.com\\/(?[a-z0-9\\.\\/\\-:]*?)\\n +ref: (?[a-z0-9\\.\\/\\-\\+]*?) *\\n" + ], + "datasourceTemplate": "github-tags", + "versioningTemplate": "regex:v?(?\\d+)\\.(?\\d+)\\.(?\\d+)?$" + } + ] + +} + diff --git a/vendir.lock b/vendir.lock index 7f91c5cc..4d9dbd34 100755 --- a/vendir.lock +++ b/vendir.lock @@ -2,12 +2,12 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - githubRelease: - tag: v1.23.9+k3s1 - url: https://api.github.com/repos/k3s-io/k3s/releases/72277541 + tag: v1.23.10+k3s1 + url: https://api.github.com/repos/k3s-io/k3s/releases/75302137 path: github.com/k3s-io/k3s - githubRelease: - tag: v0.26.0 - url: https://api.github.com/repos/derailed/k9s/releases/72173680 + tag: v0.26.3 + url: https://api.github.com/repos/derailed/k9s/releases/73605147 path: github.com/derailed/k9s - githubRelease: tag: v0.20.0 diff --git a/vendir.yml b/vendir.yml index d4988c7d..711b258d 100644 --- a/vendir.yml +++ b/vendir.yml @@ -11,7 +11,7 @@ directories: - path: github.com/k3s-io/k3s githubRelease: slug: k3s-io/k3s - tag: v1.23.9+k3s1 + tag: v1.23.10+k3s1 disableAutoChecksumValidation: true includePaths: - "k3s" @@ -21,7 +21,7 @@ directories: - path: github.com/derailed/k9s githubRelease: slug: derailed/k9s - tag: v0.26.0 + tag: v0.26.3 disableAutoChecksumValidation: true includePaths: - "k9s_Linux_x86_64.tar.gz" @@ -29,9 +29,9 @@ directories: - path: github.com/containerd/nerdctl githubRelease: - slug: containerd/nerdctl - tag: v0.20.0 - disableAutoChecksumValidation: true + slug: containerd/nerdctl + tag: v0.20.0 + disableAutoChecksumValidation: true includePaths: - "nerdctl-0.20.0-linux-amd64.tar.gz"