Skip to content

Commit

Permalink
installer/pkg/config/cluster.go: Default to Flannel
Browse files Browse the repository at this point in the history
We're having trouble accessing service IPs from pods with host network
namespaces, which was keeping the metrics API from coming up (I think
that's what the problem is ;) and eventually blocking namespace
deletion.  Defaulting to Flannel fixes that issue.
  • Loading branch information
wking committed Aug 23, 2018
1 parent faafe87 commit 59691f4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion examples/tectonic.aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ networking:
# - "calico-ipip": [ALPHA] enables BGP based networking. Routing and network policy is implemented by Calico. Note this has been tested on baremetal installations only.
#
# - "none": disables the installation of any Pod level networking layer provided by Tectonic. By setting this value, users are expected to deploy their own solution to enable network connectivity for Pods and Services.
# type: canal
# type: flannel

nodePools:
# The number of etcd nodes to be created.
Expand Down
3 changes: 1 addition & 2 deletions examples/tectonic.libvirt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ networking:
# - "calico-ipip": [ALPHA] enables BGP based networking. Routing and network policy is implemented by Calico. Note this has been tested on baremetal installations only.
#
# - "none": disables the installation of any Pod level networking layer provided by Tectonic. By setting this value, users are expected to deploy their own solution to enable network connectivity for Pods and Services.
type: canal
mtu: 1480
# type: flannel

nodePools:
# The number of etcd nodes to be created.
Expand Down
2 changes: 1 addition & 1 deletion installer/pkg/config/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ var defaultCluster = Cluster{
MTU: "1480",
PodCIDR: "10.2.0.0/16",
ServiceCIDR: "10.3.0.0/16",
Type: tectonicnetwork.NetworkCanal,
Type: tectonicnetwork.NetworkFlannel,
},
}

Expand Down
2 changes: 1 addition & 1 deletion tests/smoke/aws/vars/aws-basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ master:
- master
name: aws-basic
networking:
type: canal
type: flannel
nodePools:
- count: 3
name: etcd
Expand Down

0 comments on commit 59691f4

Please sign in to comment.