From cfe1344376ddc97195dff41f4d4b2492f69e9041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Tue, 29 Mar 2022 03:19:52 +0200 Subject: [PATCH] Fix yamllint findings (#271) --- .config.sample.env | 2 +- cluster/apps/default/echo-server/helm-release.yaml | 8 ++++---- cluster/apps/kube-system/reloader/kustomization.yaml | 2 +- cluster/core/kube-system/kube-vip/rbac.yaml | 6 +++--- configure.sh | 2 +- provision/ansible/roles/ubuntu/tasks/packages.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.config.sample.env b/.config.sample.env index 9f810061..f183ce87 100644 --- a/.config.sample.env +++ b/.config.sample.env @@ -39,7 +39,7 @@ export BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDRESS="" # # Default prefixes for hostnames assigned by Ansible # These are unused on nodes where BOOTSTRAP_ANSIBLE_HOSTNAME_ is provided -# +# export BOOTSTRAP_ANSIBLE_DEFAULT_CONTROL_NODE_HOSTNAME_PREFIX="k8s-" export BOOTSTRAP_ANSIBLE_DEFAULT_NODE_HOSTNAME_PREFIX="k8s-" diff --git a/cluster/apps/default/echo-server/helm-release.yaml b/cluster/apps/default/echo-server/helm-release.yaml index a359774b..0e3b60dc 100644 --- a/cluster/apps/default/echo-server/helm-release.yaml +++ b/cluster/apps/default/echo-server/helm-release.yaml @@ -29,10 +29,10 @@ spec: ingress: enabled: true annotations: - cert-manager.io/cluster-issuer: "letsencrypt-production" - hajimari.io/enable: "true" - hajimari.io/icon: "video-input-antenna" - traefik.ingress.kubernetes.io/router.entrypoints: "websecure" + cert-manager.io/cluster-issuer: "letsencrypt-production" + hajimari.io/enable: "true" + hajimari.io/icon: "video-input-antenna" + traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "echo-server.${SECRET_DOMAIN}" paths: diff --git a/cluster/apps/kube-system/reloader/kustomization.yaml b/cluster/apps/kube-system/reloader/kustomization.yaml index bfe696aa..2fa2de20 100644 --- a/cluster/apps/kube-system/reloader/kustomization.yaml +++ b/cluster/apps/kube-system/reloader/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm-release.yaml \ No newline at end of file + - helm-release.yaml diff --git a/cluster/core/kube-system/kube-vip/rbac.yaml b/cluster/core/kube-system/kube-vip/rbac.yaml index 72f6fda8..6b742ce8 100644 --- a/cluster/core/kube-system/kube-vip/rbac.yaml +++ b/cluster/core/kube-system/kube-vip/rbac.yaml @@ -28,6 +28,6 @@ roleRef: kind: ClusterRole name: system:kube-vip-role subjects: -- kind: ServiceAccount - name: kube-vip - namespace: kube-system + - kind: ServiceAccount + name: kube-vip + namespace: kube-system diff --git a/configure.sh b/configure.sh index f0e3d351..0580ca67 100755 --- a/configure.sh +++ b/configure.sh @@ -229,7 +229,7 @@ verify_ansible_hosts() { local node_hostname= local default_control_node_prefix= local default_worker_node_prefix= - + default_control_node_prefix="BOOTSTRAP_ANSIBLE_DEFAULT_CONTROL_NODE_HOSTNAME_PREFIX" default_worker_node_prefix="BOOTSTRAP_ANSIBLE_DEFAULT_NODE_HOSTNAME_PREFIX" _has_optional_envar "${default_control_node_prefix}" diff --git a/provision/ansible/roles/ubuntu/tasks/packages.yml b/provision/ansible/roles/ubuntu/tasks/packages.yml index 1d15b876..f6459a36 100644 --- a/provision/ansible/roles/ubuntu/tasks/packages.yml +++ b/provision/ansible/roles/ubuntu/tasks/packages.yml @@ -40,7 +40,7 @@ - name: Check if Raspberry Pi command: grep -q "Raspberry Pi" /proc/cpuinfo ignore_errors: true - register: is_raspberry + register: is_raspberry - name: Install raspberry specific packages for Ubuntu 21 or greater ansible.builtin.apt: @@ -55,7 +55,7 @@ retries: 5 until: apt_install_raspberry is success when: is_raspberry and (ansible_lsb.major_release|int >= 21) - + - name: Copy 20auto-upgrades unattended-upgrades config ansible.builtin.blockinfile: path: /etc/apt/apt.conf.d/20auto-upgrades