etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CKS: Do not pass AS number when network ID is passed

This commit is contained in:
Pearl Dsilva 2024-06-26 17:24:14 -04:00 committed by nvazquez
parent 2a1de76517
commit 51d4403adf
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
View File

@ -256,8 +256,8 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif
String cniConfig = new String(Base64.decodeBase64(cniConfigVo.getUserData()));
if (Objects.nonNull(asNumber)) {
cniConfig = substituteASNumber(cniConfig, asNumber);
cniConfig = Base64.encodeBase64String(cniConfig.getBytes(com.cloud.utils.StringUtils.getPreferredCharset()));
}
cniConfig = Base64.encodeBase64String(cniConfig.getBytes(com.cloud.utils.StringUtils.getPreferredCharset()));
base64UserData = userDataManager.concatenateUserData(base64UserData, cniConfig, null);
}

2
ui/src/views/compute/CreateKubernetesCluster.vue
View File

@ -329,7 +329,7 @@
</a-select-option>
</a-select>
</a-form-item>
<a-form-item v-if="form.advancedmode && isASNumberRequired()" name="asnumber" ref="asnumber">
<a-form-item v-if="form.advancedmode && isASNumberRequired() && !form.networkid" name="asnumber" ref="asnumber">
<template #label>
<tooltip-label :title="$t('label.asnumber')" :tooltip="apiParams.asnumber.description"/>
</template>