Merge pull request #1 from cncf/master

Update

faq.md

@@ -16,7 +16,7 @@ that we have an official contact (or multiple contacts) if your software falls o
 
 ## How can I track issues that have been opened regarding certification?
 
-When a platform or distribution fails certification, the issue could be in the implementation or in the conformance
+When a product fails certification, the issue could be in the implementation or in the conformance
 tests. We use a [tracking issue](https://github.com/cncf/k8s-conformance/issues/27) to record issues with the
 tests.
 
@@ -31,14 +31,15 @@ simply by [running](instructions.md) the conformance tests on your private cloud
 implementation is conformant. It can't be certfied unless you complete the participation form, but certification
 (and the ability to use the Certified Kubernetes mark) is probably unnecessary for an internal-only product.
 
-## What is a distribution and what is a platform?
+## What is a distribution, hosted platform, and an installer?
 
 From the bottom of the Kubernetes Distributions & Platforms [spreadsheet](https://docs.google.com/spreadsheets/d/1LxSqBzjOxfGx3cmtZ4EbB_BGCxT_wlxW_xgHVVa23es/edit#gid=0):
 
-* A **vendor** is an organization providing a Kubernetes platform or distribution.
-* A **product** is a platform or distribution provided by a vendor.
-* A **platform** is a Kubernetes service provided and managed by a vendor.
-* A **distribution** is Kubernetes software that can be installed by an end user on to a public cloud or their own hardware.
+* A **vendor** is an organization providing a Kubernetes distribution, hosted platform, or installer.
+* A **product** is a distribution, hosted platform, or installer provided by a vendor.	
+* A **distribution** is software based on Kubernetes that can be installed by an end user on to a public cloud or bare metal and includes patches, additional software, or both.	
+* A **hosted** platform is a Kubernetes service provided and managed by a vendor.	
+* An **installer** downloads and then installs vanilla upstream Kubernetes.	
 
 ## What are the additional naming options for Certified Kubernetes?
 

instructions.md

@@ -55,7 +55,7 @@ This file describes your product. It is YAML formatted with the following root-l
 | `website_url`       | URL to the product information website |
 | `documentation_url` | URL to the product documentation |
 | `product_logo_url`  | URL to the product's logo, (must be in SVG, AI or EPS format and include the product name). OPTIONAL. If not supplied, we'll use your company logo. Please see logo [guidelines](https://github.com/cncf/landscape#logos) |
-| `type`              | Is your product a distribution or platform (see [definitions](https://github.com/cncf/k8s-conformance/blob/master/faq.md#what-is-a-distribution-and-what-is-a-platform)) |
+| `type`              | Is your product a distribution, hosted platform, or installer (see [definitions](https://github.com/cncf/k8s-conformance/blob/master/faq.md#what-is-a-distribution-and-what-is-a-platform)) |
 | `description` | One sentence description of your offering |
 
 Examples below are for a fictional Kubernetes implementation called _Turbo

sonobuoy-conformance.yaml

@@ -52,7 +52,7 @@ metadata:
 data:
   config.json: |
     {
-        "Description": "CNCF v1.8 or v1.9 Conformance Results",
+        "Description": "CNCF v1.9 or v.1.10 Conformance Results",
         "Filters": {
             "LabelSelector": "",
             "Namespaces": ".*"
@@ -102,7 +102,7 @@ data:
       - env:
         - name: E2E_FOCUS
           value: '\[Conformance\]'
-        image: gcr.io/heptio-images/kube-conformance:v1.9
+        image: gcr.io/heptio-images/kube-conformance:v1.10
         imagePullPolicy: Always
         name: e2e
         volumeMounts: