This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch revert-9133-pre-commit-check-yaml in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 61328bcd54a59cba8cffc566f5e0b0c368068df0 Author: dahn <daan.hoogl...@gmail.com> AuthorDate: Sat Jan 4 08:21:37 2025 +0100 Revert "pre-commit: add hook `check-yaml` (#9133)" This reverts commit 57867dc6b031b996147ccfc32deba3624227fbce. --- .pre-commit-config.yaml | 2 +- .../kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml | 2 +- .../kubernetes-service/src/main/resources/conf/k8s-control-node.yml | 2 +- .../kubernetes-service/src/main/resources/conf/k8s-node.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9a2173fb5e3..a9bc87454f1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,7 +34,7 @@ repos: - id: check-merge-conflict - id: check-symlinks - id: check-vcs-permalinks - - id: check-yaml + #- id: check-yaml - id: destroyed-symlinks - id: detect-aws-credentials args: [--allow-missing-credentials] diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml index 59cb1fccb1c..6819723b3f0 100644 --- a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml +++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml @@ -21,7 +21,7 @@ users: - name: cloud sudo: ALL=(ALL) NOPASSWD:ALL shell: /bin/bash - ssh_authorized_keys: | + ssh_authorized_keys: {{ k8s.ssh.pub.key }} write_files: diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml index a7dd6f2035c..90be8957d44 100644 --- a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml +++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml @@ -21,7 +21,7 @@ users: - name: cloud sudo: ALL=(ALL) NOPASSWD:ALL shell: /bin/bash - ssh_authorized_keys: | + ssh_authorized_keys: {{ k8s.ssh.pub.key }} write_files: diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml index 7e0214b711f..ac80e8576ff 100644 --- a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml +++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml @@ -21,7 +21,7 @@ users: - name: cloud sudo: ALL=(ALL) NOPASSWD:ALL shell: /bin/bash - ssh_authorized_keys: | + ssh_authorized_keys: {{ k8s.ssh.pub.key }} write_files: