Skip to content

Commit d4f40ec

Browse files
Fixed strings import issue (#5998)
* Fixed strings import issue in KubernetesClusterResourceModifierActionWorker * Use isNoneEmpty
1 parent b50542a commit d4f40ec

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
import com.cloud.vm.VirtualMachine;
7777
import com.cloud.vm.VmDetailConstants;
7878
import com.cloud.vm.dao.VMInstanceDao;
79-
import com.google.common.base.Strings;
8079
import org.apache.cloudstack.api.ApiConstants;
8180
import org.apache.cloudstack.api.BaseCmd;
8281
import org.apache.cloudstack.api.command.user.firewall.CreateFirewallRuleCmd;
@@ -188,7 +187,7 @@ protected String updateKubeConfigWithRegistryDetails(String k8sConfig) {
188187
registryUrl = detail.getValue();
189188
}
190189
}
191-
if (!Strings.isNullOrEmpty(registryUsername) && !Strings.isNullOrEmpty(registryPassword) && !Strings.isNullOrEmpty(registryUrl)) {
190+
if (StringUtils.isNoneEmpty(registryUsername, registryPassword, registryUrl)) {
192191
// Update runcmd in the cloud-init configuration to run a script that updates the containerd config with provided registry details
193192
String runCmd = "- bash -x /opt/bin/setup-containerd";
194193

0 commit comments

Comments
 (0)