Skip to content

CKS: Validate network offering from network if provided rather than global setting #11528

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
weizhouapache merged 2 commits into from
Sep 9, 2025
+25 −10
Merged

CKS: Validate network offering from network if provided rather than global setting #11528

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c67f78c
CKS: Validate network offering from network if provided rather than g…
Pearl1594 Aug 28, 2025
8406ce0
update warning message
Pearl1594 Aug 28, 2025
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
35 changes: 25 additions & 10 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 @@ -367,18 +367,33 @@ private void logAndThrow(final Level logLevel, final String message, final Excep
logTransitStateAndThrow(logLevel, message, null, null, ex);
}

private boolean isKubernetesServiceNetworkOfferingConfigured(DataCenter zone) {
private boolean isKubernetesServiceNetworkOfferingConfigured(DataCenter zone, Long networkId) {
// Check network offering
String networkOfferingName = KubernetesClusterNetworkOffering.value();
if (networkOfferingName == null || networkOfferingName.isEmpty()) {
logger.warn(String.format("Global setting %s is empty. Admin has not yet specified the network offering to be used for provisioning isolated network for the cluster", KubernetesClusterNetworkOffering.key()));
if (StringUtils.isEmpty(networkOfferingName) && networkId == null) {
logger.warn("Global setting: {} is empty. Admin has not yet specified the network offering to be used for provisioning isolated network for the cluster nor has a pre-created network been passed", KubernetesClusterNetworkOffering.key());
return false;
}
NetworkOfferingVO networkOffering = networkOfferingDao.findByUniqueName(networkOfferingName);
if (networkOffering == null) {
logger.warn(String.format("Unable to find the network offering %s to be used for provisioning Kubernetes cluster", networkOfferingName));
return false;
NetworkOfferingVO networkOffering = null;
if (networkId != null) {
NetworkVO network = networkDao.findById(networkId);
if (network == null) {
logger.warn("Unable to find the network with ID: {} passed for the Kubernetes cluster", networkId);
return false;
}
networkOffering = networkOfferingDao.findById(network.getNetworkOfferingId());
if (networkOffering == null) {
logger.warn("Unable to find the network offering of the network: {} ({}) to be used for provisioning Kubernetes cluster", network.getName(), network.getUuid());
return false;
}
} else if (StringUtils.isNotEmpty(networkOfferingName)) {
networkOffering = networkOfferingDao.findByUniqueName(networkOfferingName);
if (networkOffering == null) {
logger.warn("Unable to find the network offering: {} to be used for provisioning Kubernetes cluster", networkOfferingName);
return false;
}
}

if (networkOffering.getState() == NetworkOffering.State.Disabled) {
logger.warn("Network offering: {} is not enabled", networkOffering);
return false;
Expand Down Expand Up @@ -413,8 +428,8 @@ private boolean isKubernetesServiceNetworkOfferingConfigured(DataCenter zone) {
return true;
}

private boolean isKubernetesServiceConfigured(DataCenter zone) {
if (!isKubernetesServiceNetworkOfferingConfigured(zone)) {
private boolean isKubernetesServiceConfigured(DataCenter zone, Long networkId) {
if (!isKubernetesServiceNetworkOfferingConfigured(zone, networkId)) {
return false;
}
return true;
Expand Down Expand Up @@ -852,7 +867,7 @@ private void validateManagedKubernetesClusterCreateParameters(final CreateKubern

DataCenter zone = validateAndGetZoneForKubernetesCreateParameters(zoneId, networkId);

if (!isKubernetesServiceConfigured(zone)) {
if (!isKubernetesServiceConfigured(zone, networkId)) {
throw new CloudRuntimeException("Kubernetes service has not been configured properly to provision Kubernetes clusters");
}

Expand Down
Loading