weizhouapache commented on code in PR #7515:
URL: https://github.com/apache/cloudstack/pull/7515#discussion_r1205950709
##########
ui/src/views/compute/KubernetesServiceTab.vue:
##########
@@ -25,17 +25,14 @@
<a-tab-pane :tab="$t('label.details')" key="details">
<DetailsTab :resource="resource" :loading="loading" />
</a-tab-pane>
- <a-tab-pane :tab="$t('label.access')" key="access">
+ <a-tab-pane v-if="clusterConfig !== ''" :tab="$t('label.access')"
key="access">
Review Comment:
you can rollback the changes and use `managed` here
##########
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java:
##########
@@ -783,15 +843,16 @@ public void
doInTransactionWithoutResult(TransactionStatus status) {
List<KubernetesClusterDetailsVO> details = new ArrayList<>();
long kubernetesClusterId = kubernetesCluster.getId();
- if (Network.GuestType.Shared.equals(network.getGuestType())) {
+ if ((network != null &&
Network.GuestType.Shared.equals(network.getGuestType())) || !cmd.isManaged()) {
Review Comment:
OK.
it might be useful
##########
tools/marvin/marvin/deployDataCenter.py:
##########
@@ -1133,7 +1133,7 @@ def removeDataCenter(self):
print("\n====DeployDC: CleanUp Started====")
ret = FAILED
if self.__dcCfgFile:
- file_to_read = open(self.__dcCfgFile, 'rb')
+ file_to_read = open(self.__dcCfgFile, 'r')
Review Comment:
this reverts #7521 , which seems wrong
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
