Skip to content

Commit 62363c1

Browse files
committed
remove duplicate definitions
1 parent 6bb6fe7 commit 62363c1

File tree

2 files changed

+0
-54
lines changed

2 files changed

+0
-54
lines changed

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

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -250,33 +250,6 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
250250
private static final String DEFAULT_NSX_NETWORK_OFFERING_FOR_KUBERNETES_SERVICE_DISPLAY_TEXT = "Network Offering for NSX CloudStack Kubernetes Service";
251251
private static final String DEFAULT_NSX_VPC_NETWORK_OFFERING_FOR_KUBERNETES_SERVICE_DISPLAY_TEXT = "Network Offering for NSX CloudStack Kubernetes service on VPC";
252252

253-
private static final List<Class<?>> PROJECT_KUBERNETES_ACCOUNT_ROLE_ALLOWED_APIS = Arrays.asList(
254-
QueryAsyncJobResultCmd.class,
255-
ListVMsCmd.class,
256-
ListNetworksCmd.class,
257-
ListPublicIpAddressesCmd.class,
258-
AssociateIPAddrCmd.class,
259-
DisassociateIPAddrCmd.class,
260-
ListLoadBalancerRulesCmd.class,
261-
CreateLoadBalancerRuleCmd.class,
262-
UpdateLoadBalancerRuleCmd.class,
263-
DeleteLoadBalancerRuleCmd.class,
264-
AssignToLoadBalancerRuleCmd.class,
265-
RemoveFromLoadBalancerRuleCmd.class,
266-
ListLoadBalancerRuleInstancesCmd.class,
267-
ListFirewallRulesCmd.class,
268-
CreateFirewallRuleCmd.class,
269-
UpdateFirewallRuleCmd.class,
270-
DeleteFirewallRuleCmd.class,
271-
ListNetworkACLsCmd.class,
272-
CreateNetworkACLCmd.class,
273-
DeleteNetworkACLCmd.class,
274-
ListKubernetesClustersCmd.class,
275-
ScaleKubernetesClusterCmd.class
276-
);
277-
private static final String PROJECT_KUBERNETES_ACCOUNT_FIRST_NAME = "Kubernetes";
278-
private static final String PROJECT_KUBERNETES_ACCOUNT_LAST_NAME = "Service User";
279-
280253
protected StateMachine2<KubernetesCluster.State, KubernetesCluster.Event, KubernetesCluster> _stateMachine = KubernetesCluster.State.getStateMachine();
281254

282255
ScheduledExecutorService _gcExecutor;

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,33 +1512,6 @@ protected boolean shouldValidateConfigRange(String name, String value, Config co
15121512
return true;
15131513
}
15141514

1515-
protected void validateConfigurationAllowedOnlyForDefaultAdmin(String configName, String value) {
1516-
if (configKeysAllowedOnlyForDefaultAdmin.contains(configName)) {
1517-
final Long userId = CallContext.current().getCallingUserId();
1518-
if (userId != User.UID_ADMIN) {
1519-
throw new CloudRuntimeException("Only default admin is allowed to change this setting");
1520-
}
1521-
1522-
if (AccountManagerImpl.listOfRoleTypesAllowedForOperationsOfSameRoleType.key().equals(configName)) {
1523-
if (value != null && !value.isBlank()) {
1524-
List<String> validRoleTypes = Arrays.stream(RoleType.values())
1525-
.map(Enum::name)
1526-
.collect(Collectors.toList());
1527-
1528-
boolean allValid = Arrays.stream(value.split(","))
1529-
.map(String::trim)
1530-
.allMatch(validRoleTypes::contains);
1531-
1532-
if (!allValid) {
1533-
throw new CloudRuntimeException("Invalid role types provided in value");
1534-
}
1535-
} else {
1536-
throw new CloudRuntimeException("Value for role types must not be empty");
1537-
}
1538-
}
1539-
}
1540-
}
1541-
15421515
/**
15431516
* A valid value should be an integer between min and max (the values from the range).
15441517
*/

0 commit comments

Comments
 (0)