Merge pull request #2 from ArangoGutierrez/rebase-play

Rebase

OWNERS_ALIASES

@@ -46,7 +46,7 @@ aliases:
     - divya-mohan0209
     - natalisucks
     - reylejano
-    - sftim
+    - salaxander
     - tengqm
   sig-etcd-leads:
     - ahrtr
@@ -119,9 +119,6 @@ aliases:
     - jsturtevant
     - knabben
     - marosset
-  wg-api-expression-leads:
-    - apelisse
-    - kwiesmueller
   wg-batch-leads:
     - alculquicondor
     - mwielgus
@@ -144,6 +141,7 @@ aliases:
     - sudermanjr
   wg-serving-leads:
     - ArangoGutierrez
+    - Jeffwan
     - SergeyKanzhelev
     - terrytangyuan
   wg-structured-logging-leads:

committee-code-of-conduct/README.md

@@ -18,7 +18,7 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
 * Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), Independent
 * Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**), Red Hat
 * Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Microsoft
-* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Microsoft
+* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Defense Unicorns
 
 ## Emeritus Members
 

communication/slack-config/channels.yaml

@@ -321,6 +321,7 @@ channels:
   - name: litmus-dev
   - name: lokomotive
     archived: true
+  - name: lula-dev
   - name: magnum-cluster-api
   - name: malaysia-users
   - name: malta-users

communication/slack-config/usergroups.yaml

@@ -244,23 +244,22 @@ usergroups:
     description: Members of the Cluster API Release Team
     members:
       - adilGhaffarDev
-      - adityabhatia
-      - akshay196
-      - cahillsf
       - chandankumar4
-      - Dhairya-Arora01
-      - Fedosin
-      - mansikulkarni96
-      - mcbenjemaa
-      - nawazkh
-      - ssuriyan7
-      - SubhasmitaSw
+      - chiukapoor
+      - dhij
+      - hackeramitkumar
+      - jayesh-srivastava
+      - kperath
+      - meatballhat
+      - Nivedita-coder
+      - pravarag
+      - rajankumary2k
+      - shipra101
+      - smoshiur1237
       - Sunnatillo
       - troy0820
-      - typeid
-      - VibhorChinda
+      - vishalanarase
       - willie-yao
-      - yrs147
 
   - name: kcp-devs
     long_name: kcp Development Team
@@ -319,6 +318,7 @@ usergroups:
       - irbekrm
       - sgtcodfish
       - inteon
+      - ThatsMrTalbot
 
   - name: gophercloud-maintainers
     long_name: Gophercloud Maintainers

communication/slack-config/users.yaml

@@ -58,6 +58,7 @@ users:
   derekwaynecarr: U0A69N5GQ
   Dhairya-Arora01: U04TXBEMJU9
   dharmit: U0APPPEKE
+  dhij: U03JKSTHALT
   dims: U0Y7A2MME
   divya-mohan0209: UV4J7K97Z
   dntosas: UKT4D74F3
@@ -104,6 +105,7 @@ users:
   JamesLaverack: U9MK7274Y
   Jason: UB272379N
   jasperchui: U01DRL00ES3
+  jayesh-srivastava: U023B885W9M
   jberkhahn: U7Q21LH2S
   Jdubrick: U068JS25A03
   jdumars: U0YJS6LHL
@@ -136,6 +138,7 @@ users:
   kim-tsao: U02U1LDH4T1
   klihub: U9856A799
   klueska: UF3ARH55Y
+  kperath: U03GWQJU539
   kranurag7: U02MRK4FY8N
   Kunal Kushwaha: UQ14U3NAY
   kylape: UEUST4S22
@@ -157,6 +160,7 @@ users:
   maysunfaisal: U01DEHK2YUB
   mbbroberg: U18JTHMDY
   mcbenjemaa: UF111SQ4U
+  meatballhat: U01QEKCBTBM
   mehabhalodiya: U024HPAQDC1
   mfahlandt: U01RR6BFC9Y
   micahhausler: U1WJ1BZA5
@@ -179,6 +183,7 @@ users:
   neoaggelos: U02GE88D3SQ
   nikhita: U2PQHGMLN
   nitishfy: U03AB2YFVGV
+  Nivedita-coder: U01H4FQJ3RP
   nkubala: UA90QL2BE
   nprokopic: UR434B8TS
   nrb: U7S597E00
@@ -199,12 +204,14 @@ users:
   pnbrown: U011JJTQVGF
   pohly: U91901TMF
   prajyot-parab: U02MVRCN8CX
+  pravarag: UFA5V59J5
   prietyc123: U01D4MBLM52
   Priyankasaggu11929: U012EE74CU8
   puerco: ULGHLJ7TP
   PurneswarPrasad: U027CFKVAB0
   pweil-: U0AL6882X
   r-lawton: U019CNHR2E6
+  rajankumary2k: U011YM87GQK
   rajula96reddy: U7K9EK1HC
   ramrodo: UU74ZC2RX
   rashmigottipati: U013T1DD3PW
@@ -230,9 +237,11 @@ users:
   sethmccombs: U92LLUZ8A
   sgtcodfish: U01PQ8N3PM1
   shamus: US7EUUBK8
+  shipra101: U06MJ9TT031
   shubham-pampattiwar: U01QW84HBBN
   simplytunde: UAY1NBYHE
   Sladyn Nunes: UQ9J177Q8
+  smoshiur1237: UULFDSURY
   soltysh: U0B4CS1GF
   sreeram-venkitesh: U03RJ6L977C
   ssuriyan7: U01F68C7VGD
@@ -247,6 +256,7 @@ users:
   tallclair: U64VCBURE
   TaoBeier: UCLDV6MN1
   tejal29: UACD7R316
+  ThatsMrTalbot: U7QBP08LR
   theishshah: U01891A4TRS
   thejoycekung: U01AY4VHX25
   thepetk: U04NW4PPY8N
@@ -261,6 +271,7 @@ users:
   Verolop: U7NNE57PU
   VibhorChinda: U031EALE91D
   vincepri: UCD11GCET
+  vishalanarase: U02GX4DHBUM
   vladimirmukhin: UHVSCSD4G
   vzhukovs: U030TR1FG85
   wallrj: U1ZMERJF7

contributors/devel/README.md

@@ -37,7 +37,7 @@ Guide](https://kubernetes.io/docs/concepts/cluster-administration/).
 * **Profiling Kubernetes** ([profiling.md](sig-scalability/profiling.md)): How to plug in go pprof profiler to Kubernetes.
 
 * **Instrumenting Kubernetes with a new metric**
-  ([instrumentation.md](sig-instrumentation/instrumentation.md)): How to add a new metrics to the
+  ([instrumentation.md](sig-instrumentation/metric-instrumentation.md)): How to add a new metrics to the
   Kubernetes code base.
 
 * **Coding Conventions** ([coding-conventions.md](../guide/coding-conventions.md)):
@@ -95,7 +95,7 @@ See the [kubernetes/release](https://github.com/kubernetes/release) repository f
 
 * **Event style guide** [event-style-guide.md](sig-instrumentation/event-style-guide.md)
 
-* **Instrumenting Kubernetes** [instrumentation.md](sig-instrumentation/instrumentation.md)
+* **Instrumenting Kubernetes with a new metric** [instrumentation.md](sig-instrumentation/metric-instrumentation.md)
 
 * **Structured Logging migration instructions** [migration-to-structured-logging.md](sig-instrumentation/migration-to-structured-logging.md)
 

contributors/devel/sig-architecture/api_changes.md

@@ -1096,7 +1096,7 @@ Previously, annotations were used for experimental alpha features, but are no lo
 
 The preferred approach adds an alpha field to the existing object, and ensures it is disabled by default:
 
-1. Add a feature gate to the API server to control enablement of the new field (and associated function):
+1. Add a [feature gate](feature-gates.md) to the API server to control enablement of the new field:
 
     In [staging/src/k8s.io/apiserver/pkg/features/kube_features.go](https://git.k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/features/kube_features.go):
 
@@ -1118,7 +1118,8 @@ The preferred approach adds an alpha field to the existing object, and ensures i
     * ensure the field is [optional](api-conventions.md#optional-vs-required)
         * add the `omitempty` struct tag
         * add the `// +optional` comment tag
-        * ensure the field is entirely absent from API responses when empty (optional fields should be pointers, anyway)
+        * add the `// +featureGate=<gate-name>` comment tag
+        * ensure the field is entirely absent from API responses when empty (optional fields must be pointers)
     * include details about the alpha-level in the field description
 
     ```go
@@ -1131,6 +1132,7 @@ The preferred approach adds an alpha field to the existing object, and ensures i
       // width indicates how wide the object is.
       // This field is alpha-level and is only honored by servers that enable the Frobber2D feature.
       // +optional
+      // +featureGate=Frobber2D
       Width  *int32 `json:"width,omitempty"`
     }
     ```
@@ -1243,7 +1245,7 @@ Older versions of expected API clients must be able handle the new value in a sa
 * If the enum field drives behavior of a single component, ensure all versions of that component
   that will encounter API objects containing the new value handle it properly or fail safe.
   For example, a new allowed value in a `Pod` enum field consumed by the kubelet must be handled
-  safely by kubelets up to two versions older than the first API server release that allowed the new value.
+  safely by kubelets up to three versions older than the first API server release that allowed the new value.
 * If an API drives behavior that is implemented by external clients (like `Ingress` or `NetworkPolicy`),
   the enum field must explicitly indicate that additional values may be allowed in the future,
   and define how unrecognized values must be handled by clients. If this was not done in the first release
@@ -1268,7 +1270,7 @@ Release 2:
 This ensures a cluster with multiple servers at skewed releases (which happens during a rolling upgrade),
 will not allow data to be persisted which the previous release of the API server would choke on.
 
-Typically, a feature gate is used to do this rollout, starting in alpha and disabled by default in release 1,
+Typically, a [feature gate](feature-gates.md) is used to do this rollout, starting in alpha and disabled by default in release 1,
 and graduating to beta and enabled by default in release 2.
 
 1. Add a feature gate to the API server to control enablement of the new enum value (and associated function):