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 #50 from poblin-orange/develop
Browse files Browse the repository at this point in the history
k3s-1.20.9
  • Loading branch information
poblin-orange authored Jul 29, 2021
2 parents d7b9764 + 9a7f062 commit 17929bc
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 17 deletions.
2 changes: 1 addition & 1 deletion addblob.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bosh add-blob src/github.com/k3s-io/k3s/k3s k3s/k3s
bosh add-blob src/github.com/k3s-io/k3s/k3s-airgap-images-amd64.tar k3s-images/k3s-airgap-images-amd64.tar

pushd src/github.com/derailed/k9s/
tar xfv ./k9s_v0.24.10_Linux_x86_64.tar.gz
tar xfv ./k9s_Linux_x86_64.tar.gz
popd
bosh add-blob src/github.com/derailed/k9s/k9s k9s/k9s

Expand Down
18 changes: 9 additions & 9 deletions config/blobs.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
k3s-images/k3s-airgap-images-amd64.tar:
size: 367832576
object_id: 7667e992-0394-48e1-6d6a-8afc237611ce
sha: sha256:2e95de76133936cd75f065611b1ea0a670eb9410c53212cc2c8fa7094cd8378d
size: 368877056
object_id: 08e7c2da-24d0-4ffa-7059-42f1fd89121f
sha: sha256:30f4d0ae79d0552320ee4e41fd51295f5060980e42008e33d7f809b91d32fa23
k3s/k3s:
size: 46444544
object_id: c1aa8dfc-d74f-4612-4075-ebc6d1195311
sha: sha256:95b91eb9af7fed60d5201d783edcd0de1f84fb5953cee2286fd0e5cf4d30d3f5
size: 47329280
object_id: 4ea25234-3273-4589-7db8-2ae63cdfffc3
sha: sha256:f48a6ec7010dc3fa650b046f140f0b9f85ca690f917ec9612ccb3a180f1fa7b0
k9s/k9s:
size: 50528256
object_id: dd46f679-cdc8-455b-5de7-296546059140
sha: sha256:c6348e90f23eef119f694ae103c2beee0022cd39306162fbed4ab255fecd2fcc
size: 56107008
object_id: 9b2cbb59-653a-4de5-60e8-a42829078d87
sha: sha256:eb231ee1b420e46b735284d3a3aae9182be3b74ece493c75af934aa11d679003
kubectl/kubectl:
size: 40226816
object_id: d0f0648b-0798-4a00-7500-cd4171a90c02
Expand Down
2 changes: 2 additions & 0 deletions jobs/k3s-agent/templates/bin/ctl.erb
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ case $1 in
<% end %>
<% end %>

ulimit -n 1048576 # open files
ulimit -u unlimited # num processes

exec /var/vcap/packages/k3s/k3s agent \
-v <%= p('k3s.v') %> \
Expand Down
7 changes: 5 additions & 2 deletions jobs/k3s-server/templates/bin/ctl.erb
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,12 @@ case $1 in
<% end %>
<% end %>


echo $$ > $PIDFILE


ulimit -n 1048576 # open files
ulimit -u unlimited # num processes


exec /var/vcap/packages/k3s/k3s server \
-v <%= p('k3s.v') %> \
--token=<%= p('k3s.token') %> \
Expand Down
58 changes: 58 additions & 0 deletions releases/k3s/k3s-19.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: k3s
version: "19"
commit_hash: 702ebe5
uncommitted_changes: false
jobs:
- name: k3s-agent
version: 7079178f9125351d8c140ae67cbc739346fe428747416c548eaf204e08cb057a
fingerprint: 7079178f9125351d8c140ae67cbc739346fe428747416c548eaf204e08cb057a
sha1: sha256:ff1b726515927e03bb3a6d9b0e887f646d624c52595c2ca9205b816d5f5edf66
packages:
- k3s
- kubectl-k3s
- k3s-images
- name: k3s-agent-airgaped-images
version: dac8160deeef67d642c67065cdb584c53ca84807717f4b7abb3e748badb97313
fingerprint: dac8160deeef67d642c67065cdb584c53ca84807717f4b7abb3e748badb97313
sha1: sha256:56989c04162b348ce691ad78d9ceaefc4b46338df95ebe87fda1e5ce0a30d429
packages:
- k3s-images
- name: k3s-server
version: aeef08f834edacb89f657384959fa7b19c9b68ab7987933a3385a41686ce28e6
fingerprint: aeef08f834edacb89f657384959fa7b19c9b68ab7987933a3385a41686ce28e6
sha1: sha256:aaf793dedf52174fe9030ee4f3025f0c38f1c451f5f5c1ef93c2a806597c0fc5
packages:
- k3s
- k9s
- kubectl-k3s
- name: k3s-server-airgaped-images
version: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
fingerprint: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
sha1: sha256:fbae88a6d6e06d8ac29288b73a971832e77d2483978c56481844e1c7f8e77c78
packages:
- k3s-images
packages:
- name: k3s
version: 98291cbdc65f113ab4613899c1d5df44f2bb2a74b0eb8f91f3e97ab25261f13b
fingerprint: 98291cbdc65f113ab4613899c1d5df44f2bb2a74b0eb8f91f3e97ab25261f13b
sha1: sha256:f0b1f4b39751f06fed8b0e7dd757c5076113df97acd60c4c2daa5765ae05c2d3
dependencies: []
- name: k3s-images
version: 87d143d4959c27dd383565ff71c887976550764414b0c2159b74071515580c7f
fingerprint: 87d143d4959c27dd383565ff71c887976550764414b0c2159b74071515580c7f
sha1: sha256:f7a5be52c86d6ccf9d3dcff28733d50ae1ed31d897b39a93310b331bab4bd457
dependencies: []
- name: k9s
version: a6bdc7fe225b68ee8652ff5498619337fe61d5ca3830197d91ab5339f913d136
fingerprint: a6bdc7fe225b68ee8652ff5498619337fe61d5ca3830197d91ab5339f913d136
sha1: sha256:2dfcdedc2d73206b0b1f7f267f6f04269a39f4307ea3f7de4000bedbc5e782ef
dependencies: []
- name: kubectl-k3s
version: 879683d1f72b98af4d9cfa29f5855db733d76aed08a5b868ef0c4322262e6fc0
fingerprint: 879683d1f72b98af4d9cfa29f5855db733d76aed08a5b868ef0c4322262e6fc0
sha1: sha256:345fd8dc9ca93d43658a80b360f730e6a9ba43bac02be1b6ab3c16a1584e5cc7
dependencies: []
license:
version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa
4 changes: 2 additions & 2 deletions vendir.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: vendir.k14s.io/v1alpha1
directories:
- contents:
- githubRelease:
url: https://api.github.com/repos/k3s-io/k3s/releases/43254774
url: https://api.github.com/repos/k3s-io/k3s/releases/46636377
path: github.com/k3s-io/k3s
- githubRelease:
url: https://api.github.com/repos/derailed/k9s/releases/43263254
url: https://api.github.com/repos/derailed/k9s/releases/45905459
path: github.com/derailed/k9s
path: src
kind: LockConfig
6 changes: 3 additions & 3 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.20.7+k3s1
tag: v1.20.9+k3s1
disableAutoChecksumValidation: true
includePaths:
- "k3s"
Expand All @@ -21,9 +21,9 @@ directories:
- path: github.com/derailed/k9s
githubRelease:
slug: derailed/k9s
tag: v0.24.10
tag: v0.24.14
disableAutoChecksumValidation: true
includePaths:
- "k9s_v0.24.10_Linux_x86_64.tar.gz"
- "k9s_Linux_x86_64.tar.gz"


0 comments on commit 17929bc

Please sign in to comment.