18113: Merge branch 'main' into 18113-change-cloudops-defaults

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --combined lib/config/config.default.yml
index 740d75836ac4482cca86e036e7ce1cb6a39345cc,8cbe51d2045a28a0612a2bfc60ff092ed9c43338..4e2a0e26d4bb599314e6f3292aeaf6cc1b2fef85
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -683,7 -683,7 +683,7 @@@ Clusters
          AcceptAccessTokenScope: ""
  
        PAM:
-         # (Experimental) Use PAM to authenticate users.
+         # Use PAM to authenticate users.
          Enable: false
  
          # PAM service name. PAM will apply the policy in the
@@@ -881,8 -881,8 +881,8 @@@
        UsePreemptibleInstances: false
  
        # PEM encoded SSH key (RSA, DSA, or ECDSA) used by the
-       # (experimental) cloud dispatcher for executing containers on
-       # worker VMs. Begins with "-----BEGIN RSA PRIVATE KEY-----\n"
+       # cloud dispatcher for executing containers on worker VMs.
+       # Begins with "-----BEGIN RSA PRIVATE KEY-----\n"
        # and ends with "\n-----END RSA PRIVATE KEY-----\n".
        DispatchPrivateKey: ""
  
@@@ -908,7 -908,7 +908,7 @@@
        # Minimum time between two attempts to run the same container
        MinRetryPeriod: 0s
  
-       # Container runtime: "docker" (default) or "singularity" (experimental)
+       # Container runtime: "docker" (default) or "singularity"
        RuntimeEngine: docker
  
        Logging:
@@@ -1057,7 -1057,7 +1057,7 @@@
          GitInternalDir: /var/lib/arvados/internal.git
  
        CloudVMs:
-         # Enable the cloud scheduler (experimental).
+         # Enable the cloud scheduler.
          Enable: false
  
          # Name/number of port where workers' SSH services listen.
@@@ -1091,25 -1091,13 +1091,25 @@@
  
          # Maximum create/destroy-instance operations per second (0 =
          # unlimited).
 -        MaxCloudOpsPerSecond: 0
 +        MaxCloudOpsPerSecond: 10
  
 -        # Maximum concurrent node creation operations (0 = unlimited). This is
 -        # recommended by Azure in certain scenarios (see
 -        # https://docs.microsoft.com/en-us/azure/virtual-machines/linux/capture-image)
 -        # and can be used with other cloud providers too, if desired.
 -        MaxConcurrentInstanceCreateOps: 0
 +        # Maximum concurrent instance creation operations (0 = unlimited).
 +        #
 +        # MaxConcurrentInstanceCreateOps limits the number of instance creation
 +        # requests that can be in flight at any one time, whereas
 +        # MaxCloudOpsPerSecond limits the number of create/destroy operations
 +        # that can be started per second.
 +        #
 +        # Because the API for instance creation on Azure is synchronous, it is
 +        # recommended to increase MaxConcurrentInstanceCreateOps when running
 +        # on Azure. When using managed images, a value of 20 would be
 +        # appropriate. When using Azure Shared Image Galeries, it could be set
 +        # higher. For more information, see
 +        # https://docs.microsoft.com/en-us/azure/virtual-machines/linux/capture-image
 +        #
 +        # MaxConcurrentInstanceCreateOps can be increased for other cloud
 +        # providers too, if desired.
 +        MaxConcurrentInstanceCreateOps: 1
  
          # Interval between cloud provider syncs/updates ("list all
          # instances").

diff --combined lib/config/generated_config.go
index 5a46121a43289c7a11166eee4c9a501c72dcc18d,44a58f3593518ec6865dabfe894db02f3099a265..875939a3e191731d33892127f5376ed93c18af78
--- 1/lib/config/generated_config.go
--- 2/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -689,7 -689,7 +689,7 @@@ Clusters
          AcceptAccessTokenScope: ""
  
        PAM:
-         # (Experimental) Use PAM to authenticate users.
+         # Use PAM to authenticate users.
          Enable: false
  
          # PAM service name. PAM will apply the policy in the
@@@ -887,8 -887,8 +887,8 @@@
        UsePreemptibleInstances: false
  
        # PEM encoded SSH key (RSA, DSA, or ECDSA) used by the
-       # (experimental) cloud dispatcher for executing containers on
-       # worker VMs. Begins with "-----BEGIN RSA PRIVATE KEY-----\n"
+       # cloud dispatcher for executing containers on worker VMs.
+       # Begins with "-----BEGIN RSA PRIVATE KEY-----\n"
        # and ends with "\n-----END RSA PRIVATE KEY-----\n".
        DispatchPrivateKey: ""
  
@@@ -914,7 -914,7 +914,7 @@@
        # Minimum time between two attempts to run the same container
        MinRetryPeriod: 0s
  
-       # Container runtime: "docker" (default) or "singularity" (experimental)
+       # Container runtime: "docker" (default) or "singularity"
        RuntimeEngine: docker
  
        Logging:
@@@ -1063,7 -1063,7 +1063,7 @@@
          GitInternalDir: /var/lib/arvados/internal.git
  
        CloudVMs:
-         # Enable the cloud scheduler (experimental).
+         # Enable the cloud scheduler.
          Enable: false
  
          # Name/number of port where workers' SSH services listen.
@@@ -1097,25 -1097,13 +1097,25 @@@
  
          # Maximum create/destroy-instance operations per second (0 =
          # unlimited).
 -        MaxCloudOpsPerSecond: 0
 +        MaxCloudOpsPerSecond: 10
  
 -        # Maximum concurrent node creation operations (0 = unlimited). This is
 -        # recommended by Azure in certain scenarios (see
 -        # https://docs.microsoft.com/en-us/azure/virtual-machines/linux/capture-image)
 -        # and can be used with other cloud providers too, if desired.
 -        MaxConcurrentInstanceCreateOps: 0
 +        # Maximum concurrent instance creation operations (0 = unlimited).
 +        #
 +        # MaxConcurrentInstanceCreateOps limits the number of instance creation
 +        # requests that can be in flight at any one time, whereas
 +        # MaxCloudOpsPerSecond limits the number of create/destroy operations
 +        # that can be started per second.
 +        #
 +        # Because the API for instance creation on Azure is synchronous, it is
 +        # recommended to increase MaxConcurrentInstanceCreateOps when running
 +        # on Azure. When using managed images, a value of 20 would be
 +        # appropriate. When using Azure Shared Image Galeries, it could be set
 +        # higher. For more information, see
 +        # https://docs.microsoft.com/en-us/azure/virtual-machines/linux/capture-image
 +        #
 +        # MaxConcurrentInstanceCreateOps can be increased for other cloud
 +        # providers too, if desired.
 +        MaxConcurrentInstanceCreateOps: 1
  
          # Interval between cloud provider syncs/updates ("list all
          # instances").