Fixing merge conflict

docs/docs-content/getting-started/aws/create-cluster-profile.md

@@ -10,9 +10,9 @@ tags: ["getting-started", "aws"]
 
 Palette offers profile-based management for Kubernetes, enabling consistency, repeatability, and operational efficiency
 across multiple clusters. A cluster profile allows you to customize the cluster infrastructure stack, allowing you to
-choose the desired Operating System (OS), Kubernetes, Container Network Interfaces (CNIs), and Container Storage Interfaces
-(CSIs). You can further customize the stack with add-on application layers. For more information about cluster profile
-types, refer to [Cluster Profiles](../introduction.md#cluster-profiles).
+choose the desired Operating System (OS), Kubernetes, Container Network Interfaces (CNIs), and Container Storage
+Interfaces (CSIs). You can further customize the stack with add-on application layers. For more information about
+cluster profile types, refer to [Cluster Profiles](../introduction.md#cluster-profiles).
 
 In this tutorial, you create a full profile directly from the Palette dashboard. Then, you add a layer to your cluster
 profile by using a [community pack](../../integrations/community_packs.md) to deploy a web application. The concepts you

docs/docs-content/getting-started/aws/deploy-k8s-cluster.md

@@ -38,7 +38,8 @@ To complete this tutorial, you will need the following.
 
 The following steps will guide you through deploying the cluster infrastructure.
 
-Navigate to the left **Main Menu** and select **Clusters**. Click on **Create Cluster**. If there are existing clusters, choose **Add New Cluster**.
+Navigate to the left **Main Menu** and select **Clusters**. Click on **Create Cluster**. If there are existing clusters,
+choose **Add New Cluster**.
 
 ![Palette clusters overview page](/getting-started/getting-started_deploy-k8s-cluster_new_cluster.webp)
 
@@ -107,8 +108,8 @@ Navigate to the left **Main Menu** and select **Clusters**.
 ![Update the cluster](/getting-started/aws/getting-started_deploy-k8s-cluster_create_cluster.webp)
 
 The cluster deployment process can take 15 to 30 minutes. Deployment time varies depending on the cloud provider,
-cluster profile, cluster size, and node pool configurations provided. You can learn more about the deployment
-progress by reviewing the event log. Choose your cluster and select the **Events** tab to view the log.
+cluster profile, cluster size, and node pool configurations provided. You can learn more about the deployment progress
+by reviewing the event log. Choose your cluster and select the **Events** tab to view the log.
 
 ![Update the cluster](/getting-started/aws/getting-started_deploy-k8s-cluster_event_log.webp)
 

docs/docs-content/getting-started/aws/scale-secure-cluster.md

@@ -10,8 +10,8 @@ tags: ["getting-started", "aws", "tutorial"]
 
 Palette has in-built features to help with the automation of Day-2 operations. Upgrading and maintaining a deployed
 cluster is typically complex because you need to consider any possible impact on service availability. Palette provides
-out-of-the-box functionality for upgrades, observability, granular Role Based Access Control (RBAC), backup, and security
-scans.
+out-of-the-box functionality for upgrades, observability, granular Role Based Access Control (RBAC), backup, and
+security scans.
 
 This tutorial will teach you how to use the Palette UI to perform scale and maintenance tasks on your clusters. You will
 learn how to create Palette projects and teams, import a cluster profile, safely upgrade the Kubernetes version of a
@@ -33,9 +33,9 @@ Additionally, you should install kubectl locally. Use the Kubernetes
 ## Create Palette Projects
 
 Palette projects help you organize and manage cluster resources, providing logical groupings. They also allow you to
-manage user access control through RBAC. You can assign users and teams with specific roles
-to specific projects. All resources created within a project are scoped to that project and only available to that
-project, but a tenant can have multiple projects.
+manage user access control through RBAC. You can assign users and teams with specific roles to specific projects. All
+resources created within a project are scoped to that project and only available to that project, but a tenant can have
+multiple projects.
 
 Log in to [Palette](https://console.spectrocloud.com).
 

docs/docs-content/getting-started/aws/update-k8s-cluster.md

@@ -64,7 +64,8 @@ panel.
 
 ![Image that shows how to add a cluster tag](/getting-started/aws/getting-started_update-k8s-cluster_add-service-tag.webp)
 
-Navigate to the left **Main Menu** and select **Clusters** to view your deployed clusters. Click the **filter** icon to expand the **All Filters** pane, and below **Tags**, enter **service:hello-universe-frontend**. 
+Navigate to the left **Main Menu** and select **Clusters** to view your deployed clusters. Click the **filter** icon to
+expand the **All Filters** pane, and below **Tags**, enter **service:hello-universe-frontend**.
 
 ![Image that shows how to add a frontend service filter](/getting-started/aws/getting-started_update-k8s-cluster_apply-frontend-filter.webp)
 
@@ -197,7 +198,8 @@ The previous state of the cluster profile will not be saved once it is overwritt
 
 Navigate to the left **Main Menu** and select **Clusters**. Select the `aws-cluster` to view its **Overview** tab.
 
-Select the **Profile** tab. Then, select the **hello-universe** pack. Change the `replicas` field on line `15` to `2` and **Save** your changes. The editor is closed.
+Select the **Profile** tab. Then, select the **hello-universe** pack. Change the `replicas` field on line `15` to `2`
+and **Save** your changes. The editor is closed.
 
 This cluster now contains an override over its cluster profile. Palette uses the configuration you have just provided
 for the single cluster over its cluster profile and begins making the appropriate changes.
@@ -212,21 +214,24 @@ corresponding to your _hello-universe-frontend_ cluster. It is named `aws-profil
 
 Click on it to view its details. Select **1.0.0** in the version dropdown.
 
-Select the **hello-universe** pack. Change the `replicas` field on line `15` to `3`. Click on **Confirm Updates**. The editor is closed.
+Select the **hello-universe** pack. Change the `replicas` field on line `15` to `3`. Click on **Confirm Updates**. The
+editor is closed.
 
 Click on **Save Changes** to confirm the changes you have made to your profile.
 
-Navigate to the left **Main Menu** and select **Clusters**. Palette indicates that the cluster associated with the cluster profile you edited has updates available.
+Navigate to the left **Main Menu** and select **Clusters**. Palette indicates that the cluster associated with the
+cluster profile you edited has updates available.
 
 ![Image that shows the pending updates ](/getting-started/aws/getting-started_update-k8s-cluster_pending-update-clusters-view.webp)
 
 Select this cluster to open its **Overview** tab. Click on **Updates** to begin the cluster update.
 
 ![Image that shows the Updates button](/getting-started/aws/getting-started_update-k8s-cluster_updates-available-button-cluster-overview.webp)
 
-A dialog appears, showing a summary of packs changed. Select **Review changes in Editor** to review your changes. Ensure the only change is the
-`replicas` field value. The pending update removes your cluster override and sets the `replicas` field to `3`. At this
-point, you can choose to apply the pending changes or make additional changes by modifying the **Pending Configuration** pane on the right side of the editor.
+A dialog appears, showing a summary of packs changed. Select **Review changes in Editor** to review your changes. Ensure
+the only change is the `replicas` field value. The pending update removes your cluster override and sets the `replicas`
+field to `3`. At this point, you can choose to apply the pending changes or make additional changes by modifying the
+**Pending Configuration** pane on the right side of the editor.
 
 ![Image that shows the available updates dialog ](/getting-started/aws/getting-started_update-k8s-cluster_available-updates-dialog.webp)
 

docs/docs-content/getting-started/azure/create-cluster-profile.md

@@ -10,9 +10,9 @@ tags: ["getting-started", "azure"]
 
 Palette offers profile-based management for Kubernetes, enabling consistency, repeatability, and operational efficiency
 across multiple clusters. A cluster profile allows you to customize the cluster infrastructure stack, allowing you to
-choose the desired Operating System (OS), Kubernetes, Container Network Interfaces (CNIs), and Container Storage Interfaces
-(CSIs). You can further customize the stack with add-on application layers. For more information about cluster profile
-types, refer to [Cluster Profiles](../introduction.md#cluster-profiles).
+choose the desired Operating System (OS), Kubernetes, Container Network Interfaces (CNIs), and Container Storage
+Interfaces (CSIs). You can further customize the stack with add-on application layers. For more information about
+cluster profile types, refer to [Cluster Profiles](../introduction.md#cluster-profiles).
 
 In this tutorial, you create a full profile directly from the Palette dashboard. Then, you add a layer to your cluster
 profile by using a [community pack](../../integrations/community_packs.md) to deploy a web application. The concepts you

docs/docs-content/getting-started/azure/deploy-k8s-cluster.md

@@ -38,7 +38,8 @@ To complete this tutorial, you will need the following.
 
 The following steps will guide you through deploying the cluster infrastructure.
 
-Navigate to the left **Main Menu** and select **Clusters**. Click on **Create Cluster**. If there are existing clusters, choose **Add New Cluster**. 
+Navigate to the left **Main Menu** and select **Clusters**. Click on **Create Cluster**. If there are existing clusters,
+choose **Add New Cluster**.
 
 ![Palette clusters overview page](/getting-started/getting-started_deploy-k8s-cluster_new_cluster.webp)
 
@@ -106,8 +107,8 @@ Navigate to the left **Main Menu** and select **Clusters**.
 ![Update the cluster](/getting-started/azure/getting-started_deploy-k8s-cluster_create_cluster.webp)
 
 The cluster deployment process can take 15 to 30 minutes. Deployment time varies depending on the cloud provider,
-cluster profile, cluster size, and node pool configurations provided. You can learn more about the deployment
-progress by reviewing the event log. Choose your cluster and select the **Events** tab to view the log.
+cluster profile, cluster size, and node pool configurations provided. You can learn more about the deployment progress
+by reviewing the event log. Choose your cluster and select the **Events** tab to view the log.
 
 ![Update the cluster](/getting-started/azure/getting-started_deploy-k8s-cluster_event_log.webp)
 

docs/docs-content/getting-started/azure/scale-secure-cluster.md

@@ -10,8 +10,8 @@ tags: ["getting-started", "azure", "tutorial"]
 
 Palette has in-built features to help with the automation of Day-2 operations. Upgrading and maintaining a deployed
 cluster is typically complex because you need to consider any possible impact on service availability. Palette provides
-out-of-the-box functionality for upgrades, observability, granular Role Based Access Control (RBAC), backup, and security
-scans.
+out-of-the-box functionality for upgrades, observability, granular Role Based Access Control (RBAC), backup, and
+security scans.
 
 This tutorial will teach you how to use the Palette UI to perform scale and maintenance tasks on your clusters. You will
 learn how to create Palette projects and teams, import a cluster profile, safely upgrade the Kubernetes version of a
@@ -33,9 +33,9 @@ Additionally, you should install kubectl locally. Use the Kubernetes
 ## Create Palette Projects
 
 Palette projects help you organize and manage cluster resources, providing logical groupings. They also allow you to
-manage user access control through RBAC. You can assign users and teams with specific roles
-to specific projects. All resources created within a project are scoped to that project and only available to that
-project, but a tenant can have multiple projects.
+manage user access control through RBAC. You can assign users and teams with specific roles to specific projects. All
+resources created within a project are scoped to that project and only available to that project, but a tenant can have
+multiple projects.
 
 Log in to [Palette](https://console.spectrocloud.com).
 

docs/docs-content/getting-started/azure/update-k8s-cluster.md

@@ -64,7 +64,8 @@ panel.
 
 ![Image that shows how to add a cluster tag](/getting-started/azure/getting-started_update-k8s-cluster_add-service-tag.webp)
 
-Navigate to the left **Main Menu** and select **Clusters** to view your deployed clusters. Click the **filter** icon to expand the **All Filters** pane, and below **Tags**, enter **service:hello-universe-frontend**. 
+Navigate to the left **Main Menu** and select **Clusters** to view your deployed clusters. Click the **filter** icon to
+expand the **All Filters** pane, and below **Tags**, enter **service:hello-universe-frontend**.
 
 ![Image that shows how to add a frontend service filter](/getting-started/azure/getting-started_update-k8s-cluster_apply-frontend-filter.webp)
 
@@ -198,7 +199,8 @@ The previous state of the cluster profile will not be saved once it is overwritt
 
 Navigate to the left **Main Menu** and select **Clusters**. Select the `azure-cluster` to view its **Overview** tab.
 
-Select the **Profile** tab. Then, select the **hello-universe** pack. Change the `replicas` field on line `15` to `2` and **Save** your changes. The editor is closed.
+Select the **Profile** tab. Then, select the **hello-universe** pack. Change the `replicas` field on line `15` to `2`
+and **Save** your changes. The editor is closed.
 
 This cluster now contains an override over its cluster profile. Palette uses the configuration you have just provided
 for the single cluster over its cluster profile and begins making the appropriate changes.
@@ -213,21 +215,24 @@ corresponding to your _hello-universe-frontend_ cluster, named `azure-profile`.
 
 Click on it to view its details. Select **1.0.0** in the version dropdown.
 
-Select the **hello-universe** pack. Change the `replicas` field on line `15` to `3`. Click on **Confirm Updates**. The editor is closed.
+Select the **hello-universe** pack. Change the `replicas` field on line `15` to `3`. Click on **Confirm Updates**. The
+editor is closed.
 
 Click on **Save Changes** to confirm the changes you have made to your profile.
 
-Navigate to the left **Main Menu** and select **Clusters**. Palette indicates that the cluster associated with the cluster profile you edited has updates available.
+Navigate to the left **Main Menu** and select **Clusters**. Palette indicates that the cluster associated with the
+cluster profile you edited has updates available.
 
 ![Image that shows the pending updates ](/getting-started/azure/getting-started_update-k8s-cluster_pending-update-clusters-view.webp)
 
 Select this cluster to open its **Overview** tab. Click on **Updates** to begin the cluster update.
 
 ![Image that shows the Updates button](/getting-started/azure/getting-started_update-k8s-cluster_updates-available-button-cluster-overview.webp)
 
-A dialog appears, showing a summary of packs changed. Select **Review changes in Editor** to review your changes. Ensure the only change is the
-`replicas` field value. The pending update removes your cluster override and sets the `replicas` field to `3`. At this
-point, you can choose to apply the pending changes or make additional changes by modifying the **Pending Configuration** pane on the right side of the editor.
+A dialog appears, showing a summary of packs changed. Select **Review changes in Editor** to review your changes. Ensure
+the only change is the `replicas` field value. The pending update removes your cluster override and sets the `replicas`
+field to `3`. At this point, you can choose to apply the pending changes or make additional changes by modifying the
+**Pending Configuration** pane on the right side of the editor.
 
 ![Image that shows the available updates dialog ](/getting-started/azure/getting-started_update-k8s-cluster_available-updates-dialog.webp)
 

docs/docs-content/getting-started/gcp/create-cluster-profile.md

@@ -10,9 +10,9 @@ tags: ["getting-started", "gcp"]
 
 Palette offers profile-based management for Kubernetes, enabling consistency, repeatability, and operational efficiency
 across multiple clusters. A cluster profile allows you to customize the cluster infrastructure stack, allowing you to
-choose the desired Operating System (OS), Kubernetes, Container Network Interfaces (CNIs), and Container Storage Interfaces
-(CSIs). You can further customize the stack with add-on application layers. For more information about cluster profile
-types, refer to [Cluster Profiles](../introduction.md#cluster-profiles).
+choose the desired Operating System (OS), Kubernetes, Container Network Interfaces (CNIs), and Container Storage
+Interfaces (CSIs). You can further customize the stack with add-on application layers. For more information about
+cluster profile types, refer to [Cluster Profiles](../introduction.md#cluster-profiles).
 
 In this tutorial, you create a full profile directly from the Palette dashboard. Then, you add a layer to your cluster
 profile by using a [community pack](../../integrations/community_packs.md) to deploy a web application. The concepts you

docs/docs-content/getting-started/gcp/deploy-k8s-cluster.md

@@ -38,7 +38,8 @@ To complete this tutorial, you will need the following.
 
 The following steps will guide you through deploying the cluster infrastructure.
 
-Navigate to the left **Main Menu** and select **Clusters**. Click on **Create Cluster**. If there are existing clusters, choose **Add New Cluster**. 
+Navigate to the left **Main Menu** and select **Clusters**. Click on **Create Cluster**. If there are existing clusters,
+choose **Add New Cluster**.
 
 ![Palette clusters overview page](/getting-started/getting-started_deploy-k8s-cluster_new_cluster.webp)
 
@@ -107,8 +108,8 @@ Navigate to the left **Main Menu** and select **Clusters**.
 ![Update the cluster](/getting-started/gcp/getting-started_deploy-k8s-cluster_new_cluster.webp)
 
 The cluster deployment process can take 15 to 30 minutes. Deployment time varies depending on the cloud provider,
-cluster profile, cluster size, and node pool configurations provided. You can learn more about the deployment
-progress by reviewing the event log. Choose your cluster and select the **Events** tab to view the log.
+cluster profile, cluster size, and node pool configurations provided. You can learn more about the deployment progress
+by reviewing the event log. Choose your cluster and select the **Events** tab to view the log.
 
 ![Update the cluster](/getting-started/gcp/getting-started_deploy-k8s-cluster_event_log.webp)
 

docs/docs-content/getting-started/gcp/scale-secure-cluster.md

@@ -10,8 +10,8 @@ tags: ["getting-started", "gcp", "tutorial"]
 
 Palette has in-built features to help with the automation of Day-2 operations. Upgrading and maintaining a deployed
 cluster is typically complex because you need to consider any possible impact on service availability. Palette provides
-out-of-the-box functionality for upgrades, observability, granular Role Based Access Control (RBAC), backup, and security
-scans.
+out-of-the-box functionality for upgrades, observability, granular Role Based Access Control (RBAC), backup, and
+security scans.
 
 This tutorial will teach you how to use the Palette UI to perform scale and maintenance tasks on your clusters. You will
 learn how to create Palette projects and teams, import a cluster profile, safely upgrade the Kubernetes version of a
@@ -33,9 +33,9 @@ Additionally, you should install kubectl locally. Use the Kubernetes
 ## Create Palette Projects
 
 Palette projects help you organize and manage cluster resources, providing logical groupings. They also allow you to
-manage user access control through RBAC. You can assign users and teams with specific roles
-to specific projects. All resources created within a project are scoped to that project and only available to that
-project, but a tenant can have multiple projects.
+manage user access control through RBAC. You can assign users and teams with specific roles to specific projects. All
+resources created within a project are scoped to that project and only available to that project, but a tenant can have
+multiple projects.
 
 Log in to [Palette](https://console.spectrocloud.com).