Merge pull request #1147 from caseydavenport/revert-kdd-calicoctl

Revert "Docs: Update for KDD Calico Policy Support"
projectcalico · Sep 28, 2017 · 4f05d90 · 4f05d90
2 parents 9b55022 + c44fba1
commit 4f05d90
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/master/getting-started/kubernetes/tutorials/advanced-policy.md b/master/getting-started/kubernetes/tutorials/advanced-policy.md
@@ -16,9 +16,9 @@ in order to define more complex network policies.
 - This guide assumes you have a working Kubernetes cluster with Calico for policy. (See: [installation]({{site.baseurl}}/{{page.version}}/getting-started/kubernetes/installation) for help)
 - This guide assumes that your pods have connectivity to the public internet.
 - This guide assumes you are familiar with [Kubernetes NetworkPolicy](simple-policy)
+- This guide assumes you are using etcdv2 (or v3) as the Calico backend datastore.
 - You must have configured kubectl access to the cluster.
-- You must have installed and [configured the calicoctl tool]({{site.baseurl}}/{{page.version}}/reference/calicoctl/setup)
-  to access the appropriate Calico backend datastore: [etcdv2 (or v3)]({{site.baseurl}}/{{page.version}}/reference/calicoctl/setup/etcdv2) or [Kubernetes API]({{site.baseurl}}/{{page.version}}/reference/calicoctl/setup/kubernetes)
+- You must have installed and [configured the calicoctl tool]({{site.baseurl}}/{{page.version}}/reference/calicoctl/setup/etcdv2)
 
 ### Setup
 
@@ -56,7 +56,7 @@ kubectl expose --namespace=advanced-policy-demo deployment nginx --port=80
 
 #### Check using calicoctl
 
-> **Note**: This requires the [calicoctl tool to be configured]({{site.baseurl}}/{{page.version}}/reference/calicoctl/setup).
+> **Note**: This requires the [calicoctl tool to be configured]({{site.baseurl}}/{{page.version}}/reference/calicoctl/setup/etcdv2).
 > For example: `export ETCD_ENDPOINTS=http://10.96.232.136:6666`.
 {: .alert .alert-info}
 

diff --git a/master/reference/calicoctl/resources/policy.md b/master/reference/calicoctl/resources/policy.md
@@ -131,4 +131,4 @@ applied action is deny.
 | Datastore type        | Create/Delete | Update | Get/List | Notes
 |-----------------------|---------------|--------|----------|------
 | etcdv2                | Yes           | Yes    | Yes      |
-| Kubernetes API server | Yes           | Yes    | Yes      |
+| Kubernetes API server | No            | No     | Yes      | Policy is determined from Kubernetes NetworkPolicy resources.