Skip to content

Commit 20ef74c

Browse files
authored
Merge pull request aws-samples#280 from chrislovecnm/update-kops-docs
Updates for kops 1.8.0 and wordsmithing
2 parents 4aa322a + 913d218 commit 20ef74c

File tree

2 files changed

+59
-84
lines changed

2 files changed

+59
-84
lines changed

calico/readme.adoc

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ View the cluster configuration using the following command:
2828
This will show the following fragment under `.spec`:
2929

3030
networking:
31-
calico: {}
31+
calico: {
32+
crossSubnet: true
33+
}
3234

3335
Rest of the chapter goes with the presumption that you are using an existing cluster.
3436

@@ -279,34 +281,6 @@ test 100% |*****************************************************
279281
```
280282
HTTP POST request succeeds.
281283

282-
=== Update calico to 2.4.1 in kops 1.7.x
283-
kops 1.7.x comes with calico 1.2.1 out-of-the-box which does not support the latest network-policy updates for kubernetes 1.7.
284-
In order to make this work, we need to update calico via:
285-
286-
```
287-
$ kubectl apply -f templates/calico-update.yaml
288-
configmap "calico-config" configured
289-
clusterrole "calico" configured
290-
serviceaccount "calico" configured
291-
clusterrolebinding "calico" configured
292-
daemonset "calico-node" configured
293-
deployment "calico-policy-controller" configured
294-
clusterrole "k8s-ec2-srcdst" configured
295-
serviceaccount "k8s-ec2-srcdst" configured
296-
clusterrolebinding "k8s-ec2-srcdst" configured
297-
deployment "k8s-ec2-srcdst" created
298-
```
299-
300-
After this, wait for the calico pods to be updated via:
301-
```
302-
$ kubectl rollout status ds/calico-node -n kube-system
303-
Waiting for rollout to finish: 0 out of 3 new pods have been updated...
304-
Waiting for rollout to finish: 1 out of 3 new pods have been updated...
305-
Waiting for rollout to finish: 2 out of 3 new pods have been updated...
306-
Waiting for rollout to finish: 2 of 3 updated pods are available...
307-
daemon set "calico-node" successfully rolled out
308-
```
309-
310284
=== Create default network policy
311285

312286
Let's now create a Network Policy, but we will not configure any rules which by default will deny all traffic within the namespace. Leaving the 2 shells open from the previous steps, run the following in another shell, say `shell 3`:

0 commit comments

Comments
 (0)