This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new d1cf45365a6 Revert "pre-commit: add hook `check-yaml` (#9133)" (#10161)
d1cf45365a6 is described below
commit d1cf45365a60d151e37e2fe8c81ea2e65e761c63
Author: dahn <[email protected]>
AuthorDate: Mon Jan 6 12:21:26 2025 +0100
Revert "pre-commit: add hook `check-yaml` (#9133)" (#10161)
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: