Merge branch 'v0.40' into Reshrahim-patch-3

Signed-off-by: Reshma Abdul Rahim <[email protected]>

.github/workflows/upmerge.yaml

@@ -66,15 +66,15 @@ jobs:
           export SOURCE_BRANCH=$(basename ${{ github.ref }})
           echo "Upmerging docs from $SOURCE_BRANCH to edge"
           git fetch origin $SOURCE_BRANCH
-          
-          git merge -m "Upmerge to edge" origin/$SOURCE_BRANCH
+          git merge --no-commit origin/$SOURCE_BRANCH
+          git checkout edge -- docs/config.toml docs/layouts/partials/hooks/body-end.html
+          git commit -m "Upmerge to edge"
           
           if git diff --quiet edge; then
               echo "No changes to merge from $SOURCE_BRANCH to edge"
               echo "NO_CHANGES=true" >> $GITHUB_ENV
           else
               echo "Pushing $BRANCH_NAME for PR to edge"
-              git reset HEAD docs/config.toml docs/layouts/partials/hooks/body-end.html
               git push --set-upstream origin $BRANCH_NAME
           fi
       

bicepconfig.json

@@ -1,15 +1,10 @@
 // The bicepconfig.json file is needed so the bicep files in the repo can be compiled with the correct setup
 {
 	"experimentalFeaturesEnabled": {
-		"extensibility": true,
-		"extensionRegistry": true,
-		"dynamicTypeLoading": true
+		"extensibility": true
 	},
 	"extensions": {
 		"radius": "br:biceptypes.azurecr.io/radius:latest",
 		"aws": "br:biceptypes.azurecr.io/aws:latest"
-	},
-	"cloud": {
-		"credentialPrecedence": [ "Environment" ]
 	}
 }

docs/config.toml

@@ -67,17 +67,17 @@ tag = "tags"
 
 [params]
 copyright = "The Radius Authors. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see the https://linuxfoundation.org/trademark-usage/ page."
-version = "v0.39"
+version = "v0.40"
 tag_version = "latest"
-chart_version = "0.39.0"
+chart_version = "0.40.0"
 
 # Algolia Search
 algolia_docsearch = true
 
 # GitHub Information
 github_repo = "https://github.com/radius-project/docs"
 github_subdir = "docs"
-github_branch = "v0.39"
+github_branch = "v0.40"
 github_project_repo = "https://github.com/radius-project/radius"
 
 # Versioning

docs/content/guides/deploy-apps/howto-deploy/howto-deploy-cicd/index.md

@@ -33,9 +33,7 @@ Make sure you have the following files checked into your repository under `iac/`
 ```json
 {
 	"experimentalFeaturesEnabled": {
-		"extensibility": true,
-		"extensionRegistry": true,
-		"dynamicTypeLoading": true
+		"extensibility": true
 	},
 	"extensions": {
 		"radius": "br:biceptypes.azurecr.io/radius:<release-version>",

docs/content/reference/cli/rad_install_kubernetes.md

@@ -39,6 +39,18 @@ rad install kubernetes --set key=value
 # Install Radius with the intermediate root CA certificate in the current Kubernetes context
 rad install kubernetes --set-file global.rootCA.cert=/path/to/rootCA.crt
 
+# Install Radius with zipkin server for distributed tracing 
+rad install kubernetes --set global.zipkin.url=http://localhost:9411/api/v2/spans
+
+# Install Radius with central prometheus monitoring service
+rad install kubernetes --set global.prometheus.path=/customdomain.com/metrics,global.prometheus.port=443,global.rootCA.cert=/path/to/rootCA.crt 
+
+# Install Radius using a helmchart from specified file path
+rad install kubernetes --chart /root/radius/deploy/Chart
+
+# Force re-install Radius with latest version
+rad install kubernetes --reinstall
+
 ```
 
 ### Options

docs/content/reference/resources/applications/applications.core/2023-10-01-preview/applications/index.md

@@ -32,7 +32,7 @@ description: "Detailed reference documentation for applications.core/application
 |----------|------|-------------|
 | **environment** | string | Fully qualified resource ID for the environment that the application is linked to <br />_(Required)_ |
 | **extensions** | [Extension](#extension)[] | The application extension. |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **status** | [ResourceStatus](#resourcestatus) | Status of a resource. <br />_(ReadOnly)_ |
 
 ### Extension

docs/content/reference/resources/applications/applications.core/2023-10-01-preview/containers/index.md

@@ -36,7 +36,7 @@ description: "Detailed reference documentation for applications.core/containers@
 | **environment** | string | Fully qualified resource ID for the environment that the application is linked to |
 | **extensions** | [Extension](#extension)[] | Extensions spec of the resource |
 | **identity** | [IdentitySettings](#identitysettings) | IdentitySettings is the external identity setting. |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **resourceProvisioning** | 'internal' | 'manual' | Specifies how the underlying service/resource is provisioned and managed. Available values are 'internal', where Radius manages the lifecycle of the resource internally, and 'manual', where a user manages the resource. |
 | **resources** | [ResourceReference](#resourcereference)[] | A collection of references to resources associated with the container |
 | **restartPolicy** | 'Always' | 'Never' | 'OnFailure' | Restart policy for the container |
@@ -69,7 +69,7 @@ description: "Detailed reference documentation for applications.core/containers@
 
 | Property | Type | Description |
 |----------|------|-------------|
-| **kind** | 'azure' | The kind of IAM provider to configure <br />_(Required)_ |
+| **kind** | 'azure' | 'string' | The kind of IAM provider to configure <br />_(Required)_ |
 | **roles** | string[] | RBAC permissions to be assigned on the source resource |
 
 ### Container

docs/content/reference/resources/applications/applications.core/2023-10-01-preview/environments/index.md

@@ -33,7 +33,7 @@ description: "Detailed reference documentation for applications.core/environment
 | **compute** | [EnvironmentCompute](#environmentcompute) | Represents backing compute resource <br />_(Required)_ |
 | **extensions** | [Extension](#extension)[] | The environment extension. |
 | **providers** | [Providers](#providers) | The Cloud providers configuration. |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **recipeConfig** | [RecipeConfigProperties](#recipeconfigproperties) | Configuration for Recipes. Defines how each type of Recipe should be configured and run. |
 | **recipes** | [EnvironmentPropertiesRecipes](#environmentpropertiesrecipes) | Specifies Recipes linked to the Environment. |
 | **simulated** | bool | Simulated environment. |

docs/content/reference/resources/applications/applications.core/2023-10-01-preview/extenders/index.md

@@ -32,7 +32,7 @@ description: "Detailed reference documentation for applications.core/extenders@2
 |----------|------|-------------|
 | **application** | string | Fully qualified resource ID for the application that the portable resource is consumed by (if applicable) |
 | **environment** | string | Fully qualified resource ID for the environment that the portable resource is linked to <br />_(Required)_ |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **recipe** | [Recipe](#recipe) | The recipe used to automatically deploy underlying infrastructure for a portable resource |
 | **resourceProvisioning** | 'manual' | 'recipe' | Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values. |
 | **secrets** | any | Any object |

docs/content/reference/resources/applications/applications.core/2023-10-01-preview/gateways/index.md

@@ -34,7 +34,7 @@ description: "Detailed reference documentation for applications.core/gateways@20
 | **environment** | string | Fully qualified resource ID for the environment that the application is linked to |
 | **hostname** | [GatewayHostname](#gatewayhostname) | Declare hostname information for the Gateway. Leaving the hostname empty auto-assigns one: mygateway.myapp.PUBLICHOSTNAMEORIP.nip.io. |
 | **internal** | bool | Sets Gateway to not be exposed externally (no public IP address associated). Defaults to false (exposed to internet). |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **routes** | [GatewayRoute](#gatewayroute)[] | Routes attached to this Gateway <br />_(Required)_ |
 | **status** | [ResourceStatus](#resourcestatus) | Status of a resource. <br />_(ReadOnly)_ |
 | **tls** | [GatewayTls](#gatewaytls) | TLS configuration definition for Gateway resource. |
@@ -128,7 +128,7 @@ description: "Detailed reference documentation for applications.core/gateways@20
 | Property | Type | Description |
 |----------|------|-------------|
 | **certificateFrom** | string | The resource id for the secret containing the TLS certificate and key for the gateway. |
-| **minimumProtocolVersion** | '1.2' | '1.3' | Tls Minimum versions for Gateway resource. |
+| **minimumProtocolVersion** | '1.2' | '1.3' | TLS minimum protocol version (defaults to 1.2). |
 | **sslPassthrough** | bool | If true, gateway lets the https traffic sslPassthrough to the backend servers for decryption. |
 
 ### SystemData

docs/content/reference/resources/applications/applications.core/2023-10-01-preview/secretstores/index.md

@@ -33,7 +33,7 @@ description: "Detailed reference documentation for applications.core/secretstore
 | **application** | string | Fully qualified resource ID for the application |
 | **data** | [SecretStorePropertiesData](#secretstorepropertiesdata) | An object to represent key-value type secrets <br />_(Required)_ |
 | **environment** | string | Fully qualified resource ID for the environment that the application is linked to |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **resource** | string | The resource id of external secret store. |
 | **status** | [ResourceStatus](#resourcestatus) | Status of a resource. <br />_(ReadOnly)_ |
 | **type** | 'awsIRSA' | 'azureWorkloadIdentity' | 'basicAuthentication' | 'certificate' | 'generic' | The type of SecretStore data |

docs/content/reference/resources/applications/applications.core/2023-10-01-preview/volumes/index.md

@@ -34,7 +34,7 @@ description: "Detailed reference documentation for applications.core/volumes@202
 |----------|------|-------------|
 | **application** | string | Fully qualified resource ID for the application <br />_(Required)_ |
 | **environment** | string | Fully qualified resource ID for the environment that the application is linked to |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **status** | [ResourceStatus](#resourcestatus) | Status of a resource. <br />_(ReadOnly)_ |
 
 #### AzureKeyVaultVolumeProperties
@@ -129,7 +129,7 @@ description: "Detailed reference documentation for applications.core/volumes@202
 |----------|------|-------------|
 | **alias** | string | File name when written to disk |
 | **certType** | 'certificate' | 'privatekey' | 'publickey' | Represents certificate types |
-| **encoding** | 'base64' | 'hex' | 'utf-8' | Represents secret encodings |
+| **encoding** | 'base64' | 'hex' | 'utf-8' | Encoding format. Default utf-8 |
 | **format** | 'pem' | 'pfx' | Represents certificate formats |
 | **name** | string | The name of the certificate <br />_(Required)_ |
 | **version** | string | Certificate version |
@@ -171,7 +171,7 @@ description: "Detailed reference documentation for applications.core/volumes@202
 | Property | Type | Description |
 |----------|------|-------------|
 | **alias** | string | File name when written to disk |
-| **encoding** | 'base64' | 'hex' | 'utf-8' | Represents secret encodings |
+| **encoding** | 'base64' | 'hex' | 'utf-8' | Encoding format. Default utf-8 |
 | **name** | string | The name of the secret <br />_(Required)_ |
 | **version** | string | secret version |
 

docs/content/reference/resources/applications/applications.dapr/2023-10-01-preview/configurationstores/index.md

@@ -35,7 +35,7 @@ description: "Detailed reference documentation for applications.dapr/configurati
 | **componentName** | string | The name of the Dapr component object. Use this value in your code when interacting with the Dapr client to use the Dapr component. <br />_(ReadOnly)_ |
 | **environment** | string | Fully qualified resource ID for the environment that the portable resource is linked to <br />_(Required)_ |
 | **metadata** | [DaprConfigurationStorePropertiesMetadata](#daprconfigurationstorepropertiesmetadata) | The metadata for Dapr resource which must match the values specified in Dapr component spec |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **recipe** | [Recipe](#recipe) | The recipe used to automatically deploy underlying infrastructure for a portable resource |
 | **resourceProvisioning** | 'manual' | 'recipe' | Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values. |
 | **resources** | [ResourceReference](#resourcereference)[] | A collection of references to resources associated with the configuration store |

docs/content/reference/resources/applications/applications.dapr/2023-10-01-preview/pubsubbrokers/index.md

@@ -35,7 +35,7 @@ description: "Detailed reference documentation for applications.dapr/pubsubbroke
 | **componentName** | string | The name of the Dapr component object. Use this value in your code when interacting with the Dapr client to use the Dapr component. <br />_(ReadOnly)_ |
 | **environment** | string | Fully qualified resource ID for the environment that the portable resource is linked to <br />_(Required)_ |
 | **metadata** | [DaprPubSubBrokerPropertiesMetadata](#daprpubsubbrokerpropertiesmetadata) | The metadata for Dapr resource which must match the values specified in Dapr component spec |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **recipe** | [Recipe](#recipe) | The recipe used to automatically deploy underlying infrastructure for a portable resource |
 | **resourceProvisioning** | 'manual' | 'recipe' | Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values. |
 | **resources** | [ResourceReference](#resourcereference)[] | A collection of references to resources associated with the pubSubBroker |

docs/content/reference/resources/applications/applications.dapr/2023-10-01-preview/secretstores/index.md

@@ -34,7 +34,7 @@ description: "Detailed reference documentation for applications.dapr/secretstore
 | **componentName** | string | The name of the Dapr component object. Use this value in your code when interacting with the Dapr client to use the Dapr component. <br />_(ReadOnly)_ |
 | **environment** | string | Fully qualified resource ID for the environment that the portable resource is linked to <br />_(Required)_ |
 | **metadata** | [DaprSecretStorePropertiesMetadata](#daprsecretstorepropertiesmetadata) | The metadata for Dapr resource which must match the values specified in Dapr component spec |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **recipe** | [Recipe](#recipe) | The recipe used to automatically deploy underlying infrastructure for a portable resource |
 | **resourceProvisioning** | 'manual' | 'recipe' | Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values. |
 | **status** | [ResourceStatus](#resourcestatus) | Status of a resource. <br />_(ReadOnly)_ |

docs/content/reference/resources/applications/applications.dapr/2023-10-01-preview/statestores/index.md

@@ -35,7 +35,7 @@ description: "Detailed reference documentation for applications.dapr/statestores
 | **componentName** | string | The name of the Dapr component object. Use this value in your code when interacting with the Dapr client to use the Dapr component. <br />_(ReadOnly)_ |
 | **environment** | string | Fully qualified resource ID for the environment that the portable resource is linked to <br />_(Required)_ |
 | **metadata** | [DaprStateStorePropertiesMetadata](#daprstatestorepropertiesmetadata) | The metadata for Dapr resource which must match the values specified in Dapr component spec |
-| **provisioningState** | 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
+| **provisioningState** | 'Accepted' | 'Canceled' | 'Creating' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' | Provisioning state of the resource at the time the operation was called <br />_(ReadOnly)_ |
 | **recipe** | [Recipe](#recipe) | The recipe used to automatically deploy underlying infrastructure for a portable resource |
 | **resourceProvisioning** | 'manual' | 'recipe' | Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values. |
 | **resources** | [ResourceReference](#resourcereference)[] | A collection of references to resources associated with the state store |