openstack/openstack-helm-infra
Code Issues Proposed changes

[Calico] Update comment URL references

Browse Source 
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
This commit is contained in:
Chris Wedgwood 2019-01-03 17:26:42 +00:00
parent f0388b9adb
commit 016eba093c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calico/templates/bin/_calico-settings.sh.tpl
View File

@ -40,7 +40,7 @@ spec:
logSeverityScreen: {{ .Values.conf.node.FELIX_LOGSEVERITYSCREEN }} logSeverityScreen: {{ .Values.conf.node.FELIX_LOGSEVERITYSCREEN }}
EOF 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 $CTL apply -f - <<EOF
apiVersion: projectcalico.org/v3 apiVersion: projectcalico.org/v3
kind: IPPool kind: IPPool

12
calico/values.yaml
View File

@ -205,7 +205,7 @@ networking:
# our asnumber for bgp peering # our asnumber for bgp peering
asnumber: 64512 asnumber: 64512
ipv4: 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 # this is a list of peer objects that will be passed directly to
# calicoctl - for global peers, the scope should be global and # calicoctl - for global peers, the scope should be global and
@ -228,7 +228,7 @@ networking:
neighbor: 179 neighbor: 179
listen: 179 listen: 179
ipv6: 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 # this is a list of peer objects that will be passed directly to
# calicoctl - for global peers, the scope should be global and # 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 # might be we revisit that and embedded a json string that gets
# edits # edits
cni_network_config: 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 # other than the etcd_* keys you likely want to leave this as-is
name: k8s-pod-network name: k8s-pod-network
@ -437,7 +437,7 @@ conf:
# service for API access. # service for API access.
K8S_API: "https://kubernetes.default:443" K8S_API: "https://kubernetes.default:443"
# Choose which controllers to run, see # 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 # for an explanation of each
ENABLED_CONTROLLERS: "policy,namespace,serviceaccount,workloadendpoint,node" ENABLED_CONTROLLERS: "policy,namespace,serviceaccount,workloadendpoint,node"
# Since we're running in the host namespace and might not have KubeDNS # Since we're running in the host namespace and might not have KubeDNS
@ -447,7 +447,7 @@ conf:
node: node:
# for specific details see # 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 name: k8s-pod-network
# Cluster type to identify the deployment type # Cluster type to identify the deployment type
# NOTE: v2 had a list ... v3 a comma separated string # NOTE: v2 had a list ... v3 a comma separated string
@ -472,7 +472,7 @@ conf:
FELIX_DEFAULTENDPOINTTOHOSTACTION: "ACCEPT" FELIX_DEFAULTENDPOINTTOHOSTACTION: "ACCEPT"
# Configure the IP Pool from which Pod IPs will be chosen. # Configure the IP Pool from which Pod IPs will be chosen.
CALICO_IPV4POOL_CIDR: null 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 CALICO_IPV4POOL_BLOCKSIZE: 26
# Change this to 'off' in environments with direct L2 communication # Change this to 'off' in environments with direct L2 communication
# Titlecase # Titlecase