From b8cba7a3610bde87792643af098a6cca19eff34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20R=C3=B8stvik?= Date: Tue, 13 Dec 2022 00:58:34 +0100 Subject: [PATCH] yeet --- ansible/group_vars/kube.yml | 2 +- ansible/requirements.txt | 4 +- ansible/roles/kubernetes/defaults/main.yml | 4 +- .../roles/kubernetes/tasks/controlplane.yml | 18 ------- ansible/roles/kubernetes/tasks/node.yml | 3 ++ ansible/vars/vault.yml | 50 +++++++++---------- cloud-init/arm-ubuntu/user-data | 2 + 7 files changed, 35 insertions(+), 48 deletions(-) diff --git a/ansible/group_vars/kube.yml b/ansible/group_vars/kube.yml index 3930468..25d54e7 100644 --- a/ansible/group_vars/kube.yml +++ b/ansible/group_vars/kube.yml @@ -1,5 +1,5 @@ kube_release: "1.25" -kube_apt: "{{ kube_release }}.3-00" +kube_apt: "{{ kube_release }}.5-00" containerd_config_default_write: true containerd_config_cgroup_driver_systemd: true diff --git a/ansible/requirements.txt b/ansible/requirements.txt index 8e1f1b1..cb33194 100644 --- a/ansible/requirements.txt +++ b/ansible/requirements.txt @@ -1,6 +1,6 @@ -ansible-lint==6.8.1 +ansible-lint==6.8.6 yamllint==1.28.0 -ansible==6.4.0 +ansible==7.1.0 wheel==0.37.1 jmespath==1.0.1 passlib==1.7.4 ; sys_platform == 'darwin' \ No newline at end of file diff --git a/ansible/roles/kubernetes/defaults/main.yml b/ansible/roles/kubernetes/defaults/main.yml index 430b7bc..6f5448f 100644 --- a/ansible/roles/kubernetes/defaults/main.yml +++ b/ansible/roles/kubernetes/defaults/main.yml @@ -1,2 +1,2 @@ -kube_release: "1.24" -kube_apt: "{{ kube_release }}.1-00" +kube_release: "1.25" +kube_apt: "{{ kube_release }}.5-00" diff --git a/ansible/roles/kubernetes/tasks/controlplane.yml b/ansible/roles/kubernetes/tasks/controlplane.yml index f20e98e..306b03a 100644 --- a/ansible/roles/kubernetes/tasks/controlplane.yml +++ b/ansible/roles/kubernetes/tasks/controlplane.yml @@ -1,21 +1,3 @@ -- name: Install kubectl - become: "{{ do_become }}" - ansible.builtin.apt: - name: "{{ item }}={{ kube_apt }}" - state: present - with_items: - - kubectl - -- name: Hold kubectl version - become: "{{ do_become }}" - ansible.builtin.dpkg_selections: - name: "{{ item }}" - selection: "hold" - with_items: - - kubectl - - kubelet - - kubeadm - - name: Add kubectl alias to bash ansible.builtin.lineinfile: mode: "0644" diff --git a/ansible/roles/kubernetes/tasks/node.yml b/ansible/roles/kubernetes/tasks/node.yml index d4aaf45..f5d114c 100644 --- a/ansible/roles/kubernetes/tasks/node.yml +++ b/ansible/roles/kubernetes/tasks/node.yml @@ -138,9 +138,11 @@ become: "{{ do_become }}" ansible.builtin.apt: name: + - kubectl={{ kube_apt }} - kubelet={{ kube_apt }} - kubeadm={{ kube_apt }} state: present + allow_downgrade: yes - name: Hold kubernetes version become: "{{ do_become }}" @@ -151,3 +153,4 @@ with_items: - kubelet - kubeadm + - kubectl diff --git a/ansible/vars/vault.yml b/ansible/vars/vault.yml index 47e00e8..47e865b 100644 --- a/ansible/vars/vault.yml +++ b/ansible/vars/vault.yml @@ -1,26 +1,26 @@ $ANSIBLE_VAULT;1.1;AES256 -31333662613161383131356664306361306461306265386531316263316464336633353130613363 -3035633232343561313166323432653762306136386565300a396439396335346235306332326637 -63623366373766383939396639313332363666376366333265613734333934613465616666343861 -6338346632363633350a383466383638383338616139346530343837666664636165353463303131 -64373763316434653964306232653031623435626639653335343562346635386662613263336234 -32613763386331663533363835393139313637343763363932343261633264643264363263333637 -61313337633435353163383165633135616531396137633363383662656165393665633838333039 -62316435613338383932326134303064306132343936653930393637656130666232643964323462 -32366338643938643934373463323339333038633666656162343265343036393830386166393837 -32323137373038623333383561626330306631636334656462323337363464316331613634623130 -33323037666237363135333437326237363962363033613962383363396138353137386636613838 -63373034323965626662336130646232663764326635366239646163373561303531353265366638 -36353737383334336538313831643066373336623635626435323266303462363366643661636165 -39393233373732653532376563646337633139323964383165383865333663346536613062343265 -30333239363730643432366562613766366561346232653537636637646635323163636139666163 -66616439343663613964633839613938653834633863656230646638346539306334653535626437 -39373030363337356366313864633737336334323662633639346237373030663131663237623035 -33396639343266326230353135323533303639306637333863636332386562323963653435336630 -31613839323164623335653635343733633365323161633065383861346263343563336134373835 -37616365653034333464653737626533353031333735313634383265646236616634643830626337 -38343264343361333036653138663438636239306332346231373164306639623834313365376636 -61643266346163613231303961623264623133356538613464313030613863623939303363643562 -33313164653461623338313261363334393061393338363339303739316634356638393165353036 -36343735393539326463363434363764343261663462336330373431646166653339653632346636 -3734 +62663537323738653032626230313437326531306661353238636432666566383133623337343636 +3630313937663234636263313137336138363031326336370a666538333433323635626631356337 +61366337303238636339323535643132326664646138333633663262646237396538623763353764 +3138306564336262660a616135663631353835396631373439346662343539663933626236303231 +30336531313235653335613738663239653330656262663265333266303239626332353463653137 +62396335616538326462316430363962383036616639383034303836373934623435323437616137 +35346339663035633239656363623762386534613766616361653638343566306338386265316361 +64336535616131383933336261626636313233623533633836616261376333333562643035623431 +64633262343030356330623538663830386563643335306265333537333034313166613631613164 +63653962326361323765633137663362346337326339396363333239613864623836626662303630 +61626265643464633430376432346662356636643732666535323562323033613166313362313734 +32343735363461633239333130616561363230333339633036623336373734623063393030633663 +61653932303162633035636661623036613564333461623035653734343730356262303732396665 +64393761656131646531383030356236336632313031633637323230663861303762396335663564 +32303630643065376535376665663333313330346161663232356461333464623762343538383739 +37346431316637613134373434613138313064613438383138376365393833643837366236623564 +66656537336361343733383337336563393562646263373435393737323163353462343265653435 +61326239303930626235313231383638323737666339323664663365393838643136626531313939 +32626465656539323033396338643138666264633933613237373165373833643365343533333238 +62363635393037346539313063333332643861313661396265356537616132613866383461313933 +30666463613166386665626161313763323464653564363239333938303630633237623730643664 +34393634356435326538316435346635636631376565393534313233343534303138666631363035 +37306438633233633766366565363034303863303232633436303434336430383539643539326131 +34396139396134333831643437656363623734356632383138373339373532386665636366303861 +3363 diff --git a/cloud-init/arm-ubuntu/user-data b/cloud-init/arm-ubuntu/user-data index 303202a..74fb1d7 100644 --- a/cloud-init/arm-ubuntu/user-data +++ b/cloud-init/arm-ubuntu/user-data @@ -3,6 +3,8 @@ hostname: node01.kube.rostvik.home manage_etc_hosts: false packages: - avahi-daemon + - linux-modules-extra-raspi + - vlan apt: conf: | Acquire {