traffic-access-control.md

@@ -18,7 +18,7 @@ granted to traffic that matches the rules.
 
 This object defines access control on a pod basis. The selector matches across
 labels in the current namespace. This is either directly with `matchLabels` or
-as an expression with `matchExpressions`.
+as an expression with `matchExressions`.
 
 Rules are [traffic specs](traffic-specs.md) that define what traffic for
 specific protocols would look like. The kind can be different depending on what
@@ -49,7 +49,7 @@ Prometheus. To define the target for this traffic, it takes a `TrafficTarget`.
 
 ```yaml
 kind: TrafficTarget
-apiVersion: v1beta1
+apiVersion: access.smi-spec.io/v1alpha1
 metadata:
   name: path-specific
   namespace: default
@@ -82,7 +82,7 @@ reference to the traffic target defining what has been granted.
 
 ```yaml
 kind: IdentityBinding
-apiVersion: v1beta1
+apiVersion: access.smi-spec.io/v1alpha1
 metadata:
   name: account-specific
   namespace: default
@@ -106,7 +106,7 @@ identity.
 
 ```yaml
 kind: IdentityBinding
-apiVersion: v1beta1
+apiVersion: access.smi-spec.io/v1alpha1
 metadata:
   name: account-specific
   namespace: default
@@ -135,7 +135,7 @@ apiVersion: v1beta1
 metadata:
   name: metrics-scrape
 selector:
-  matchExpressions:
+  matchExpressions
   - !protected
 port: 8080
 rules:

traffic-metrics.md

@@ -51,7 +51,7 @@ The core resource is `TrafficMetrics`. It references a `resource`, has an `edge`
 and surfaces latency percentiles and request volume.
 
 ```yaml
-apiVersion: traffic.metrics.k8s.io/v1beta1
+apiVersion: metrics.smi-spec.io/v1alpha1
 kind: TrafficMetrics
 # See ObjectReference v1 core for full spec
 resource:
@@ -150,7 +150,7 @@ There are three different ways to get a TrafficMetricsList:
 * Requesting a specific `kind` such as pods or namespaces.
 
     ```yaml
-    apiVersion: traffic.metrics.k8s.io/v1beta1
+    apiVersion: metrics.smi-spec.io/v1alpha1
     kind: TrafficMetricsList
     resource:
       kind: Pod
@@ -164,7 +164,7 @@ There are three different ways to get a TrafficMetricsList:
 * Requesting a specific `kind` such as pods and filtering with a label selector:
 
     ```yaml
-    apiVersion: traffic.metrics.k8s.io/v1beta1
+    apiVersion: metrics.smi-spec.io/v1alpha1
     kind: TrafficMetricsList
     resource:
       kind: Pod
@@ -181,7 +181,7 @@ There are three different ways to get a TrafficMetricsList:
 * Listing all the edges for a specific resource:
 
     ```yaml
-    apiVersion: traffic.metrics.k8s.io/v1beta1
+    apiVersion: metrics.smi-spec.io/v1alpha1
     kind: TrafficMetricsList
     resource:
       name: foo-775b9cbd88-ntxsl
@@ -205,22 +205,22 @@ The `traffic.metrics.k8s.io` API will be exposed via a `APIService`:
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
-  name: v1beta1.mesh.metrics.k8s.io
+  name: v1beta1.metrics.smi-spec.io
 spec:
-  group: mesh.metrics.k8s.io
+  group: metrics.smi-spec.io/v1alpha1
   service:
     name: mesh-metrics
     namespace: default
   version: v1beta1
 ```
 
-The default response, or requesting `/apis/traffic.metrics.k8s.io/v1beta1/`
+The default response, or requesting `/apis/metrics.smi-spec.io/v1alpha1/`
 would return:
 
 ```yaml
 apiVersion: v1
 kind: APIResourceList
-groupVersion: mesh.metrics.k8s.io/v1beta1
+groupVersion: metrics.smi-spec.io/v1alpha1
 resources:
 - name: namespaces
   namespaced: false
@@ -280,7 +280,7 @@ or a dashboard.
 
 ### Canary
 
-In combination with the Canary specification, a controller can:
+In combination with the TrafficSplit specification, a controller can:
 
 * Create a new deployment `v2`.
 * Add a new canary and service for `v2`.
@@ -362,7 +362,7 @@ Walking through the request flow:
 1. An end user fires off a request to the Kubernetes API Server:
 
     ```bash
-    kubectl get --raw /apis/traffic.metrics.k8s.io/v1beta1/namespaces/default/deployments/
+    kubectl get --raw /apis/metrics.smi-spec.io/v1alpha1/namespaces/default/deployments/
     ```
 
 1. The Kubernetes API server forwards this request to the `Traffic Metrics

traffic-specs.md

@@ -18,7 +18,7 @@ This resource is used to describe HTTP/1 and HTTP/2 traffic. It enumerates the
 routes that can be served by an application.
 
 ```yaml
-apiVersion: v1beta1
+apiVersion: specs.smi-spec.io/v1alpha1
 kind: HTTPRoutes
 metadata:
   name: the-routes

traffic-split.md

@@ -24,7 +24,7 @@ different selector and type.
 ## Specification
 
 ```yaml
-apiVersion: v1beta1
+apiVersion: split.smi-spec.io/v1alpha1
 kind: TrafficSplit
 metadata:
   name: my-weights
@@ -176,7 +176,7 @@ For updating an application to a new version:
 * Create a new traffic split named `foobar-rollout`, it will look like:
 
     ```yaml
-    apiVersion: v1beta1
+    apiVersion: split.smi-spec.io/v1alpha1
     kind: TrafficSplit
     metadata:
       name: foobar-rollout
@@ -197,7 +197,7 @@ For updating an application to a new version:
 * When ready, increase the weight of `foobar-v2`:
 
     ```yaml
-    apiVersion: v1beta1
+    apiVersion: split.smi-spec.io/v1alpha1
     kind: TrafficSplit
     metadata:
       name: foobar-rollout
@@ -218,7 +218,7 @@ For updating an application to a new version:
 * Send all traffic to the new version:
 
     ```yaml
-    apiVersion: v1beta1
+    apiVersion: split.smi-spec.io/v1alpha1
     kind: TrafficSplit
     metadata:
       name: foobar-rollout
@@ -258,7 +258,7 @@ For updating an application to a new version:
 * TrafficSplits cannot be self-referential - consider the following definition:
 
     ```yaml
-    apiVersion: v1beta1
+    apiVersion: split.smi-spec.io/v1alpha1
     kind: TrafficSplit
     metadata:
       name: my-split
@@ -291,14 +291,14 @@ For updating an application to a new version:
 
 ## Example implementation
 
-This example implementation is included to illustrate how the `Canary` object
-operates. It is not intended to prescribe a particular implementation.
+This example implementation is included to illustrate how the `TrafficSplit`
+object operates. It is not intended to prescribe a particular implementation.
 
-Assume a `Canary` object that looks like:
+Assume a `TrafficSplit` object that looks like:
 
 ```yaml
-    apiVersion: v1beta1
-    kind: Canary
+    apiVersion: split.smi-spec.io/v1alpha1
+    kind: TrafficSplit
     metadata:
       name: my-canary
     spec:
@@ -310,10 +310,10 @@ Assume a `Canary` object that looks like:
         weight: 900m
 ```
 
-When a new `Canary` object is created, it instantiates the following Kubernetes
+When a new `TrafficSplit` object is created, it instantiates the following Kubernetes
 objects:
 
-    * Service who's name is the same as `spec.service` in the Canary (`web`)
+    * Service who's name is the same as `spec.service` in the TrafficSplit (`web`)
     * A Deployment running `nginx` which has labels that match the Service
 
 The nginx layer serves as an HTTP(s) layer which implements the canary. In