From 726fb153bdba48d19a449a697f2d1d0f9f465f63 Mon Sep 17 00:00:00 2001 From: Denis Evers Date: Sun, 9 Jul 2023 01:27:51 +0800 Subject: [PATCH] chore: cleanup --- ansible/inventory/host_vars/kube001.sops.yaml | 21 ------------------- ansible/inventory/host_vars/kube002.sops.yaml | 21 ------------------- ansible/inventory/host_vars/kube003.sops.yaml | 21 ------------------- ansible/inventory/host_vars/kube101.sops.yaml | 21 ------------------- ansible/inventory/host_vars/kube102.sops.yaml | 21 ------------------- ansible/inventory/host_vars/kube103.sops.yaml | 21 ------------------- ansible/inventory/host_vars/kube104.sops.yaml | 21 ------------------- ansible/playbooks/cluster-prepare.yaml | 14 ++++++------- ansible/requirements.yaml | 6 +++--- 9 files changed, 10 insertions(+), 157 deletions(-) delete mode 100755 ansible/inventory/host_vars/kube001.sops.yaml delete mode 100755 ansible/inventory/host_vars/kube002.sops.yaml delete mode 100755 ansible/inventory/host_vars/kube003.sops.yaml delete mode 100755 ansible/inventory/host_vars/kube101.sops.yaml delete mode 100755 ansible/inventory/host_vars/kube102.sops.yaml delete mode 100755 ansible/inventory/host_vars/kube103.sops.yaml delete mode 100755 ansible/inventory/host_vars/kube104.sops.yaml diff --git a/ansible/inventory/host_vars/kube001.sops.yaml b/ansible/inventory/host_vars/kube001.sops.yaml deleted file mode 100755 index 7d06a8df..00000000 --- a/ansible/inventory/host_vars/kube001.sops.yaml +++ /dev/null @@ -1,21 +0,0 @@ -ansible_become_pass: ENC[AES256_GCM,data:0hl2i4VS,iv:LZ5ZT4hDmbZik5e6hzQy/XoKoVI2Zcvvol7HYHkZJZo=,tag:XJ/SgR5uflSeQAgq6tELtw==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1qctq7hfr3jv6vgx73288uukgcc5ug72sv4cuk5zt74kv4hta7qqs7xx0lw - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKU29CeFE5T3RGanNaRUg2 - V0VJd3Jqczl4cHJpQWVISEk5bUdNcURoSkNVCkRlb1B5Sk1KMDFjODJPSndwU2lh - RHMrZzIveitDNUp6L1pVZ3BMY0VjN0kKLS0tIDNicW9nQWtmejVTMXVybjF6RTJq - R0czL1FpdUxTYkVMa2NBblBwUWJzcG8KcfM7BgTAhHreX0UfdFLu+xHF9aCt2Eg/ - PdIsSw+NaNNeimI4Od9Os0LECbm9ADD4cBiss6eBMuOHAUUuYU6RKA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-06T11:26:18Z" - mac: ENC[AES256_GCM,data:65CQn1SbmFgNPWg2ZbbZaKirXNeBLDSc9pKHg/DmXpr7Jugx8cdo7ZFFXHdmI8is63z0onlnzOe7GIxD/jrMni11a17ljhP+QJXZSn3s8ptR32zTQIC/tHWTGd9w8ivSwy1OijoIrVTTzYVCkSpWqLK5PsfjJ+jatTxdVS2diJQ=,iv:tzHVtb7VbjqL7Vx7opPEki763T1Z8Pm1E7r2fFh8mvo=,tag:GdP/Z88GSdP3MtF8xczW4w==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/ansible/inventory/host_vars/kube002.sops.yaml b/ansible/inventory/host_vars/kube002.sops.yaml deleted file mode 100755 index c58c195c..00000000 --- a/ansible/inventory/host_vars/kube002.sops.yaml +++ /dev/null @@ -1,21 +0,0 @@ -ansible_become_pass: ENC[AES256_GCM,data:dV++g882,iv:GPrek3/CFzRoOg7VPswfHjuMBdR7uEU3iWB8ed2x2jo=,tag:D3YI4dN39wWVcDpUbdaPTA==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1qctq7hfr3jv6vgx73288uukgcc5ug72sv4cuk5zt74kv4hta7qqs7xx0lw - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQaWFnREpTQU5iLy9JQ3d5 - aWo3aFBDbktJdm9FZ2ZDbmhWTEd5V0ZySG1zCnBUbnl3ZzJhejc3Nm9yZ29QOEFG - Sy9zQ0JkS2N4T3FDYVFMT1pUMDAyaWMKLS0tIGFEMXpYbEtoRVczajJ1VTZ3MWhj - RWducnNlektuMURrRmdNYmFqZ3pqckEKoXG2agMc/uCzcQOMSDauITSOUvrUS7eb - sz9xUZRSwDNBXcYM8ZZMb3zuT8ZjE9/yYpmtNFGIvWQx391T55Eoxw== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-08T14:24:40Z" - mac: ENC[AES256_GCM,data:Qfp3XSRA/Blu7N0nPSR+KX1NG6zXZaS6Fu7Be/OwcEx/rVwZ75mZUho6QkdZg01xyuHZ6bSh443lmqu2Wgvpne9v1SnZDPJSx/QVvCWzz2+KiddItS7YNl9Al0UJNcc0rG3tQ1p8OujtetP8DnRRG2YyYCYWuVyaQo3RD6xn/bc=,iv:FVvOpQUr/5Jsmi6JjdR0SjZokujLHWFhgrPfF4uMtjE=,tag:sgfJCt8zgiwnGxGcI3AZjw==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/ansible/inventory/host_vars/kube003.sops.yaml b/ansible/inventory/host_vars/kube003.sops.yaml deleted file mode 100755 index 6f044d9c..00000000 --- a/ansible/inventory/host_vars/kube003.sops.yaml +++ /dev/null @@ -1,21 +0,0 @@ -ansible_become_pass: ENC[AES256_GCM,data:LIdYtvwr,iv:vaQGJVMzx/rhXm62UHKFNi69FfRd62+zota9lQg0pZ4=,tag:cVHOKz4VXJaZTCqAixpYtA==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1qctq7hfr3jv6vgx73288uukgcc5ug72sv4cuk5zt74kv4hta7qqs7xx0lw - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtbDJWMENKSjZmNUp2b1E1 - MFlwaVQ2em52K3o0R2ZGeHFRUGo5Uis5QW5VClEwaEJZOUwrbUNhUWp3aW1QNHlM - eEk3VjV1OTU0Nmd1SFhhQ3o3eFFGcFUKLS0tIElNc2RFeHBCNHIwcjFpcHFQb09w - cmU2V3ZraFJiS0NxV2l4amw5UG0yK1kK8to6JoKBKcMacou/hdMfKOAE3DAiZ7q7 - +tbTQoI2LltTRyKHDrGDiszlykLtvt33tWeYpH2O7A9Qmp/S+26BeQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-08T14:24:40Z" - mac: ENC[AES256_GCM,data:3SqS1E6ANdlbG/6PfNq1zmtJxgCbu8AIVwkEksmxVT/E0RDDtfBD8tzzuYbpaHB/htEHd74iz4GHFdpURUfjRxjH/TW7tfRleWB50m9JsD3BV3Mi+SUt8wFHDL5tANmuvGdro8kXQalgu3vuFz8nbeCxNS8kvmNo35bf2lClB0I=,iv:eyMPwPgibeai7Ge9eG3D9OV/1x7+v/5bjBLf/ck9kyk=,tag:Ojr+NPBgbyEieXxmRF2sCw==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/ansible/inventory/host_vars/kube101.sops.yaml b/ansible/inventory/host_vars/kube101.sops.yaml deleted file mode 100755 index d1aaf7f0..00000000 --- a/ansible/inventory/host_vars/kube101.sops.yaml +++ /dev/null @@ -1,21 +0,0 @@ -ansible_become_pass: ENC[AES256_GCM,data:XASEKLSK,iv:y5OpuUFTGV/9TbVAt2/V/1Y77nEIDchfttEzNab0A5U=,tag:/6+iSmB7WWfgYoMJh97aDg==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1qctq7hfr3jv6vgx73288uukgcc5ug72sv4cuk5zt74kv4hta7qqs7xx0lw - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtMnMxQjBHbnU2dm0vNTVk - ZWY4ZEgra0Q0VmhLa2UzdFBER3FoUEhVdms0CjNmK3RyZHhxd0l3dlJoRlViTVJ5 - UFdNYkh0M1RiL2ZGYW05YWpkNzU1T1EKLS0tIFFLWjk4U29jNnJ1dlE1bk1Hb1h0 - QWVkOVVHc3h2bGdxb3RMNlQvV3VRL2cKOZnNJvMWSdjONndQqfkJtb3eLdVSVPzB - KMb19vStnYdWK8LVugKIqgFhb9sPtUxk8hz6AgQzWVzpffpa4cQHYw== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-08T14:24:41Z" - mac: ENC[AES256_GCM,data:GyVJjQ9aMO7lSngJDWQaF5/gEbxx1Pdt6eKlnYEvcgv3FadonAd+mfbsuVfFovoLBnoE/dcyg8gYy28Roa9TqxEpmyazzsR30alwlOdJZjr8s3v5iJkuj+R3tsKAM95lCSeJGmDeL0p/K1q64Mt2KR42xZA583f1I0lCHjzIOzQ=,iv:pTS7/D//KnctHF5as25eQLjUd6WH9s005Sz99M24Nbo=,tag:fZYmjScGGAaXL00gNI3/aQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/ansible/inventory/host_vars/kube102.sops.yaml b/ansible/inventory/host_vars/kube102.sops.yaml deleted file mode 100755 index 75e89adc..00000000 --- a/ansible/inventory/host_vars/kube102.sops.yaml +++ /dev/null @@ -1,21 +0,0 @@ -ansible_become_pass: ENC[AES256_GCM,data:kup3Ux6W,iv:8Uo4LXavc1WYD+MWXHHl1vql9KjGJz8z5JSAv+eF/68=,tag:S09lNTlC4cKO8GmvmeuPug==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1qctq7hfr3jv6vgx73288uukgcc5ug72sv4cuk5zt74kv4hta7qqs7xx0lw - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0YndyT25adWE5VXBJZ24r - dzgyb2xYQy9KMlNuM0NGWXNHYlNUWVhEeWdFClFuTDl1L0lyWlBteldka20xQitv - dWl6eDlVaE5VejNpRHBES05VMlZwem8KLS0tIDdoNjJiR1EyQS9GWUpaS3QxV0pP - SkR6YXBHRXRXMXdvb09Mcm0rT0dseVEKfKDl1x5TASAcHpzoXtKuguor4fEaZmWh - RviLplOM0zzNMn8jzrqwoUyjtq+4e20+BoHl2AQ4+s17ca8CEeB6vg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-08T14:24:41Z" - mac: ENC[AES256_GCM,data:1SXGAtKID2dg9SscStFgzl09CPH7LRt1h2OMfw0QcaknZxt6KT8r9K4PfxRJooDYW2q1n96jvfsewvfOfq8ZPVuJ8HY1o0IBOM39VWCDPqMPimGNbHgioflZmKTPAoIuN7bfmULojtFn+zTNRtTCID+V3kRv2dyFM2vAInZrQ9I=,iv:oUd8oa3qokuM0oRL/8rlBO+bI6xeJTmEsKz5Z4ckMT0=,tag:w6FbZq875Ur6ILILygIPig==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/ansible/inventory/host_vars/kube103.sops.yaml b/ansible/inventory/host_vars/kube103.sops.yaml deleted file mode 100755 index 5891cdd1..00000000 --- a/ansible/inventory/host_vars/kube103.sops.yaml +++ /dev/null @@ -1,21 +0,0 @@ -ansible_become_pass: ENC[AES256_GCM,data:YJc+D1Hn,iv:6aOpasUfyfbTcMaAVUpnbiv465IVzSnLCVblZRYpD04=,tag:Yb8skYlZgEKo51gzi0sbLQ==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1qctq7hfr3jv6vgx73288uukgcc5ug72sv4cuk5zt74kv4hta7qqs7xx0lw - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmbTdONGxaNWpmSEdaSlJU - T0gxTmVOdmttZFNqcjZmS1VidXA5elZhS0gwCjIrTXluUlQwUWFGMTV4OTBXNzNl - SU92T1kwc0U4MUFNT0FMR3BPcm1mWWsKLS0tIDBTR3plZWFEbkhBdjNwOEhFaTFJ - NnBmOUpwM1pRS2hPV2dNYW85K1pqVG8KjPxQRHUFeUM+TRjtdegghV7FPKapcKgR - MbzNDnnkJ2pxkdOss6G3c3JKgMm54vbKgWaylHbimBpwg/Zsp6LvQA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-08T14:24:41Z" - mac: ENC[AES256_GCM,data:Ik6BRsi8g9WXRXpvs21IyDsCJ5lIDZUNKl3Iz+hTIoymT4hRu2QUQeKQfFfzB/g5rEuOBXLAIYUcVxeGbPCn57Jv7dYhk0NPH5e2cP6eDmWrtUQ/Wuv7LqEr4QUJyX5TTz0ZoZgx7NZXDT9gDZRdzGbTE2oERKhfcxQVU4xQG6Y=,iv:oaEfYdnLuwCZN9A6EtZgcbK2g2HYLEGPzjXQx6lhWbI=,tag:uovk9XBTS9qQ6j0wbaJx0g==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/ansible/inventory/host_vars/kube104.sops.yaml b/ansible/inventory/host_vars/kube104.sops.yaml deleted file mode 100755 index 25f2afbd..00000000 --- a/ansible/inventory/host_vars/kube104.sops.yaml +++ /dev/null @@ -1,21 +0,0 @@ -ansible_become_pass: ENC[AES256_GCM,data:Xal209Sz,iv:XhqTwwx/RigMUE7UxdLX8YhmzeWBMWYArKYV7mtLKO8=,tag:DJwbtu5QELkmIggANFtTFg==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1qctq7hfr3jv6vgx73288uukgcc5ug72sv4cuk5zt74kv4hta7qqs7xx0lw - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4T3o1QjhZVEtSeFRYa1ZB - cEhmcSs0WmVtb2NmRlhZVmZ6L0FKNVE1bGhNCklBUmltcjVWZEgxaWlUNnBESm1n - c0MzVHBXUUgvNXhlazZnVDhTTkpLRWsKLS0tIFB4MDJpMmQ4bER2d2RWeHNJWEJl - djZWMFhEejgrRTlpUGVmQ1pEU2gzNTQKFDxdRAawL/pOZNZeKQ/LGv0dDKhWgdq+ - MZ21tpKR8zd+VjDUdwbwlQJ8SYvM4DLEr2azAovgAqDR22MH4n/+Kw== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-08T14:24:42Z" - mac: ENC[AES256_GCM,data:koXPEtOx4GEc4UXUNmhpWDpulsXSCOQ+gk8vJKi4eA8ic8ZPXtGKSv0Nv2KAVtRI4e83SbpBqQTDRiifz/zv5L1fZzbhBkFmchJ+kdEEdjxD96crFCyMtaXtZ+FU3ugAGfSg1n1bTw9Cu9Exbd9Tr3Yb1I8n2k9qwgj5f3hrTyk=,iv:la1Zbbfh11Aq2IVXntLxA09/121gYyhQ8nA4E4mAfHs=,tag:0b6HBZUfaYdwXx9lz4kh2w==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/ansible/playbooks/cluster-prepare.yaml b/ansible/playbooks/cluster-prepare.yaml index e6884f3e..10d8d2e8 100644 --- a/ansible/playbooks/cluster-prepare.yaml +++ b/ansible/playbooks/cluster-prepare.yaml @@ -113,13 +113,13 @@ fs.inotify.max_user_watches: 524288 fs.inotify.max_user_instances: 8192 - - name: Disable IPv6 - ansible.builtin.include_role: - name: dmotte.disable_ipv6 - public: true - vars: - ansible_become: true - reload_sysctl_if_changed: false + # - name: Disable IPv6 + # ansible.builtin.include_role: + # name: dmotte.disable_ipv6 + # public: true + # vars: + # ansible_become: true + # reload_sysctl_if_changed: false handlers: - name: Reboot diff --git a/ansible/requirements.yaml b/ansible/requirements.yaml index 0193b59e..64b4d594 100644 --- a/ansible/requirements.yaml +++ b/ansible/requirements.yaml @@ -14,6 +14,6 @@ roles: - name: xanmanning.k3s src: https://github.com/PyratLabs/ansible-role-k3s.git version: v3.4.2 - - name: dmotte.disable_ipv6 - src: https://github.com/dmotte/ansible-role-disable-ipv6.git - version: "1.1.0" + # - name: dmotte.disable_ipv6 + # src: https://github.com/dmotte/ansible-role-disable-ipv6.git + # version: "1.1.0"