From 98bb4afd8b25e02ee0afb99e207e6e6d1039a6f9 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Mon, 7 Apr 2025 20:38:50 -0300 Subject: [PATCH] Fix linter --- .../src/main/resources/conf/etcd-node.yml | 8 ++++---- .../src/main/resources/conf/k8s-control-node.yml | 8 ++++---- .../main/java/com/cloud/server/ManagementServerImpl.java | 2 +- tools/appliance/cks/ubuntu/build.sh | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml index c380151f49d..d455441279d 100644 --- a/plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml +++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml @@ -30,17 +30,17 @@ write_files: owner: root:root content: | #!/bin/bash -e - + if [[ -f "/home/cloud/success" ]]; then echo "Already provisioned!" exit 0 fi - + ISO_MOUNT_DIR=/mnt/etcddisk BINARIES_DIR=${ISO_MOUNT_DIR}/ ATTEMPT_ONLINE_INSTALL=false setup_complete=false - + OFFLINE_INSTALL_ATTEMPT_SLEEP={{ k8s.install.wait.time }} MAX_OFFLINE_INSTALL_ATTEMPTS={{ k8s.install.reattempts.count }} if [[ -z $OFFLINE_INSTALL_ATTEMPT_SLEEP || $OFFLINE_INSTALL_ATTEMPT_SLEEP -eq 0 ]]; then @@ -89,7 +89,7 @@ write_files: sleep $OFFLINE_INSTALL_ATTEMPT_SLEEP offline_attempts=$[$offline_attempts + 1] done - + if [[ "$PATH" != *:/opt/bin && "$PATH" != *:/opt/bin:* ]]; then export PATH=$PATH:/opt/bin fi 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 217ed814f6a..dc066e10d06 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 @@ -250,7 +250,7 @@ write_files: etcd: external: endpoints: - {{ etcd.etcd_endpoint_list }} + {{ etcd.etcd_endpoint_list }} --- apiVersion: kubeadm.k8s.io/v1beta3 kind: InitConfiguration @@ -263,7 +263,7 @@ write_files: advertiseAddress: {{ k8s_control.server_ip }} bindPort: {{ k8s.api_server_port }} certificateKey: {{ k8s_control.certificate_key }} - + - path: /opt/bin/deploy-kube-system permissions: '0700' @@ -340,7 +340,7 @@ write_files: sudo touch /home/cloud/success echo "true" > /home/cloud/success -{% if registry is defined %} + {% if registry is defined %} - path: /opt/bin/setup-containerd permissions: '0755' owner: root:root @@ -358,7 +358,7 @@ write_files: echo "Restarting containerd service" systemctl daemon-reload systemctl restart containerd -{% endif %} + {% endif %} - path: /etc/systemd/system/deploy-kube-system.service permissions: '0755' diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index 62873cbfe91..bcb813712f6 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -4890,7 +4890,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe } @Override - @ActionEvent(eventType = EventTypes.EVENT_REGISTER_CNI_CONFIG, eventDescription = "registering CNI configration", async = true) + @ActionEvent(eventType = EventTypes.EVENT_REGISTER_CNI_CONFIG, eventDescription = "registering CNI configuration", async = true) public UserData registerCniConfiguration(RegisterCniConfigurationCmd cmd) { final Account owner = getOwner(cmd); checkForUserDataByName(cmd, owner); diff --git a/tools/appliance/cks/ubuntu/build.sh b/tools/appliance/cks/ubuntu/build.sh index 0d9d8ea4e49..c5866843478 100755 --- a/tools/appliance/cks/ubuntu/build.sh +++ b/tools/appliance/cks/ubuntu/build.sh @@ -201,7 +201,7 @@ function prepare() { function packer_build() { log INFO "building new image with packer" #cd ${appliance_build_name} && packer build template.json && cd .. - cd 22.04 && packer build ${appliance_build_name}.json && cd .. + cd 22.04 && packer build ${appliance_build_name}.json && cd .. } function stage_vmx() {