Skip to content

Adding public ip to listKubernetesClusterResponse #4414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 1 commit into from
Oct 28, 2020
Merged

Adding public ip to listKubernetesClusterResponse #4414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...etes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@
import com.cloud.network.Networks;
import com.cloud.network.PhysicalNetwork;
import com.cloud.network.dao.FirewallRulesDao;
import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.dao.PhysicalNetworkDao;
Expand Down Expand Up @@ -216,6 +218,8 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
@Inject
protected NetworkDao networkDao;
@Inject
protected IPAddressDao ipAddressDao;
@Inject
protected CapacityManager capacityManager;
@Inject
protected ResourceManager resourceManager;
Expand Down Expand Up @@ -610,6 +614,13 @@ public KubernetesClusterResponse createKubernetesClusterResponse(long kubernetes
response.setEndpoint(kubernetesCluster.getEndpoint());
response.setNetworkId(ntwk.getUuid());
response.setAssociatedNetworkName(ntwk.getName());
if (ntwk.getGuestType() == Network.GuestType.Isolated) {

@DaanHoogland DaanHoogland Oct 21, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so when SHARED/L2/VPC this needs changing again?

@davidjumani davidjumani Oct 21, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There shouldn't be any need. It doesn't support L2 / Shared (since they don't have public IPs) or VPCs as of now, and if support is added, VPC networks are again isolated networks

List<IPAddressVO> ipAddresses = ipAddressDao.listByAssociatedNetwork(ntwk.getId(), true);
if (ipAddresses != null && ipAddresses.size() == 1) {
response.setIpAddress(ipAddresses.get(0).getAddress().addr());
response.setIpAddressId(ipAddresses.get(0).getUuid());
}
}
List<UserVmResponse> vmResponses = new ArrayList<UserVmResponse>();
List<KubernetesClusterVmMapVO> vmList = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
ResponseView respView = ResponseView.Restricted;
Expand Down
16 changes: 16 additions & 0 deletions ...s-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ public class KubernetesClusterResponse extends BaseResponse implements Controlle
@Param(description = "the list of virtualmachine associated with this Kubernetes cluster")
private List<UserVmResponse> virtualMachines;

@SerializedName(ApiConstants.IP_ADDRESS)
@Param(description = "Public IP Address of the cluster")
private String ipAddress;

@SerializedName(ApiConstants.IP_ADDRESS_ID)
@Param(description = "Public IP Address ID of the cluster")
private String ipAddressId;

public KubernetesClusterResponse() {
}

Expand Down Expand Up @@ -324,4 +332,12 @@ public void setVirtualMachines(List<UserVmResponse> virtualMachines) {
public List<UserVmResponse> getVirtualMachines() {
return virtualMachines;
}

public void setIpAddress(String ipAddress) {
this.ipAddress = ipAddress;
}

public void setIpAddressId(String ipAddressId) {
this.ipAddressId = ipAddressId;
}
}