Browse Source
Remove calico-upgrade leftovers (#7282)
This is dead code since 28073c76ac
Signed-off-by: Etienne Champetier <e.champetier@ateme.com>
pull/7292/head
Etienne Champetier
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
1 additions and
35 deletions
-
roles/kubernetes-apps/network_plugin/calico/tasks/main.yml
-
roles/kubespray-defaults/defaults/main.yaml
-
roles/network_plugin/calico/defaults/main.yml
-
roles/network_plugin/calico/templates/etcdv2-store.yml.j2
-
roles/network_plugin/calico/templates/etcdv3-store.yml.j2
|
|
@ -1,7 +1,2 @@ |
|
|
|
--- |
|
|
|
- name: "calico upgrade complete" |
|
|
|
command: "{{ bin_dir }}/calico-upgrade complete --no-prompts --apiconfigv1 /etc/calico/etcdv2.yml --apiconfigv3 /etc/calico/etcdv3.yml" |
|
|
|
when: |
|
|
|
- inventory_hostname == groups['kube-master'][0] |
|
|
|
- calico_upgrade_enabled|default(True) |
|
|
|
- calico_upgrade_needed|default(False) |
|
|
|
# TODO: Handle Calico etcd -> kdd migration |
|
|
@ -150,9 +150,6 @@ kube_network_plugin_multus: false |
|
|
|
# Determines if calico-rr group exists |
|
|
|
peer_with_calico_rr: "{{ 'calico-rr' in groups and groups['calico-rr']|length > 0 }}" |
|
|
|
|
|
|
|
# Set to false to disable calico-upgrade |
|
|
|
calico_upgrade_enabled: true |
|
|
|
|
|
|
|
# Choose data store type for calico: "etcd" or "kdd" (kubernetes datastore) |
|
|
|
calico_datastore: "kdd" |
|
|
|
|
|
|
|
|
|
@ -48,11 +48,6 @@ calico_felix_prometheusmetricsport: 9091 |
|
|
|
calico_felix_prometheusgometricsenabled: true |
|
|
|
calico_felix_prometheusprocessmetricsenabled: true |
|
|
|
|
|
|
|
### check latest version https://github.com/projectcalico/calico-upgrade/releases |
|
|
|
calico_upgrade_enabled: true |
|
|
|
calico_upgrade_version: v1.0.5 |
|
|
|
calico_upgrade_url: "https://github.com/projectcalico/calico-upgrade/releases/download/{{ calico_upgrade_version }}/calico-upgrade" |
|
|
|
|
|
|
|
# Set the agent log level. Can be debug, warning, info or fatal |
|
|
|
calico_loglevel: info |
|
|
|
|
|
|
@ -80,9 +75,6 @@ calico_iptables_backend: "Legacy" |
|
|
|
|
|
|
|
calico_baremetal_nodename: "{{ kube_override_hostname | default(inventory_hostname) }}" |
|
|
|
|
|
|
|
### do not enable this, this is detected in scope of tasks, this is just a default value |
|
|
|
calico_upgrade_needed: false |
|
|
|
|
|
|
|
kube_etcd_cacert_file: ca.pem |
|
|
|
kube_etcd_cert_file: node-{{ inventory_hostname }}.pem |
|
|
|
kube_etcd_key_file: node-{{ inventory_hostname }}-key.pem |
|
|
|
|
|
@ -1,9 +0,0 @@ |
|
|
|
apiVersion: v1 |
|
|
|
kind: calicoApiConfig |
|
|
|
metadata: |
|
|
|
spec: |
|
|
|
datastoreType: "etcdv2" |
|
|
|
etcdEndpoints: "{{ etcd_access_addresses }}" |
|
|
|
etcdKeyFile: "{{ etcd_cert_dir }}/{{ kube_etcd_key_file }}" |
|
|
|
etcdCertFile: "{{ etcd_cert_dir }}/{{ kube_etcd_cert_file }}" |
|
|
|
etcdCACertFile: "{{ etcd_cert_dir }}/{{ kube_etcd_cacert_file }}" |
|
|
@ -1,9 +0,0 @@ |
|
|
|
apiVersion: projectcalico.org/v3 |
|
|
|
kind: CalicoAPIConfig |
|
|
|
metadata: |
|
|
|
spec: |
|
|
|
datastoreType: "etcdv3" |
|
|
|
etcdEndpoints: "{{ etcd_access_addresses }}" |
|
|
|
etcdKeyFile: "{{ etcd_cert_dir }}/{{ kube_etcd_key_file }}" |
|
|
|
etcdCertFile: "{{ etcd_cert_dir }}/{{ kube_etcd_cert_file }}" |
|
|
|
etcdCACertFile: "{{ etcd_cert_dir }}/{{ kube_etcd_cacert_file }}" |