Skip to content

Commit 299e35e

Browse files
authored
Cleanup unused/erroneous variables (kubernetes-sigs#6003)
1 parent 6674be2 commit 299e35e

File tree

8 files changed

+6
-51
lines changed

8 files changed

+6
-51
lines changed

docs/weave.md

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,6 @@ This mode is best to use on dynamic size cluster
7474

7575
The seed mode also allows multi-clouds and hybrid on-premise/cloud clusters deployment.
7676

77-
* Switch from consensus mode to seed mode
77+
* Switch from consensus mode to seed/Observation mode
7878

79-
```ShellSession
80-
# In file ./inventory/sample/group_vars/k8s-cluster.yml
81-
weave_mode_seed: true
82-
```
83-
84-
These two variables are only used when `weave_mode_seed` is set to `true` (**/!\ do not manually change these values**)
85-
86-
```ShellSession
87-
# In file ./inventory/sample/group_vars/k8s-cluster.yml
88-
weave_seed: uninitialized
89-
weave_peers: uninitialized
90-
```
91-
92-
The first variable, `weave_seed`, contains the initial nodes of the weave network
93-
94-
The second variable, `weave_peers`, saves the IPs of all nodes joined to the weave network
95-
96-
These two variables are used to connect a new node to the weave network. The new node needs to know the firsts nodes (seed) and the list of IPs of all nodes.
97-
98-
To reset these variables and reset the weave network set them to `uninitialized`
79+
See [weave ipam documentation](https://www.weave.works/docs/net/latest/tasks/ipam/ipam/) and use `weave_extra_args` to enable.

inventory/sample/group_vars/k8s-cluster/addons.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ ingress_publish_status_address: ""
107107
ingress_alb_enabled: false
108108
# alb_ingress_aws_region: "us-east-1"
109109
# alb_ingress_restrict_scheme: "false"
110-
# alb_ingress_log_level: "WARN"
111110
# Enables logging on all outbound requests sent to the AWS API.
112111
# If logging is desired, set to true.
113112
# alb_ingress_aws_debug: "false"

roles/bootstrap-os/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
---
22
## CentOS/RHEL specific variables
3-
# Install epel repo on Centos/RHEL
4-
centos_epel_enabled: false
53
# Use the fastestmirror yum plugin
64
centos_fastestmirror_enabled: false
75

roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ ca-file="{{ kube_config_dir }}/external-openstack-cacert.pem"
2020

2121
[LoadBalancer]
2222
use-octavia={{ external_openstack_lbaas_use_octavia }}
23-
create-monitor={{ openstack_lbaas_create_monitor }}
24-
monitor-delay={{ openstack_lbaas_monitor_delay }}
25-
monitor-timeout={{ openstack_lbaas_monitor_timeout }}
26-
monitor-max-retries={{ openstack_lbaas_monitor_max_retries }}
23+
create-monitor={{ external_openstack_lbaas_create_monitor }}
24+
monitor-delay={{ external_openstack_lbaas_monitor_delay }}
25+
monitor-timeout={{ external_openstack_lbaas_monitor_timeout }}
26+
monitor-max-retries={{ external_openstack_lbaas_monitor_max_retries }}
2727
{% if external_openstack_lbaas_method is defined %}
2828
lb-method={{ external_openstack_lbaas_method }}
2929
{% endif %}

roles/kubernetes-apps/ingress_controller/alb_ingress_controller/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ alb_ingress_aws_region: "us-east-1"
55
# Enables logging on all outbound requests sent to the AWS API.
66
# If logging is desired, set to true.
77
alb_ingress_aws_debug: "false"
8-
9-
alb_ingress_log_level: "WARN"

roles/kubespray-defaults/defaults/main.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -394,16 +394,6 @@ local_volume_provisioner_storage_classes: |
394394
# you can use --extra-vars to pass the password in command line
395395
weave_password: EnterPasswordHere
396396

397-
# Weave uses consensus mode by default
398-
# Enabling seed mode allow to dynamically add or remove hosts
399-
# https://www.weave.works/docs/net/latest/ipam/
400-
weave_mode_seed: false
401-
402-
# This two variable are automatically changed by the weave's role in group_vars/k8s-cluster.yml.
403-
# Do not manually change these values
404-
weave_seed: uninitialized
405-
weave_peers: uninitialized
406-
407397
# Contiv L3 BGP Mode
408398
contiv_peer_with_uplink_leaf: false
409399
contiv_global_as: "65002"

roles/network_plugin/calico/defaults/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ calico_node_memory_limit: 500M
2727
calico_node_cpu_limit: 300m
2828
calico_node_memory_requests: 64M
2929
calico_node_cpu_requests: 150m
30-
calicoctl_memory_limit: 170M
31-
calicoctl_cpu_limit: 100m
32-
calicoctl_memory_requests: 32M
33-
calicoctl_cpu_requests: 250m
3430
calico_felix_chaininsertmode: Insert
3531

3632
# Enable Prometheus Metrics endpoint for felix

roles/network_plugin/canal/defaults/main.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ canal_iface: ""
88
# the pod network.
99
canal_masquerade: "true"
1010

11-
# Log-level
12-
canal_log_level: "info"
13-
1411
# Etcd SSL dirs
1512
canal_cert_dir: /etc/canal/certs
1613

@@ -26,10 +23,6 @@ flannel_memory_limit: 500M
2623
flannel_cpu_limit: 200m
2724
flannel_memory_requests: 64M
2825
flannel_cpu_requests: 50m
29-
calicoctl_memory_limit: 170M
30-
calicoctl_cpu_limit: 100m
31-
calicoctl_memory_requests: 32M
32-
calicoctl_cpu_requests: 25m
3326

3427
# etcd cert filenames
3528
kube_etcd_cacert_file: ca.pem

0 commit comments

Comments
 (0)