From 666098a3db06ffbd4259af0ec3ff6233bcb9f4a2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 22:28:15 +0100 Subject: [PATCH 1/3] Update dependency typescript to v4.9.5 (#2415) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- scripts/update-website-content/package-lock.json | 11 +++++++---- scripts/update-website-content/package.json | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/update-website-content/package-lock.json b/scripts/update-website-content/package-lock.json index 849a04d9c9..14196a6362 100644 --- a/scripts/update-website-content/package-lock.json +++ b/scripts/update-website-content/package-lock.json @@ -14,7 +14,7 @@ "devDependencies": { "@types/node": "^16.9.1", "ts-node": "10.2.1", - "typescript": "4.4.3" + "typescript": "4.9.5" } }, "node_modules/@cspotcode/source-map-consumer": { @@ -454,9 +454,10 @@ } }, "node_modules/typescript": { - "version": "4.4.3", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -779,7 +780,9 @@ } }, "typescript": { - "version": "4.4.3", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true }, "wrappy": { diff --git a/scripts/update-website-content/package.json b/scripts/update-website-content/package.json index 3b2d1ecdb6..2e6c4e9808 100644 --- a/scripts/update-website-content/package.json +++ b/scripts/update-website-content/package.json @@ -15,6 +15,6 @@ "devDependencies": { "@types/node": "^16.9.1", "ts-node": "10.2.1", - "typescript": "4.4.3" + "typescript": "4.9.5" } } From 9775ac699e8d9bf8a6e9a1e22b186e1388ebbc8f Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Thu, 12 Dec 2024 23:18:08 +0100 Subject: [PATCH 2/3] Mitigate duplicate menu entry warnings for cluster-app chart pages (#2413) --- scripts/update-helm-chart-reference/main.sh | 3 ++- .../use-the-api/management-api/cluster-apps/cluster-aws.md | 6 +++--- .../management-api/cluster-apps/cluster-azure.md | 6 +++--- .../management-api/cluster-apps/cluster-cloud-director.md | 6 +++--- .../use-the-api/management-api/cluster-apps/cluster-eks.md | 6 +++--- .../management-api/cluster-apps/cluster-vsphere.md | 6 +++--- .../use-the-api/management-api/cluster-apps/cluster.md | 6 +++--- .../management-api/cluster-apps/default-apps-aws.md | 6 +++--- .../management-api/cluster-apps/default-apps-azure.md | 6 +++--- .../cluster-apps/default-apps-cloud-director.md | 6 +++--- .../management-api/cluster-apps/default-apps-eks.md | 6 +++--- .../management-api/cluster-apps/default-apps-vsphere.md | 6 +++--- 12 files changed, 35 insertions(+), 34 deletions(-) diff --git a/scripts/update-helm-chart-reference/main.sh b/scripts/update-helm-chart-reference/main.sh index f01dc8d43c..e587aa28b7 100755 --- a/scripts/update-helm-chart-reference/main.sh +++ b/scripts/update-helm-chart-reference/main.sh @@ -1,7 +1,8 @@ #!/bin/bash HELM_CHART_DOCS_GENERATOR_VERSION=0.2.0 -DESTINATION=src/content/vintage/use-the-api/management-api/cluster-apps + +DESTINATION=src/content/reference/platform-api/cluster-apps # Clear output folder find ${DESTINATION} -type f -not -name "_index.md" | xargs -I '{}' rm '{}' diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-aws.md b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-aws.md index 7e71c27507..ef1d0b140b 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-aws.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-aws.md @@ -4,9 +4,9 @@ linkTitle: cluster-aws description: A helm chart for creating Cluster API clusters with the AWS infrastructure provider (CAPA).; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: cluster-aws - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-cluster-aws + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for cluster-aws? diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-azure.md b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-azure.md index 8d2ce80365..4992810d38 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-azure.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-azure.md @@ -4,9 +4,9 @@ linkTitle: cluster-azure description: A helm chart for creating Cluster API clusters with the Azure infrastructure provider (CAPZ).; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: cluster-azure - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-cluster-azure + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for cluster-azure? diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-cloud-director.md b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-cloud-director.md index 3860ba8d33..5bff919e12 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-cloud-director.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-cloud-director.md @@ -4,9 +4,9 @@ linkTitle: cluster-cloud-director description: A helm chart for creating Cluster API clusters with the VMware Cloud Director (VCD) infrastructure provider (CAPVCD).; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: cluster-cloud-director - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-cluster-cloud-director + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for cluster-cloud-director? diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-eks.md b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-eks.md index faee803a59..284e33373e 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-eks.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-eks.md @@ -4,9 +4,9 @@ linkTitle: cluster-eks description: A helm chart for creating Cluster API EKS clusters with the AWS infrastructure provider (CAPA).; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: cluster-eks - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-cluster-eks + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for cluster-eks? diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-vsphere.md b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-vsphere.md index 90dcbabfe5..2e0b30b489 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-vsphere.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster-vsphere.md @@ -4,9 +4,9 @@ linkTitle: cluster-vsphere description: A helm chart for creating Cluster API clusters with the vSphere provider (CAPV).; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: cluster-vsphere - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-cluster-vsphere + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for cluster-vsphere? diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster.md b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster.md index 5f48ca7ad3..7d444ef0cb 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/cluster.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/cluster.md @@ -4,9 +4,9 @@ linkTitle: cluster description: Giant Swarm cluster chart with provider-independent cluster resources; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: cluster - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-cluster + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for cluster? diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-aws.md b/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-aws.md index a4f8100144..2d12a420c3 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-aws.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-aws.md @@ -4,9 +4,9 @@ linkTitle: default-apps-aws description: A Helm chart for default-apps-aws; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: default-apps-aws - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-default-apps-aws + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for default-apps-aws? diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-azure.md b/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-azure.md index ac3b0c96a4..7c7417fd96 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-azure.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-azure.md @@ -4,9 +4,9 @@ linkTitle: default-apps-azure description: A Helm chart defining the preinstalled apps running in all Giant Swarm Azure clusters.; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: default-apps-azure - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-default-apps-azure + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for default-apps-azure? diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-cloud-director.md b/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-cloud-director.md index 9cc3e28db2..506f656330 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-cloud-director.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-cloud-director.md @@ -4,9 +4,9 @@ linkTitle: default-apps-cloud-director description: A Helm chart which defines the pre-installed apps in all Giant Swarm Cloud Director (VCD) clusters; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: default-apps-cloud-director - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-default-apps-cloud-director + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for default-apps-cloud-director? diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-eks.md b/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-eks.md index d953708583..5292abf21b 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-eks.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-eks.md @@ -4,9 +4,9 @@ linkTitle: default-apps-eks description: A Helm chart for default-apps-eks; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: default-apps-eks - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-default-apps-eks + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for default-apps-eks? diff --git a/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-vsphere.md b/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-vsphere.md index 7cf292c57e..6ab54682fe 100644 --- a/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-vsphere.md +++ b/src/content/vintage/use-the-api/management-api/cluster-apps/default-apps-vsphere.md @@ -4,9 +4,9 @@ linkTitle: default-apps-vsphere description: A Helm chart which defines the pre-installed apps in all Giant Swarm vSphere clusters; Check here the different properties of the chart. weight: 100 menu: - principal: - identifier: default-apps-vsphere - parent: reference-cluster-apps + main: + identifier: uiapi-cluster-apps-default-apps-vsphere + parent: uiapi-cluster-apps layout: cluster-app user_questions: - What properties can I configure for default-apps-vsphere? From c4bb436e1b7edc41200cc0ce47d399da699b0039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20J=C3=BCttner?= Date: Fri, 13 Dec 2024 09:08:08 +0100 Subject: [PATCH 3/3] Add wc upgrade section (#2394) Co-authored-by: Fernando Ripoll --- .../manage-workload-clusters/index.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/content/tutorials/continuous-deployment/manage-workload-clusters/index.md b/src/content/tutorials/continuous-deployment/manage-workload-clusters/index.md index 456f48186c..bf451f591c 100644 --- a/src/content/tutorials/continuous-deployment/manage-workload-clusters/index.md +++ b/src/content/tutorials/continuous-deployment/manage-workload-clusters/index.md @@ -13,7 +13,7 @@ user_questions: - How to ensure security by combining Flux with the platform API permission model? owner: - https://github.com/orgs/giantswarm/teams/team-honeybadger -last_review_date: 2024-11-11 +last_review_date: 2024-12-12 --- Below you will learn how to manage infrastructure and applications in the Giant Swarm `Flux` setup. @@ -227,6 +227,21 @@ The command will create the folders and the files needed. If you already applied Alternatively, you can add the flag `--cluster-user-config` with the values you want to add to the cluster and it will generate a `ConfigMap` with the values. +#### Upgrading workload clusters + +To upgrade a workload cluster, you need to change the `release.version` field in the `cluster-user-config` file. After that, you commit and push the changes to the repository. The `Flux` controller will detect the changes and the cluster will be upgraded to the new version. The release version can be found by running `kubectl get releases` in the management cluster. You only need to set the version in the `release.version` field. + +Example: + +`kubectl get releases`: + +```sh +NAME KUBERNETES VERSION FLATCAR VERSION AGE STATE +aws-29.4.0 1.29.10 3975.2.2 29d active +``` + +You set the `release.version` in the `cluster-user-config` file to `29.4.0` and commit and push the changes. + ### Installing managed apps Installing applications is easy now that you have the GitOps structure in place. In this tutorial you are going to install `Grafana` to understand the process.