Merge pull request #121 from poblin-orange/develop

version 124.4, add disable-kube-proxy

.final_builds/jobs/k3s-server/index.yml

@@ -115,6 +115,10 @@ builds:
     version: ca23ca546f68cf61fcd1ab4e90c591f0dfed8aed6d48ff61fa546a9516c92150
     blobstore_id: aa8b0336-14ec-40a7-460b-128f90104cca
     sha1: sha256:3377688e3e506127447f98ed45dd2282875e86227b4e195387848c10a7c35732
+  d6094196316ce902d758a5b45387c238b504bdc5749fb6b6c75c85a126a91573:
+    version: d6094196316ce902d758a5b45387c238b504bdc5749fb6b6c75c85a126a91573
+    blobstore_id: cff351ea-be2f-4a45-4cb2-da06f25943ac
+    sha1: sha256:37897fc1ddac392160af182f119d6addb2b122b36fe092390ba23143e270f8e1
   dff3f17902ee0c445c33474c63346bffff50b389f8f3a5b16e67cdf1af2dd7a8:
     version: dff3f17902ee0c445c33474c63346bffff50b389f8f3a5b16e67cdf1af2dd7a8
     blobstore_id: 5d4572f9-3e26-477a-404d-6c3bb0d2a6dd

jobs/k3s-server/spec

@@ -70,6 +70,9 @@ properties:
   k3s.disable-network-policy:
     description: "(components) Disable k3s default network policy controller"
 
+  k3s.disable-kube-proxy:
+    description: "(components) Disable running kube-proxy"
+
   k3s.token:
     description: (cluster) Shared secret used to join a server or agent to a cluster [$K3S_TOKEN]
 

jobs/k3s-server/templates/bin/ctl.erb

@@ -69,6 +69,12 @@ case $1 in
     export FLAGS="$FLAGS --disable-network-policy"
 <% end %>
 
+<% if_p('k3s.disable-kube-proxy') do |value| %>
+    export FLAGS="$FLAGS --disable-kube-proxy"
+<% end %>
+
+
+
 
 <% if_p('k3s.node-labels') do |value| %>
 <% p('k3s.node-labels').each do |label| %>

releases/k3s/index.yml

@@ -59,6 +59,8 @@ builds:
     version: "21"
   b64e6d58-dafc-4c3f-4ab6-1cf676253eb6:
     version: "26"
+  b97aecbc-84bc-4dcf-44f1-134c9b16fae3:
+    version: "124.4"
   bd7b1738-aa12-4f3a-55e9-fbeba85494d9:
     version: "11"
   bef88478-9dda-48d7-47bb-d21aafc13f57:

releases/k3s/k3s-124.4.yml

@@ -0,0 +1,65 @@
+name: k3s
+version: "124.4"
+commit_hash: fb01c43
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: 14c3a45a7556c3adee7dd7c8910ffc0d6527761af6e0dfd777091977d2f87a0c
+  fingerprint: 14c3a45a7556c3adee7dd7c8910ffc0d6527761af6e0dfd777091977d2f87a0c
+  sha1: sha256:0ea2ca7399f49df47a7a6cbbcf438c2ead48c3455d61cd450427bcbc3af9151f
+  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: d6094196316ce902d758a5b45387c238b504bdc5749fb6b6c75c85a126a91573
+  fingerprint: d6094196316ce902d758a5b45387c238b504bdc5749fb6b6c75c85a126a91573
+  sha1: sha256:37897fc1ddac392160af182f119d6addb2b122b36fe092390ba23143e270f8e1
+  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: c669f9ecbc24fdd1c43ad76efe48c06462847af2b846304109217add21eaa875
+  fingerprint: c669f9ecbc24fdd1c43ad76efe48c06462847af2b846304109217add21eaa875
+  sha1: sha256:f58b052f562cf24da1c7bd2cbb90b0e84ba954b3bdcced2c709ce194ce72af8c
+  dependencies: []
+- name: k3s-images
+  version: a16ce2041f67cebc88abecf01a53170ec42c573dcf85a5bdaf24fec785b7e21e
+  fingerprint: a16ce2041f67cebc88abecf01a53170ec42c573dcf85a5bdaf24fec785b7e21e
+  sha1: sha256:269ed13519fd43c1229e3e27ba74177c1a56a235a630370db3baa142dfb6caf6
+  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