From 016eba093ccb53a7fabba3b549b428e5d96bf27b Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Thu, 3 Jan 2019 17:26:42 +0000
Subject: [PATCH] [Calico] Update comment URL references

Update the comment URL references to v3.4 to match the code; other
than ipPool (which was extended) the previous objects versions match
the current version.

Change-Id: I1dae92c99992e3a808bea2c270b9d6070274e9f6
---
 calico/templates/bin/_calico-settings.sh.tpl |  2 +-
 calico/values.yaml                           | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/calico/templates/bin/_calico-settings.sh.tpl b/calico/templates/bin/_calico-settings.sh.tpl
index 38714a68e..db8f3a6e2 100644
--- a/calico/templates/bin/_calico-settings.sh.tpl
+++ b/calico/templates/bin/_calico-settings.sh.tpl
@@ -40,7 +40,7 @@ spec:
   logSeverityScreen: {{ .Values.conf.node.FELIX_LOGSEVERITYSCREEN }}
 EOF
 
-# ipPool - https://docs.projectcalico.org/v3.3/reference/calicoctl/resources/ippool
+# ipPool - https://docs.projectcalico.org/v3.4/reference/calicoctl/resources/ippool
 $CTL apply -f - <<EOF
 apiVersion: projectcalico.org/v3
 kind: IPPool
diff --git a/calico/values.yaml b/calico/values.yaml
index 4e81cb08a..b73e58820 100644
--- a/calico/values.yaml
+++ b/calico/values.yaml
@@ -205,7 +205,7 @@ networking:
     # our asnumber for bgp peering
     asnumber: 64512
     ipv4:
-      # https://docs.projectcalico.org/v3.3/reference/calicoctl/resources/bgppeer
+      # https://docs.projectcalico.org/v3.4/reference/calicoctl/resources/bgppeer
       #
       # this is a list of peer objects that will be passed directly to
       # calicoctl - for global peers, the scope should be global and
@@ -228,7 +228,7 @@ networking:
         neighbor: 179
         listen: 179
     ipv6:
-      # https://docs.projectcalico.org/v3.3/reference/calicoctl/resources/bgppeer
+      # https://docs.projectcalico.org/v3.4/reference/calicoctl/resources/bgppeer
       #
       # this is a list of peer objects that will be passed directly to
       # calicoctl - for global peers, the scope should be global and
@@ -410,7 +410,7 @@ conf:
   # might be we revisit that and embedded a json string that gets
   # edits
   cni_network_config:
-    # https://docs.projectcalico.org/v3.3/reference/cni-plugin/configuration
+    # https://docs.projectcalico.org/v3.4/reference/cni-plugin/configuration
     #
     # other than the etcd_* keys you likely want to leave this as-is
     name: k8s-pod-network
@@ -437,7 +437,7 @@ conf:
     # service for API access.
     K8S_API: "https://kubernetes.default:443"
     # Choose which controllers to run, see
-    # https://docs.projectcalico.org//v3.3/reference/kube-controllers/configuration
+    # https://docs.projectcalico.org//v3.4/reference/kube-controllers/configuration
     # for an explanation of each
     ENABLED_CONTROLLERS: "policy,namespace,serviceaccount,workloadendpoint,node"
     # Since we're running in the host namespace and might not have KubeDNS
@@ -447,7 +447,7 @@ conf:
 
   node:
     # for specific details see
-    # https://docs.projectcalico.org/v3.3/reference/node/configuration
+    # https://docs.projectcalico.org/v3.4/reference/node/configuration
     name: k8s-pod-network
     # Cluster type to identify the deployment type
     # NOTE: v2 had a list ... v3 a comma separated string
@@ -472,7 +472,7 @@ conf:
     FELIX_DEFAULTENDPOINTTOHOSTACTION: "ACCEPT"
     # Configure the IP Pool from which Pod IPs will be chosen.
     CALICO_IPV4POOL_CIDR: null
-    # See https://docs.projectcalico.org/v3.3/reference/calicoctl/resources/ippool
+    # See https://docs.projectcalico.org/v3.4/reference/calicoctl/resources/ippool
     CALICO_IPV4POOL_BLOCKSIZE: 26
     # Change this to 'off' in environments with direct L2 communication
     # Titlecase