feat: combined updates

.docforge/documentation/documentation.yaml

@@ -1,18 +1,11 @@
 structure:
   - file: _index.md
-    frontmatter:
-      title: Docs
+    source: /website/documentation/_index.md
   - dir: getting-started
     structure:
     - fileTree: /website/documentation/getting-started
   - dir: guides
     structure:
-    - file: _index.md
-      frontmatter:
-        title: Guides
-        description: Walkthroughs of common activities
-        persona: Developers
-        weight: 20
     - manifest: ./guides.yaml
   - dir: security-and-compliance
     structure:
@@ -21,7 +14,7 @@ structure:
       frontmatter:
         title: Security and Compliance
         description: Make sure that your clusters are compliant and secure
-        weight: 30
+        weight: 36
         aliases: ["/docs/security-and-compliance/"]
       source: https://github.com/gardener/.github/blob/main/SECURITY.md
     - file: https://github.com/gardener/diki/blob/main/docs/usage/disa-k8s-stig-shoot.md
@@ -47,7 +40,7 @@ structure:
         frontmatter:
           title: API Reference
           weight: 10
-          aliases: 
+          aliases:
           - "/api-reference/"
           persona: Developers
         source: https://github.com/gardener/gardener/blob/master/docs/api-reference/README.md
@@ -63,7 +56,6 @@ structure:
           persona: Operators
       - fileTree: https://github.com/gardener/gardener/tree/master/docs/concepts
       - file: https://github.com/gardener/gardener/blob/master/logo/gardenadm-large.png
-      - file: https://github.com/gardener/gardener/blob/master/docs/proposals/assets/28-overview.png
     - dir: extensions
       structure:
       - file: _index.md
@@ -176,6 +168,17 @@ structure:
           - "high-availability/shoot_high_availability_best_practices.md" # already included in ./guides.yaml, avoiding duplicates
           - "high-availability/shoot_high_availability.md" # already included in ./guides.yaml, avoiding duplicates
           - "autoscaling/shoot_pod_autoscaling_best_practices.md" # already included in ./guides.yaml, avoiding duplicates
+  - dir: proposals
+    structure:
+      - file: _index.md
+        frontmatter:
+          title: Proposals
+          weight: 34
+        source: https://github.com/gardener/enhancements/blob/main/geps/README.md
+      - fileTree: https://github.com/gardener/enhancements/tree/main/geps
+        excludeFiles:
+          - README.md
+          - NNNN-gep-template/README.md
   - dir: extensions
     structure:
     - file: _index.md
@@ -187,11 +190,6 @@ structure:
     - manifest: ./gardener-extensions/gardener-extensions.yaml
   - dir: other-components
     structure:
-    - file: _index.md
-      frontmatter:
-        title: Other Components
-        description: Other components included in the Gardener project
-        weight: 50
     - manifest: ./other-components.yaml
   - dir: dashboard
     structure:
@@ -217,9 +215,8 @@ structure:
   - dir: faq
     structure:
     - manifest: ./faq.yaml
-  - dir: glossary
-    structure:
-    - fileTree: /website/documentation/glossary
+  - file: glossary.md
+    source: /website/documentation/glossary.md
   - dir: resources
     structure:
     - fileTree: /website/documentation/resources

.docforge/documentation/other-components.yaml

@@ -1,4 +1,6 @@
 structure:
+- file: _index.md
+  source: /website/documentation/other-components/_index.md
 - dir: machine-controller-manager
   structure:
   - file: _index.md

.dockerignore

@@ -6,5 +6,6 @@
 !images/
 !post-processing/
 !website/
+!Makefile
 !package*.json
 !tsconfig.json

.github/workflows/deploy-github-pages.yaml

@@ -39,33 +39,24 @@ jobs:
         with:
           path: .vitepress/dist
         if: github.event_name != 'pull_request'
-
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
+      - name: Send failure notification
+        uses: gardener/cc-utils/.github/actions/send-mail@master
+        if: ${{ failure() && github.ref == 'refs/heads/master' }}
         with:
-          node-version: 24
-          cache: npm
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-      - name: Test
-        run: make ci-test
-        env:
-          GITHUB_OAUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          subject: GHA workflow ${{ github.workflow_ref }} failed!
+          body: |
+            The following GHA job failed:
+            ${build_job_url}
+          recipients: |
+            niklas.klocke@sap.com
+            marc.vornetran@sap.com
 
   deploy:
     if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    needs: [build, test]
+    needs: [build]
     runs-on: ubuntu-latest
     name: Deploy
     steps:

.github/workflows/pr-preview.yaml

@@ -6,6 +6,7 @@ on:
       - closed
 
 permissions:
+  id-token: write
   pull-requests: write
 
 concurrency: preview-${{ github.ref }}
@@ -15,14 +16,13 @@ jobs:
     if: ${{ github.event.action == 'labeled' && github.event.label.name == vars.DEFAULT_LABEL_OK_TO_TEST && vars.DEFAULT_LABEL_OK_TO_TEST != '' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/create-github-app-token@v2
+      - uses: gardener/cc-utils/.github/actions/github-auth@master
         id: app-token
         with:
-          # required
-          app-id: ${{ vars.GARDENER_GITHUB_ACTIONS_APP_ID }}
-          private-key: ${{ secrets.GARDENER_GITHUB_ACTIONS_PRIVATE_KEY }}
-          owner: gardener
+          token-server: ${{ vars.FEDERATED_GITHUB_ACCESS_TOKEN_SERVER }}
           repositories: documentation-demo
+          permissions: |
+            contents: write
 
       - name: Checkout
         uses: gardener/cc-utils/.github/actions/trusted-checkout@master
@@ -51,7 +51,7 @@ jobs:
       - name: Build with VitePress
         run: |
           echo "Building with VITE_PUBLIC_BASE_PATH: '$VITE_PUBLIC_BASE_PATH'"
-          npm run docs:build  
+          make build  
 
       - uses: actions/checkout@v6
         with:
@@ -193,14 +193,13 @@ jobs:
     if: ${{ github.event.action == 'closed' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/create-github-app-token@v2
+      - uses: gardener/cc-utils/.github/actions/github-auth@master
         id: app-token
         with:
-          # required
-          app-id: ${{ vars.GARDENER_GITHUB_ACTIONS_APP_ID }}
-          private-key: ${{ secrets.GARDENER_GITHUB_ACTIONS_PRIVATE_KEY }}
-          owner: gardener
+          token-server: ${{ vars.FEDERATED_GITHUB_ACCESS_TOKEN_SERVER }}
           repositories: documentation-demo
+          permissions: |
+            contents: write
 
       - name: Checkout main repository
         uses: gardener/cc-utils/.github/actions/trusted-checkout@master

.github/workflows/pullrequest-trust-helper.yaml

@@ -9,8 +9,7 @@ on:
 jobs:
   pullrequest-trusted-helper:
     permissions:
-      pull-requests: write
-    secrets: inherit # access to `GitHub-Actions`-App is needed to read teams
+      id-token: write
     uses: gardener/cc-utils/.github/workflows/pullrequest-trust-helper.yaml@master
     with:
-      trusted-teams: 'documentation-maintainers'
+      trusted-teams: 'documentation-maintainers'