From c44fba1712aec679baea29d5fa335abe2a21c225 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Wed, 27 Sep 2017 17:43:26 -0700 Subject: [PATCH] Revert "Docs: Update for KDD Calico Policy Support" This reverts commit f26e4cd501423a61d29a75914b0435e394b66d3e. --- .../getting-started/kubernetes/tutorials/advanced-policy.md | 6 +++--- master/reference/calicoctl/resources/policy.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/master/getting-started/kubernetes/tutorials/advanced-policy.md b/master/getting-started/kubernetes/tutorials/advanced-policy.md index 9bab49f24a6..d6fe218042b 100644 --- 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 index 472921b4581..465db3e3b60 100644 --- 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.