Skip to content
This repository has been archived by the owner on Oct 16, 2024. It is now read-only.

Commit

Permalink
Merge pull request #117 from poblin-orange/develop
Browse files Browse the repository at this point in the history
k3s-1.24.12-k3s1, additional flags for cidr
  • Loading branch information
poblin-orange authored Apr 20, 2023
2 parents 2038d0e + 56b938b commit 40b81cb
Show file tree
Hide file tree
Showing 13 changed files with 134 additions and 25 deletions.
4 changes: 4 additions & 0 deletions .final_builds/jobs/k3s-server/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ builds:
version: 8e71aec12353e84243fe453f4a51dbffc58fe5a116d8ca2a17cf1da96a60c078
blobstore_id: 66e7f1a6-c684-4b0d-45d7-1205367ee2a8
sha1: sha256:3e71a97942889230e4036f6b725abca193742d90a690c7907487b9a0d295f60c
9e874f7c2e5c93d892b0c360896c957921aae0b3dd9ab18e9d91b676dc00dc33:
version: 9e874f7c2e5c93d892b0c360896c957921aae0b3dd9ab18e9d91b676dc00dc33
blobstore_id: 3e923f17-c43f-49d8-410a-6a88c5e69853
sha1: sha256:4b264b34f28b632181de42467e864feb27a0a23236d364f04210b4f657da4991
9f04cd73d4f7595d91de5898c210ca68a3d1b9349dc90018ea388feaf16624d5:
version: 9f04cd73d4f7595d91de5898c210ca68a3d1b9349dc90018ea388feaf16624d5
blobstore_id: d617792a-db19-4210-6a47-4e52a920aa19
Expand Down
4 changes: 4 additions & 0 deletions .final_builds/packages/k3s-images/index.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
builds:
080c6a14f02bcbdb01f6db1ac4eac969140eca9700af2a72b90ccc85a5ceb619:
version: 080c6a14f02bcbdb01f6db1ac4eac969140eca9700af2a72b90ccc85a5ceb619
blobstore_id: f2d2ccd1-b42a-46f4-5170-aea1f8ed3160
sha1: sha256:8d8cce31558c01947337396d6bb9773a3a2a2da189bd83e67969c14a7689559b
0d29cc086527b5e91253d1f85dcfcc2deb88f0c956c216563facbe62ffc8a6c4:
version: 0d29cc086527b5e91253d1f85dcfcc2deb88f0c956c216563facbe62ffc8a6c4
blobstore_id: 4cc54da2-799b-4f82-5984-fdd12d71fdf3
Expand Down
4 changes: 4 additions & 0 deletions .final_builds/packages/k3s/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ builds:
version: aa0b9b2a5448049da2018239119f8b9aec0b6cb8ed34b443d896728325f8258e
blobstore_id: ee56e5ef-3faa-43fc-4b14-f1f2ba8b49bb
sha1: sha256:bc8263eb8d902a8fd9e0cac846712f35ee2b6fb0d5bb2f0cd19fe9169e0e6da8
baf4240f1adbd85c640f3579ebbc2b293889d5171171c0660c14c88c691ab006:
version: baf4240f1adbd85c640f3579ebbc2b293889d5171171c0660c14c88c691ab006
blobstore_id: 3a5f25be-9825-4c37-41d5-1ace68029007
sha1: sha256:a526b35758ae01e029b4d7c7ade3bfb6be55a8026245a1ae1d63fe9a4100fec0
bd835f9140f89b074f7a4316ddcfe7aa8189485b65ffb29048765e52e148edd0:
version: bd835f9140f89b074f7a4316ddcfe7aa8189485b65ffb29048765e52e148edd0
blobstore_id: 2db543a9-a770-4fe8-4ef2-94aca9210a9d
Expand Down
4 changes: 4 additions & 0 deletions .final_builds/packages/k9s/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ builds:
version: 24b739026ef4bf491afc64ba3f32f7373dfe02e72f3f12a99af4f2c2b0eb106b
blobstore_id: 4da80913-361d-4ba5-7f98-96d9b41011a9
sha1: sha256:c1cffd40cbbb48bd80a35acf981d428051740da0c68835de7bede43d24cb3ece
3361dc5a05232dae5ca0add2dd21bf17a91d5bad5dbb1e0ebb5e1354864118c1:
version: 3361dc5a05232dae5ca0add2dd21bf17a91d5bad5dbb1e0ebb5e1354864118c1
blobstore_id: faf6c1f6-bf00-479a-70cf-702d116165b1
sha1: sha256:4438a7e72c58d1550be8a296a9f89d3b0340954ed0f21ba7c8643d2b6fd09fa2
42776078174c132d18bdbb55063988503c7fcaf66dcc2cba018f337faeb02cf9:
version: 42776078174c132d18bdbb55063988503c7fcaf66dcc2cba018f337faeb02cf9
blobstore_id: 3f7887dc-854a-42f4-7c60-d14d66c9b7c8
Expand Down
4 changes: 4 additions & 0 deletions .final_builds/packages/nerdctl/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ builds:
version: 2a90585f7e5f1d0009e343808638f0e06a927103a1a057d8fda6733186da719f
blobstore_id: 214794ec-be19-45ef-570e-47f64abb7907
sha1: sha256:e067568fa0de560293be78f27928f703fd28d01b00aaf976a3d889bec5d35cf2
3ef7aaf0a97b5ea75f13913f2c73609b90e9fb46695d743c2acedd5d0d9e4eb4:
version: 3ef7aaf0a97b5ea75f13913f2c73609b90e9fb46695d743c2acedd5d0d9e4eb4
blobstore_id: 8a3b4ded-8ae6-43f7-6a6b-9de8af446b5e
sha1: sha256:beb08f27a3f548472c8c0edee96e813fba538d7e4b2229325e5262cc30aa7d30
873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61:
version: 873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61
blobstore_id: a17c8b40-97ef-4a32-5e93-b472b8815a2d
Expand Down
4 changes: 2 additions & 2 deletions addblob.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ bosh add-blob src/github.com/k3s-io/k3s/k3s-airgap-images-amd64.tar k3s-images/k


pushd src/github.com/derailed/k9s/
tar xfv ./k9s_Linux_x86_64.tar.gz
tar xfv ./k9s_Linux_amd64.tar.gz
popd


bosh add-blob src/github.com/derailed/k9s/k9s k9s/k9s

pushd src/github.com/containerd/nerdctl/
tar xfv ./nerdctl-1.1.0-linux-amd64.tar.gz
tar xfv ./nerdctl-1.3.1-linux-amd64.tar.gz
popd

bosh add-blob src/github.com/containerd/nerdctl/nerdctl nerdctl/nerdctl
Expand Down
24 changes: 12 additions & 12 deletions config/blobs.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
k3s-images/k3s-airgap-images-amd64.tar:
size: 554935808
object_id: 6cf125f1-8ac1-4e82-6122-73cba8e54929
sha: sha256:7d9008faf4b192e1ab0cce1d177cb615c6e30a777ac6e7ad66b7b15be4d1be5f
object_id: 7e020fdb-e9fb-4208-7c70-38b6bc0c5615
sha: sha256:356552df2dbe514a54f0558021cb2c98349ee8de5161c91370f46790853e85c6
k3s/k3s:
size: 64569344
object_id: 6e551751-5779-4d0b-4fb2-de79653447b5
sha: sha256:30e781060532ab5b16b8f8481a70e98f4858c343fd4c73319e2d6a96970689e7
size: 66809856
object_id: e752bcf9-c117-4d08-66b5-6268f8e3c0db
sha: sha256:c57c55a50e470aab4fa915f8da73400de8a6a75a98d91514778ec1a9931c678a
k9s/k9s:
size: 56823808
object_id: dad5e912-cba2-466d-4033-cb84fe7cd07b
sha: sha256:9a4dbb8e339423b3c7cd587f4abdd20351c01af15c8f1546b99f4557199e2c74
size: 58847232
object_id: 2947d2a8-89c3-4021-4f25-a1f63bb964ee
sha: sha256:09a7bb21255f794501946467a333b99d8fe77f1e4c8a91409f75d80723b80fee
kubectl/kubectl:
size: 45752320
object_id: c9443d65-04bf-4fd5-4ccc-b159e8cb8ea1
object_id: ec5cd13e-68cc-4672-7146-fba9e8a63d8c
sha: sha256:7e13f33b7379b6c25c3ae055e4389eb3eef168e563f37b5c5f1be672e46b686e
nerdctl/nerdctl:
size: 28536832
object_id: e33375dc-caaf-4907-67d6-9ac0e535c0e4
sha: sha256:fcba9e27cf5b170415cdcdf60db8a928ce0bf382b1dc888804647a23acdee906
size: 24952832
object_id: 032b8adb-93bf-44db-424e-1abf54eaeb89
sha: sha256:07ce98d7c0975bd6e86fdf36e6826dd99fa183c84f65aab9d4f709659cbf04cc
9 changes: 9 additions & 0 deletions jobs/k3s-server/spec
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,15 @@ properties:
description: additional env vars (name/value map array) to set for containerd (the key will be prefixed with CONTAINERD_, and set in k3s launch context
default: []

#cidr config
k3s.cluster-cidr:
description: "(networking) IPv4/IPv6 network CIDRs to use for pod IPs (default: 10.42.0.0/16)"
k3s.service-cidr:
description: "(networking) IPv4/IPv6 network CIDRs to use for service IPs (default: 10.43.0.0/16)"
k3s.cluster-dns:
description: "(networking) IPv4 Cluster IP for coredns service. Should be in your service-cidr range (default: 10.43.0.10)"



#audit policy file
k3s.audit-policy-file:
Expand Down
13 changes: 13 additions & 0 deletions jobs/k3s-server/templates/bin/ctl.erb
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,25 @@ case $1 in
<% end %>
<% end %>



<% if_p('k3s.kubelet-args') do |value| %>
<% p('k3s.kubelet-args').each do |flag| %>
export FLAGS="$FLAGS --kubelet-arg=<%= flag %>"
<% end %>
<% end %>

<% if_p('k3s.cluster-cidr') do |value| %>
export FLAGS="$FLAGS --cluster-cidr=<%= value %>"
<% end %>

<% if_p('k3s.service-cidr') do |value| %>
export FLAGS="$FLAGS --service-cidr=<%= value %>"
<% end %>

<% if_p('k3s.cluster-dns') do |value| %>
export FLAGS="$FLAGS --cluster-dns=<%= value %>"
<% end %>

<% if_p('k3s.containerd_additional_env_vars') do |value| %>
<% p('k3s.containerd_additional_env_vars').each do |var| %>
Expand Down
2 changes: 2 additions & 0 deletions releases/k3s/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ builds:
version: "10"
4c014783-a1dd-401b-59c1-2cc3e51c80d2:
version: "25"
4d3c3bf2-4229-4d40-5588-f9479890e9d8:
version: "124.2"
4d82d8ad-574d-41b1-5cd4-aece1bd4703b:
version: "24"
4e64a643-4d01-48fa-794b-6564cef26f31:
Expand Down
65 changes: 65 additions & 0 deletions releases/k3s/k3s-124.2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: k3s
version: "124.2"
commit_hash: 0a87530
uncommitted_changes: false
jobs:
- name: k3s-agent
version: cea72360b5c14c0686925f0df2b2ba5baf0aa5533c44447944c25ba4b2792eb1
fingerprint: cea72360b5c14c0686925f0df2b2ba5baf0aa5533c44447944c25ba4b2792eb1
sha1: sha256:2f055820ed416b3bd7225412954c1502f61fbb58cb5ec7eed84d22a35ccfe7af
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: 9e874f7c2e5c93d892b0c360896c957921aae0b3dd9ab18e9d91b676dc00dc33
fingerprint: 9e874f7c2e5c93d892b0c360896c957921aae0b3dd9ab18e9d91b676dc00dc33
sha1: sha256:4b264b34f28b632181de42467e864feb27a0a23236d364f04210b4f657da4991
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: baf4240f1adbd85c640f3579ebbc2b293889d5171171c0660c14c88c691ab006
fingerprint: baf4240f1adbd85c640f3579ebbc2b293889d5171171c0660c14c88c691ab006
sha1: sha256:a526b35758ae01e029b4d7c7ade3bfb6be55a8026245a1ae1d63fe9a4100fec0
dependencies: []
- name: k3s-images
version: 080c6a14f02bcbdb01f6db1ac4eac969140eca9700af2a72b90ccc85a5ceb619
fingerprint: 080c6a14f02bcbdb01f6db1ac4eac969140eca9700af2a72b90ccc85a5ceb619
sha1: sha256:8d8cce31558c01947337396d6bb9773a3a2a2da189bd83e67969c14a7689559b
dependencies: []
- name: k9s
version: 3361dc5a05232dae5ca0add2dd21bf17a91d5bad5dbb1e0ebb5e1354864118c1
fingerprint: 3361dc5a05232dae5ca0add2dd21bf17a91d5bad5dbb1e0ebb5e1354864118c1
sha1: sha256:4438a7e72c58d1550be8a296a9f89d3b0340954ed0f21ba7c8643d2b6fd09fa2
dependencies: []
- name: kubectl-k3s
version: 7ad3a6f1733dd6068d1f380ffff2daeaec2d7bbefdc297873854c55eec287f86
fingerprint: 7ad3a6f1733dd6068d1f380ffff2daeaec2d7bbefdc297873854c55eec287f86
sha1: sha256:0325c1d22e341d13c91abf7df05c31c3df8effa6da3c3d0bca3920e26edca721
dependencies: []
- name: nerdctl
version: 3ef7aaf0a97b5ea75f13913f2c73609b90e9fb46695d743c2acedd5d0d9e4eb4
fingerprint: 3ef7aaf0a97b5ea75f13913f2c73609b90e9fb46695d743c2acedd5d0d9e4eb4
sha1: sha256:beb08f27a3f548472c8c0edee96e813fba538d7e4b2229325e5262cc30aa7d30
dependencies: []
license:
version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa
12 changes: 6 additions & 6 deletions vendir.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ apiVersion: vendir.k14s.io/v1alpha1
directories:
- contents:
- githubRelease:
tag: v1.24.9+k3s2
url: https://api.github.com/repos/k3s-io/k3s/releases/88647044
tag: v1.24.12+k3s1
url: https://api.github.com/repos/k3s-io/k3s/releases/97087851
path: github.com/k3s-io/k3s
- githubRelease:
tag: v0.26.7
url: https://api.github.com/repos/derailed/k9s/releases/80222550
tag: v0.27.3
url: https://api.github.com/repos/derailed/k9s/releases/92146754
path: github.com/derailed/k9s
- githubRelease:
tag: v1.1.0
url: https://api.github.com/repos/containerd/nerdctl/releases/85678650
tag: v1.3.1
url: https://api.github.com/repos/containerd/nerdctl/releases/99499161
path: github.com/containerd/nerdctl
path: src
kind: LockConfig
10 changes: 5 additions & 5 deletions vendir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ directories:
- path: github.com/k3s-io/k3s
githubRelease:
slug: k3s-io/k3s
tag: v1.24.9+k3s2
tag: v1.24.12+k3s1
disableAutoChecksumValidation: true
includePaths:
- "k3s"
Expand All @@ -21,17 +21,17 @@ directories:
- path: github.com/derailed/k9s
githubRelease:
slug: derailed/k9s
tag: v0.26.7
tag: v0.27.3
disableAutoChecksumValidation: true
includePaths:
- "k9s_Linux_x86_64.tar.gz"
- "k9s_Linux_amd64.tar.gz"


- path: github.com/containerd/nerdctl
githubRelease:
slug: containerd/nerdctl
tag: v1.1.0
tag: v1.3.1
disableAutoChecksumValidation: true
includePaths:
- "nerdctl-1.1.0-linux-amd64.tar.gz"
- "nerdctl-1.3.1-linux-amd64.tar.gz"

0 comments on commit 40b81cb

Please sign in to comment.