Calico v3 uplift and manifest fixes
Change-Id: Id189e74009c73ac10f9d920602dcdaee7b132bad
This commit is contained in:
Kaspars Skels
parent
908db10033
commit
c717602962
|
|
@ -42,7 +42,7 @@ metadata:
|
|||
name: common-addresses
|
||||
path: .kubernetes.api_service_ip
|
||||
dest:
|
||||
path: .values.conf.policy_controller.K8S_API
|
||||
path: .values.conf.controllers.K8S_API
|
||||
pattern: SUB_KUBERNETES_IP
|
||||
|
||||
# Other site-specific configuration
|
||||
|
|
@ -94,29 +94,34 @@ data:
|
|||
conf:
|
||||
cni_network_config:
|
||||
name: k8s-pod-network
|
||||
cniVersion: 0.1.0
|
||||
type: calico
|
||||
cniVersion: 0.3.0
|
||||
plugins:
|
||||
- type: calico
|
||||
etcd_endpoints: __ETCD_ENDPOINTS__
|
||||
etcd_ca_cert_file: /etc/calico/pki/ca
|
||||
etcd_cert_file: /etc/calico/pki/crt
|
||||
etcd_key_file: /etc/calico/pki/key
|
||||
log_level: info
|
||||
mtu: 1500
|
||||
ipam:
|
||||
type: calico-ipam
|
||||
policy:
|
||||
type: k8s
|
||||
k8s_api_root: https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__
|
||||
k8s_auth_token: __SERVICEACCOUNT_TOKEN__
|
||||
kubernetes:
|
||||
kubeconfig: __KUBECONFIG_FILEPATH__
|
||||
- type: portmap
|
||||
snat: true
|
||||
capabilities:
|
||||
portMappings: true
|
||||
|
||||
policy_controller:
|
||||
controllers:
|
||||
K8S_API: "https://SUB_KUBERNETES_IP:443"
|
||||
|
||||
node:
|
||||
CALICO_STARTUP_LOGLEVEL: INFO
|
||||
CLUSTER_TYPE:
|
||||
- k8s
|
||||
- bgp
|
||||
CLUSTER_TYPE: "k8s,bgp"
|
||||
ETCD_CA_CERT_FILE: /etc/calico/pki/ca
|
||||
ETCD_CERT_FILE: /etc/calico/pki/crt
|
||||
ETCD_KEY_FILE: /etc/calico/pki/key
|
||||
WAIT_FOR_STORAGE: "true"
|
||||
|
||||
endpoints:
|
||||
|
|
@ -133,7 +138,7 @@ data:
|
|||
ippool:
|
||||
ipip:
|
||||
enabled: "true"
|
||||
mode: "always"
|
||||
mode: "Always"
|
||||
nat_outgoing: "true"
|
||||
disabled: "false"
|
||||
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@ data:
|
|||
calico:
|
||||
calico:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
|
||||
reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
|
||||
subpath: calico
|
||||
type: git
|
||||
calico-htk:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
|
||||
reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
|
||||
subpath: helm-toolkit
|
||||
type: git
|
||||
etcd:
|
||||
|
|
@ -398,7 +398,7 @@ data:
|
|||
type: git
|
||||
shipyard:
|
||||
location: https://git.openstack.org/openstack/airship-shipyard
|
||||
reference: 0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
|
||||
reference: 124de57262b3f0e60720ce377424d3be99f46f61
|
||||
subpath: charts/shipyard
|
||||
type: git
|
||||
shipyard-htk:
|
||||
|
|
@ -421,14 +421,11 @@ data:
|
|||
images:
|
||||
calico:
|
||||
calico:
|
||||
calico_cni: quay.io/calico/cni:v1.11.5
|
||||
calico_ctl: quay.io/calico/ctl:v1.6.4
|
||||
calico_etcd: quay.io/coreos/etcd:v3.2.14
|
||||
calico_kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0
|
||||
calico_node: quay.io/calico/node:v2.6.9
|
||||
calico_settings: quay.io/calico/ctl:v1.6.4
|
||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||
image_repo_sync: docker.io/docker:17.07.0
|
||||
calico_cni: quay.io/calico/cni:v3.2.1
|
||||
calico_ctl: calico/ctl:release-v3.2-amd64
|
||||
calico_kube_controllers: quay.io/calico/kube-controllers:v3.2.1
|
||||
calico_node: quay.io/calico/node:v3.2.1
|
||||
calico_settings: calico/ctl:release-v3.2-amd64
|
||||
etcd:
|
||||
etcd: quay.io/coreos/etcd:v3.2.14
|
||||
etcdctl: quay.io/coreos/etcd:v3.2.14
|
||||
|
|
@ -818,17 +815,17 @@ data:
|
|||
rabbitmq: docker.io/rabbitmq:3.7.4
|
||||
scripted_test: docker.io/rabbitmq:3.7-management
|
||||
shipyard:
|
||||
airflow: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
|
||||
airflow: quay.io/airshipit/airflow:124de57262b3f0e60720ce377424d3be99f46f61
|
||||
airflow_db_init: docker.io/postgres:9.5
|
||||
airflow_db_sync: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
|
||||
airflow_db_sync: quay.io/airshipit/airflow:124de57262b3f0e60720ce377424d3be99f46f61
|
||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||
image_repo_sync: docker.io/docker:17.07.0
|
||||
ks_endpoints: docker.io/openstackhelm/heat:ocata
|
||||
ks_service: docker.io/openstackhelm/heat:ocata
|
||||
ks_user: docker.io/openstackhelm/heat:ocata
|
||||
shipyard: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
|
||||
shipyard: quay.io/airshipit/shipyard:124de57262b3f0e60720ce377424d3be99f46f61
|
||||
shipyard_db_init: docker.io/postgres:9.5
|
||||
shipyard_db_sync: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
|
||||
shipyard_db_sync: quay.io/airshipit/shipyard:124de57262b3f0e60720ce377424d3be99f46f61
|
||||
tiller:
|
||||
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
|
||||
images_refs:
|
||||
|
|
|
|||
|
|
@ -132,8 +132,8 @@ data:
|
|||
# NEWSITE-CHANGEME: Update to the second half of the remaining range after
|
||||
# excluding the 10 reserved IPs.
|
||||
- type: dhcp
|
||||
start: 10.23.20.121
|
||||
end: 10.23.20.131
|
||||
start: 10.23.20.40
|
||||
end: 10.23.20.80
|
||||
dns:
|
||||
# NEWSITE-CHANGEME: FQDN for bare metal nodes.
|
||||
# Choose FQDN according to the node FQDN naming conventions at the top of
|
||||
|
|
|
|||
Loading…
Reference in New Issue