From 94159614fcc9516e8cc635c7fc99fa933a736569 Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Tue, 16 Apr 2024 12:45:59 -0700 Subject: [PATCH] chore: merge master (#2675) --- .../clusters/public-cloud/azure/gateways.md | 2 +- .../clusters/public-cloud/azure/windows.md | 4 ++-- docs/docs-content/integrations/k3s.md | 15 +++++++-------- docs/docs-content/integrations/oidc-eks.md | 2 +- redirects.js | 8 -------- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/docs/docs-content/clusters/public-cloud/azure/gateways.md b/docs/docs-content/clusters/public-cloud/azure/gateways.md index a7337d4a8e..cc8709a1bf 100644 --- a/docs/docs-content/clusters/public-cloud/azure/gateways.md +++ b/docs/docs-content/clusters/public-cloud/azure/gateways.md @@ -91,7 +91,7 @@ VNet contains the following network settings. #### Azure CNI: In Azure CNI network configuration, select the static - [virtual network created](gateways#create-a-virtual-network-in-the-azure-console) from the drop-down menu. + [virtual network created](#create-a-virtual-network-in-the-azure-console) from the drop-down menu. 6. Security: For network security enable **Private cluster**. diff --git a/docs/docs-content/clusters/public-cloud/azure/windows.md b/docs/docs-content/clusters/public-cloud/azure/windows.md index e86c568ec2..6ba7f669d0 100644 --- a/docs/docs-content/clusters/public-cloud/azure/windows.md +++ b/docs/docs-content/clusters/public-cloud/azure/windows.md @@ -33,8 +33,8 @@ Follow the steps below to create a Windows node pool within an existing AKS clus :::info Palette also allows you to add a Windows node pool during the creation of an AKS cluster. Refer to the -[Create and Manage Azure AKS CLuster - Create and Remove Node Pools](./aks#create-and-remove-node-pools) page to learn -more. +[Create and Manage Azure AKS CLuster - Create and Remove Node Pools](./aks.md#create-and-remove-node-pools) page to +learn more. ::: diff --git a/docs/docs-content/integrations/k3s.md b/docs/docs-content/integrations/k3s.md index cb24dd5b8c..a39b0bfe01 100644 --- a/docs/docs-content/integrations/k3s.md +++ b/docs/docs-content/integrations/k3s.md @@ -31,6 +31,7 @@ the respective owner. Once we stop supporting the minor version, we initiate the - An edge device with AMD64 processor architecture or a Palette Virtual Cluster. - A minimum of 2 CPU cores and 1 GB memory. +- Palette 4.0.0 or later. ### Parameters @@ -156,12 +157,6 @@ After you have configured the IDP for authentication, you can proceed to create in your cluster. Refer to [Create Role Bindings](../clusters/cluster-management/cluster-rbac.md#create-role-bindings) for more guidance. -#### Configure OIDC Identity Provider for Palette Virtual Clusters - -If you are using K3s in a virtual cluster inside of a cluster group, you can also configure OIDC for your cluster. Refer -to [Configure OIDC for a Virtual Cluster](../clusters/palette-virtual-clusters/configure-oidc-virtual-cluster.md) for -more guidance. - #### Add a Certificate for Reverse Proxy You can use a reverse proxy with a K3s Kubernetes cluster. The reverse proxy allows you to connect to the cluster API of @@ -176,6 +171,7 @@ information, refer to the [Spectro Proxy](frp.md) pack guide. - An edge device with AMD64 processor architecture or a Palette Virtual Cluster. - A minimum of 2 CPU cores and 1 GB memory. +- Palette 4.0.0 or later. ### Parameters @@ -313,6 +309,7 @@ information, refer to the [Spectro Proxy](frp.md) pack guide. - An edge device with AMD64 processor architecture or a Palette Virtual Cluster. - A minimum of 2 CPU cores and 1 GB memory. +- Palette 4.0.0 or later. ### Parameters @@ -452,6 +449,7 @@ information, refer to the [Spectro Proxy](frp.md) pack guide. - An edge device with AMD64 processor architecture or a Palette Virtual Cluster. - A minimum of 2 CPU cores and 1 GB memory. +- Palette 4.0.0 or later. ### Parameters @@ -506,7 +504,7 @@ information. In order to use K3s as part of an Edge deployment, you need to go through the EdgeForge process and specify K3s as your intended Kubernetes distribution when you build your OS image. For more information, refer to the -[EdgeForge Workflow](../clusters/edge/edgeforge-workflow/) guide. +[EdgeForge Workflow](../clusters/edge/edgeforge-workflow/edgeforge-workflow.md) guide. ::: @@ -590,6 +588,7 @@ information, refer to the [Spectro Proxy](frp.md) pack guide. - An edge device with AMD64 processor architecture or a virtual cluster. - A minimum of 2 CPU cores and 1 GB memory. +- Palette 4.0.0 or later. ### Parameters @@ -644,7 +643,7 @@ information. In order to use K3s as part of an Edge deployment, you need to go through the EdgeForge process and specify K3s as your intended Kubernetes distribution when you build your OS image. For more information, refer to the -[EdgeForge Workflow](../clusters/edge/edgeforge-workflow/) guide. +[EdgeForge Workflow](../clusters/edge/edgeforge-workflow/edgeforge-workflow.md) guide. ::: diff --git a/docs/docs-content/integrations/oidc-eks.md b/docs/docs-content/integrations/oidc-eks.md index d24335b1fd..dd5051579f 100644 --- a/docs/docs-content/integrations/oidc-eks.md +++ b/docs/docs-content/integrations/oidc-eks.md @@ -29,4 +29,4 @@ thin layer that sits on top of OAuth 2.0 that adds login and profile information ## References -https://aws.amazon.com/blogs/containers/introducing-oidc-identity-provider-authentication-amazon-eks/ +[AWS OIDC EKS Blog](https://aws.amazon.com/blogs/containers/introducing-oidc-identity-provider-authentication-amazon-eks/) diff --git a/redirects.js b/redirects.js index 907f615417..5f204646bf 100644 --- a/redirects.js +++ b/redirects.js @@ -155,14 +155,6 @@ const redirects = [ from: `/devx/virtual-clusters/`, to: `/devx/palette-virtual-clusters/`, }, - { - from: `/integrations/ubuntu-k3s/`, - to: `/integrations/ubuntu/`, - }, - { - from: `/integrations/oidc-eks`, - to: `/integrations/kubernetes`, - }, { from: `/clusters/palette-virtual-clusters/add-virtual-cluster-to-host-cluster/`, to: `/clusters/palette-virtual-clusters/deploy-virtual-cluster/`,