Merge branch 'cncf:main' into main

Author: node

CODEOWNERS

@@ -10,13 +10,10 @@
 #
 # Unless a later match takes precedence, these owners will be requested for
 # review when someone opens a pull request.
-*   @AloisReitbauer @thschue @joshgav @lianmakesthings @kgamanji @angellk
+*   @thschue @joshgav @lianmakesthings @kgamanji @angellk @linsun @AloisReitbauer
 
 # Platforms WG
-/platforms-*/ @AloisReitbauer @thschue @joshgav @lianmakesthings @kgamanji  @angellk @abangser @roberthstrand @krumware
-
-# GitOps WG
-/gitops-*/ @AloisReitbauer @thschue @joshgav @lianmakesthings @kgamanji @angellk @todaywasawesome @chris-short @scottrigby
+/platforms-*/ @thschue @joshgav @lianmakesthings @kgamanji  @angellk @abangser @roberthstrand @krumware @linsun @AloisReitbauer
 
 # Artifacts WG
-/artifacts-*/ @AloisReitbauer @thschue @joshgav @lianmakesthings @kgamanji @angellk @sabre1041 @rchincha
+/artifacts-*/ @thschue @joshgav @lianmakesthings @kgamanji @angellk @sabre1041 @rchincha @linsun @AloisReitbauer

README.md

@@ -31,16 +31,17 @@ as well as the [CNCF Community Calendar](https://community.cncf.io/tag-app-deliv
 
 ## Leads
 
-- Alois Reitbauer (@AloisReitbauer) (Co-Chair, Term: 2023/08/30 - 2025/08/29)
+- Lian Li (@lianmakesthings) (Co-Chair, Term: 2024/04/16 - 2026/04/15)
 - Josh Gavant (@joshgav) (Co-Chair, Term: 2023/08/30 - 2025/08/29)
 - Thomas Schuetz (@thschue) (Co-Chair, Term: 2023/08/30 - 2025/08/29)
-- Lian Li (@lianmakesthings) (TL)
 - Karena Angell (@angellk) (TL)
 
 ## TOC Liaisons
 - Katie Gamanji (@kgamanji)
+- Lin Sun (@linsun)
 
 ## Emeritus Leads
+- Alois Reitbauer (@AloisReitbauer)
 - Jennifer Strejevitch (@Jenninha)
 - Hongchao Deng (@hongchaodeng)
 - Alex Jones (@AlexsJones)

operator-whitepaper/latest/index.md

@@ -4,6 +4,7 @@ pdf: https://github.com/cncf/tag-app-delivery/blob/main/operator-whitepaper/v1/C
 version_info: https://github.com/cncf/tag-app-delivery/blob/main/operator-whitepaper/latest/README.md
 description: "In this document, we outline not only the taxonomy of an operator but the recommended configuration, implementation and use cases for an operator application management system."
 type: whitepapers
+url: whitepapers/operator
 ---
 
 ## Table of Contents

platforms-maturity-model/v1/index.md

@@ -7,6 +7,7 @@ This document refers to, enhances, and follows similar standards as the followin
 [Cloud Maturity Model](https://maturitymodel.cncf.io/)<br/>
 [Platforms Definition White Paper](https://tag-app-delivery.cncf.io/whitepapers/platforms/)"
 type: whitepapers
+url: whitepapers/platform-eng-maturity-model
 ---
 
 

platforms-whitepaper/latest/index.md

@@ -4,6 +4,7 @@ pdf: https://github.com/cncf/tag-app-delivery/raw/main/platforms-whitepaper/v1/a
 version_info: https://github.com/cncf/tag-app-delivery/tree/main/platforms-whitepaper/README.md
 description: "This paper intends to support enterprise leaders, enterprise architects and platform team leaders to advocate for, investigate and plan internal platforms for cloud computing. We believe platforms significantly impact enterprises' actual value streams, but only indirectly, so leadership consensus and support is vital to the long-term sustainability and success of platform teams. In this paper we'll enable that support by discussing what the value of platforms is, how to measure it, and how to implement platform teams that maximize it."
 type: whitepapers
+url: whitepapers/platforms
 ---
 
 ## Introduction
@@ -157,6 +158,10 @@ following:
    cost of deployed services through automatic instrumentation and standard
    dashboards.
 
+{{% pageinfo color="info" %}}
+Please refer to the [Platform Engineering Maturity Model](https://tag-app-delivery.cncf.io/whitepapers/platform-eng-maturity-model/) created after this paper was originally published.
+{{% /pageinfo %}}
+
 By offering consistent, compliant experiences for individual capabilities or
 sets of them, internal platforms ultimately make it easier and more efficient
 for their users to deliver valuable products.

platforms-whitepaper/v1/index.md

@@ -156,6 +156,10 @@ following:
    cost of deployed services through automatic instrumentation and standard
    dashboards.
 
+{{% pageinfo color="info" %}}
+Please refer to the [Platform Engineering Maturity Model](https://tag-app-delivery.cncf.io/whitepapers/platform-eng-maturity-model/) created after this paper was originally published.
+{{% /pageinfo %}}
+
 By offering consistent, compliant experiences for individual capabilities or
 sets of them, internal platforms ultimately make it easier and more efficient
 for their users to deliver valuable products.

website/config.toml

@@ -86,12 +86,12 @@ weight = 5
 [languages.es.params]
 description = "El TAG App Delivery se centra en habilitar proyectos e iniciativas relacionados con el despliegue de aplicaciones cloud-native, incluyendo su construcción, manejo y operativa."
 
-[languages.fr]
-title = "CNCF TAG App Delivery"
-description = "Le TAG App Delivery se concentre sur la mise en oeuvre de projets et d'initiatives liés à la livraison d'applications cloud natives, comprenant leur création, déploiement, gestion et exploitation."
-languageName = "Français(French)"
-contentDir = "content/fr"
-weight = 6
+# [languages.fr]
+# title = "CNCF TAG App Delivery"
+# description = "Le TAG App Delivery se concentre sur la mise en oeuvre de projets et d'initiatives liés à la livraison d'applications cloud natives, comprenant leur création, déploiement, gestion et exploitation."
+# languageName = "Français(French)"
+# contentDir = "content/fr"
+# weight = 6
 
 [markup]
   [markup.goldmark]

website/content/en/_index.md

@@ -43,13 +43,17 @@ as well as the [CNCF Community Calendar](https://community.cncf.io/tag-app-deliv
 
 ## Leads
 
-- [Alois Reitbauer](https://github.com/AloisReitbauer) (Chair)
 - [Josh Gavant](https://github.com/joshgav) (Chair)
 - [Thomas Schuetz](https://github.com/thschue) (Chair)
-- [Alex Jones](https://github.com/alexsjones) (TL)
-- [Lian Li](https://github.com/lianmakesthings) (TL)
+- [Lian Li](https://github.com/lianmakesthings) (Chair)
 - [Karena Angell](https://github.com/angellk) (TL)
 
+### Emeritus Leads
+- [Alois Reitbauer](https://github.com/AloisReitbauer)
+- [Jennifer Strejevitch](https://github.com/Jenninha)
+- [Hongchao Deng](https://github.com/hongchaodeng)
+- [Alex Jones](https://github.com/AlexsJones)
+
 ### Additional Resources
 
 - [TAG Charter](https://github.com/cncf/toc/blob/main/tags/tag-charters/app-delivery.md)