Add keycloak as oauth2 provider

.asf.yaml

@@ -58,7 +58,10 @@ github:
     - gpordeus
     - hsato03
     - bernardodemarco
+<<<<<<< HEAD
+=======
     - abh1sar
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
 
   protected_branches: ~
 

.github/workflows/ci.yml

@@ -86,8 +86,12 @@ jobs:
                   smoke/test_migration
                   smoke/test_multipleips_per_nic
                   smoke/test_nested_virtualization
+<<<<<<< HEAD
+                  smoke/test_set_sourcenat",
+=======
                   smoke/test_set_sourcenat
                   smoke/test_webhook_lifecycle",
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
                 "smoke/test_network
                   smoke/test_network_acl
                   smoke/test_network_ipv6

agent/conf/cloudstack-agent.logrotate.in

@@ -15,13 +15,20 @@
 # specific language governing permissions and limitations
 # under the License.
 
+<<<<<<< HEAD
+/var/log/cloudstack/agent/security_group.log /var/log/cloudstack/agent/resizevolume.log /var/log/cloudstack/agent/rolling-maintenance.log {
+=======
 /var/log/cloudstack/agent/security_group.log /var/log/cloudstack/agent/resizevolume.log /var/log/cloudstack/agent/rolling-maintenance.log /var/log/cloudstack/agent/agent.out /var/log/cloudstack/agent/agent.err {
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
     copytruncate
     daily
     rotate 5
     compress
     missingok
     size 10M
+<<<<<<< HEAD
+=======
     dateext
     dateformat -%Y-%m-%d
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
 }

agent/conf/log4j-cloud.xml.in

@@ -38,7 +38,11 @@ under the License.
       <!-- ============================== -->
 
       <Console name="CONSOLE" target="SYSTEM_OUT">
+<<<<<<< HEAD
+          <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+=======
           <ThresholdFilter level="OFF" onMatch="ACCEPT" onMismatch="DENY"/>
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
           <PatternLayout pattern="%-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
       </Console>
    </Appenders>

agent/src/test/java/com/cloud/agent/AgentShellTest.java

@@ -350,6 +350,8 @@ public void setHostTestValueIsNullPropertyDoesNotStartAndEndWithAtSignSetHosts()
 
         Mockito.verify(agentShellSpy).setHosts(expected);
     }
+<<<<<<< HEAD
+=======
 
     @Test
     public void updateAndGetConnectedHost() {
@@ -362,4 +364,5 @@ public void updateAndGetConnectedHost() {
 
         Assert.assertEquals(expected, shell.getConnectedHost());
     }
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
 }

api/src/main/java/com/cloud/event/EventTypes.java

@@ -29,9 +29,15 @@
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.config.Configuration;
 import org.apache.cloudstack.ha.HAConfig;
+<<<<<<< HEAD
+import org.apache.cloudstack.storage.object.Bucket;
+import org.apache.cloudstack.storage.object.ObjectStore;
+import org.apache.cloudstack.quota.QuotaTariff;
+=======
 import org.apache.cloudstack.quota.QuotaTariff;
 import org.apache.cloudstack.storage.object.Bucket;
 import org.apache.cloudstack.storage.object.ObjectStore;
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
 import org.apache.cloudstack.usage.Usage;
 import org.apache.cloudstack.vm.schedule.VMSchedule;
 
@@ -1229,8 +1235,11 @@ public static Class getEntityClassForEvent(String eventName) {
     public static boolean isVpcEvent(String eventType) {
         return EventTypes.EVENT_VPC_CREATE.equals(eventType) || EventTypes.EVENT_VPC_DELETE.equals(eventType);
     }
+<<<<<<< HEAD
+=======
 
     public static void addEntityEventDetail(String event, Class<?> clazz) {
         entityEventDetails.put(event, clazz);
     }
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
 }

api/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterHelper.java

@@ -0,0 +1,26 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster;
+
+import com.cloud.utils.component.Adapter;
+import org.apache.cloudstack.acl.ControlledEntity;
+
+public interface KubernetesClusterHelper extends Adapter {
+
+    ControlledEntity findByUuid(String uuid);
+    ControlledEntity findByVmId(long vmId);
+}

api/src/main/java/com/cloud/network/NetworkService.java

@@ -20,7 +20,10 @@
 import java.util.Map;
 
 import com.cloud.dc.DataCenter;
+<<<<<<< HEAD
+=======
 import org.apache.cloudstack.acl.ControlledEntity;
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
 import org.apache.cloudstack.api.command.admin.address.ReleasePodIpCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
 import org.apache.cloudstack.api.command.admin.network.ListDedicatedGuestVlanRangesCmd;
@@ -103,10 +106,13 @@ IpAddress allocatePortableIP(Account ipOwner, int regionId, Long zoneId, Long ne
 
     Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException;
 
+<<<<<<< HEAD
+=======
     Network createGuestNetwork(long networkOfferingId, String name, String displayText, Account owner,
            PhysicalNetwork physicalNetwork, long zoneId, ControlledEntity.ACLType aclType) throws
             InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException;
 
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
     Pair<List<? extends Network>, Integer> searchForNetworks(ListNetworksCmd cmd);
 
     boolean deleteNetwork(long networkId, boolean forced);

api/src/main/java/com/cloud/network/vpc/VpcService.java

@@ -132,8 +132,11 @@ Pair<List<? extends Vpc>, Integer> listVpcs(Long id, String vpcName, String disp
      */
     boolean startVpc(long vpcId, boolean destroyOnFailure) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
 
+<<<<<<< HEAD
+=======
     void startVpc(CreateVPCCmd cmd) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
 
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
     /**
      * Shuts down the VPC which includes shutting down all VPC provider and rules cleanup on the backend
      *

api/src/main/java/com/cloud/user/ResourceLimitService.java

@@ -38,10 +38,14 @@ public interface ResourceLimitService {
     static final ConfigKey<Long> MaxProjectSecondaryStorage = new ConfigKey<>("Project Defaults", Long.class, "max.project.secondary.storage", "400",
             "The default maximum secondary storage space (in GiB) that can be used for a project", false);
     static final ConfigKey<Long> ResourceCountCheckInterval = new ConfigKey<>("Advanced", Long.class, "resourcecount.check.interval", "300",
+<<<<<<< HEAD
+            "Time (in seconds) to wait before running resource recalculation and fixing task. Default is 300 seconds, Setting this to 0 disables execution of the task", true);
+=======
             "Time (in seconds) to wait before running resource recalculation and fixing tasks like stale resource reservation cleanup" +
                     ". Default is 300 seconds, Setting this to 0 disables execution of the task", true);
     static final ConfigKey<Long> ResourceReservationCleanupDelay = new ConfigKey<>("Advanced", Long.class, "resource.reservation.cleanup.delay", "3600",
             "Time (in seconds) after which a resource reservation gets deleted. Default is 3600 seconds, Setting this to 0 disables execution of the task", true);
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
     static final ConfigKey<String> ResourceLimitHostTags = new ConfigKey<>("Advanced", String.class, "resource.limit.host.tags", "",
             "A comma-separated list of tags for host resource limits", true);
     static final ConfigKey<String> ResourceLimitStorageTags = new ConfigKey<>("Advanced", String.class, "resource.limit.storage.tags", "",

api/src/main/java/com/cloud/uservm/UserVm.java

@@ -48,6 +48,9 @@ public interface UserVm extends VirtualMachine, ControlledEntity {
     void setAccountId(long accountId);
 
     public boolean isDisplayVm();
+<<<<<<< HEAD
+=======
 
     String getUserVmType();
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
 }

api/src/main/java/com/cloud/vm/UserVmService.java

@@ -45,7 +45,10 @@
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ManagementServerException;
+<<<<<<< HEAD
+=======
 import com.cloud.exception.OperationTimedoutException;
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.StorageUnavailableException;
@@ -67,7 +70,14 @@ public interface UserVmService {
     /**
      * Destroys one virtual machine
      *
+<<<<<<< HEAD
+     * @param userId
+     *            the id of the user performing the action
+     * @param vmId
+     *            the id of the virtual machine.
+=======
      * @param cmd the API Command Object containg the parameters to use for this service action
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
      * @throws ConcurrentOperationException
      * @throws ResourceUnavailableException
      */
@@ -110,8 +120,11 @@ UserVm startVirtualMachine(StartVMCmd cmd) throws StorageUnavailableException, E
 
     UserVm rebootVirtualMachine(RebootVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException, ResourceAllocationException;
 
+<<<<<<< HEAD
+=======
     void startVirtualMachine(UserVm vm) throws OperationTimedoutException, ResourceUnavailableException, InsufficientCapacityException;
 
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
     UserVm updateVirtualMachine(UpdateVMCmd cmd) throws ResourceUnavailableException, InsufficientCapacityException;
 
     /**
@@ -148,6 +161,17 @@ UserVm startVirtualMachine(StartVMCmd cmd) throws StorageUnavailableException, E
      * Creates a Basic Zone User VM in the database and returns the VM to the
      * caller.
      *
+<<<<<<< HEAD
+     *
+     *
+     * @param sshKeyPair
+     *            - name of the ssh key pair used to login to the virtual
+     *            machine
+     * @param cpuSpeed
+     * @param memory
+     * @param cpuNumber
+=======
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
      * @param zone
      *            - availability zone for the virtual machine
      * @param serviceOffering
@@ -223,6 +247,12 @@ UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering s
      * Creates a User VM in Advanced Zone (Security Group feature is enabled) in
      * the database and returns the VM to the caller.
      *
+<<<<<<< HEAD
+     *
+     *
+     * @param type
+=======
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
      * @param zone
      *            - availability zone for the virtual machine
      * @param serviceOffering
@@ -298,6 +328,17 @@ UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOfferin
      * Creates a User VM in Advanced Zone (Security Group feature is disabled)
      * in the database and returns the VM to the caller.
      *
+<<<<<<< HEAD
+     *
+     *
+     * @param sshKeyPair
+     *            - name of the ssh key pair used to login to the virtual
+     *            machine
+     * @param cpuSpeed
+     * @param memory
+     * @param cpuNumber
+=======
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
      * @param zone
      *            - availability zone for the virtual machine
      * @param serviceOffering

api/src/main/java/org/apache/cloudstack/api/ApiCommandResourceType.java

@@ -17,9 +17,13 @@
 package org.apache.cloudstack.api;
 
 import java.util.ArrayList;
+<<<<<<< HEAD
+import java.util.List;
+=======
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
 
 import org.apache.cloudstack.region.PortableIp;
 import org.apache.commons.collections.CollectionUtils;
@@ -83,6 +87,12 @@ public enum ApiCommandResourceType {
     ManagementServer(org.apache.cloudstack.management.ManagementServerHost.class),
     ObjectStore(org.apache.cloudstack.storage.object.ObjectStore.class),
     Bucket(org.apache.cloudstack.storage.object.Bucket.class),
+<<<<<<< HEAD
+    QuotaTariff(org.apache.cloudstack.quota.QuotaTariff.class);
+
+    private final Class<?> clazz;
+
+=======
     QuotaTariff(org.apache.cloudstack.quota.QuotaTariff.class),
     KubernetesCluster(null),
     KubernetesSupportedVersion(null);
@@ -91,14 +101,18 @@ public enum ApiCommandResourceType {
 
     static final Map<ApiCommandResourceType, Class<?>> additionalClassMappings = new HashMap<>();
 
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
     private ApiCommandResourceType(Class<?> clazz) {
         this.clazz = clazz;
     }
 
     public Class<?> getAssociatedClass() {
+<<<<<<< HEAD
+=======
         if (this.clazz == null && additionalClassMappings.containsKey(this)) {
             return additionalClassMappings.get(this);
         }
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
         return this.clazz;
     }
 
@@ -128,8 +142,11 @@ public static ApiCommandResourceType fromString(String value) {
         }
         return null;
     }
+<<<<<<< HEAD
+=======
 
     public static void setClassMapping(ApiCommandResourceType type, Class<?> clazz) {
         additionalClassMappings.put(type, clazz);
     }
+>>>>>>> 9e53596ba92eaec1289e97bfc9f441cc3c507002
 }