Feature flags for calico with CRDs and optionally typha #683

JoshVanL · 2019-01-16T17:53:31Z

fixes #435

Add Kubernetes API server as optional backend, as well as enabling Typha for Calico

/assign

JoshVanL · 2019-01-18T10:12:17Z

/unassign
/assign @simonswine

simonswine

Apart from this extra type for backend, I am happy

/assign @JoshVanL
/unassign

simonswine · 2019-01-29T14:10:34Z

pkg/apis/cluster/v1alpha1/cluster.go

@@ -228,6 +229,12 @@ type ClusterKubernetesControllerManager struct {
 	FeatureGates map[string]bool `json:"featureGates,omitempty"`
 }

+type ClusterKubernetesCalico struct {
+	Backend       string `json:"backend"`


This should be it's own type

type ClusterKubernetesCalcioBackend string

simonswine · 2019-01-29T14:10:54Z

pkg/apis/cluster/v1alpha1/defaults.go

@@ -71,6 +71,22 @@ func SetDefaults_Cluster(obj *Cluster) {
 		obj.Kubernetes.Dashboard = &ClusterKubernetesDashboard{}
 	}

+	if obj.Kubernetes.Calico == nil {
+		obj.Kubernetes.Calico = &ClusterKubernetesCalico{
+			Backend:     "etcd",


can we define a const instead?

simonswine · 2019-01-29T14:11:51Z

pkg/tarmak/cluster/cluster.go

@@ -589,6 +598,35 @@ func (c *Cluster) validatePrometheusMode() error {
 	return result
 }

+func (c *Cluster) validateCalico() error {
+	var result *multierror.Error
+	backends := []string{"etcd", "kubernetes"}


Get it from constants

simonswine · 2019-01-29T14:40:26Z

puppet/modules/calico/templates/node-daemonset_kubernetes.yaml.erb

@@ -0,0 +1,179 @@
+---


Why are you not using the other file and just template out some parts?

simonswine · 2019-01-29T14:40:54Z

puppet/modules/calico/templates/node-daemonset_kubernetes.yaml.erb

+            # chosen from this range. Changing this value after installation will have
+            # no effect. This should fall within `--cluster-cidr`.
+            - name: CALICO_IPV4POOL_CIDR
+              value: "192.168.0.0/16"


# Configure the IP Pool from which Pod IPs will be chosen. - name: CALICO_IPV4POOL_CIDR value: "<%= @ipv4_pool_cidr %>"`

Once you enable it right now this break cross AZ connectivity

simonswine · 2019-01-29T14:41:29Z

puppet/modules/calico/templates/node-daemonset_kubernetes.yaml.erb

+              value: "192.168.0.0/16"
+            # Enable IPIP
+            - name: CALICO_IPV4POOL_IPIP
+              value: "Always"


- name: CALICO_IPV4POOL_IPIP value: "<%= @ipv4_pool_ipip_mode %>"

JoshVanL · 2019-01-31T13:34:50Z

/unassign
/assign @simonswine

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Improve Calico backend API types Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Signed-off-by: Christian Simon <simon@swine.de>

Correct handling for our addon-manager check Signed-off-by: Christian Simon <simon@swine.de>

Signed-off-by: Christian Simon <simon@swine.de>

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

JoshVanL · 2019-02-07T10:40:05Z

/unassign
/assign @simonswine

simonswine · 2019-02-07T16:39:59Z

Thanks this looks good

/approve
/lgtm

jetstack-bot · 2019-02-07T16:40:11Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoshVanL, simonswine

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [JoshVanL,simonswine]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

jetstack-bot assigned JoshVanL Jan 16, 2019

jetstack-bot requested review from alljames and simonswine January 16, 2019 17:53

JoshVanL force-pushed the 435-calico-kubernetes-backend branch 2 times, most recently from 0b8ffa6 to de5ebed Compare January 17, 2019 16:01

jetstack-bot assigned simonswine and unassigned JoshVanL Jan 18, 2019

JoshVanL changed the title ~~WIP: Feature flags for calico with CRDs and eventually typha~~ Feature flags for calico with CRDs and eventually typha Jan 18, 2019

jetstack-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 18, 2019

JoshVanL changed the title ~~Feature flags for calico with CRDs and eventually typha~~ Feature flags for calico with CRDs and optionally typha Jan 18, 2019

simonswine suggested changes Jan 29, 2019

View reviewed changes

jetstack-bot assigned JoshVanL and unassigned simonswine Jan 29, 2019

jetstack-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 29, 2019

simonswine reviewed Jan 29, 2019

View reviewed changes

JoshVanL force-pushed the 435-calico-kubernetes-backend branch 2 times, most recently from a3f3427 to e6de841 Compare January 31, 2019 11:57

jetstack-bot unassigned JoshVanL Jan 31, 2019

jetstack-bot assigned JoshVanL and unassigned simonswine Feb 6, 2019

jetstack-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 7, 2019

JoshVanL force-pushed the 435-calico-kubernetes-backend branch from 7af8360 to 34a3ebe Compare February 7, 2019 09:51

jetstack-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 7, 2019

JoshVanL force-pushed the 435-calico-kubernetes-backend branch 2 times, most recently from c1f511d to efb40e9 Compare February 7, 2019 10:26

JoshVanL and others added 14 commits February 7, 2019 10:39

Adds kubernetes as an optional backend for calico

23dae59

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Correctly configure calico for kubernetes backend

3b9b12a

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Adds labels to calico resources and removes feature gates

497648d

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Adds typha option to calico kubernetes backend

b0cdcec

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Remove problem parameter

55b8e3b

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Adds calico puppet modules tests for kubernetes backend

09c23ca

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Adds docs on how to configure calico

4178492

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Use same daemonset yaml with templating for calico backends

d43664b

Improve Calico backend API types Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Fix function to verify yaml

c28080b

Signed-off-by: Christian Simon <simon@swine.de>

Migrate from lists to split YAMLs

c80777c

Correct handling for our addon-manager check Signed-off-by: Christian Simon <simon@swine.de>

Metrics-server manifests comply with the label check

c7652e0

Signed-off-by: Christian Simon <simon@swine.de>

Use a wrong manifest but valid YAML

8b1c2dd

Signed-off-by: Christian Simon <simon@swine.de>

Remove separator after comments in yaml

ff780c0

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Use ipipMode: CrossSubnet for kubernetes backend calico

bcba5ce

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

JoshVanL force-pushed the 435-calico-kubernetes-backend branch from efb40e9 to bcba5ce Compare February 7, 2019 10:39

jetstack-bot assigned simonswine and unassigned JoshVanL Feb 7, 2019

simonswine approved these changes Feb 7, 2019

View reviewed changes

jetstack-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2019

jetstack-bot merged commit 7cc8622 into jetstack:master Feb 7, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature flags for calico with CRDs and optionally typha #683

Feature flags for calico with CRDs and optionally typha #683

JoshVanL commented Jan 16, 2019

JoshVanL commented Jan 18, 2019

simonswine left a comment

simonswine Jan 29, 2019

simonswine Jan 29, 2019

simonswine Jan 29, 2019

simonswine Jan 29, 2019

simonswine Jan 29, 2019

simonswine Jan 29, 2019

simonswine Jan 29, 2019

JoshVanL commented Jan 31, 2019

JoshVanL commented Feb 7, 2019

simonswine commented Feb 7, 2019

jetstack-bot commented Feb 7, 2019

Feature flags for calico with CRDs and optionally typha #683

Feature flags for calico with CRDs and optionally typha #683

Conversation

JoshVanL commented Jan 16, 2019

JoshVanL commented Jan 18, 2019

simonswine left a comment

Choose a reason for hiding this comment

simonswine Jan 29, 2019

Choose a reason for hiding this comment

simonswine Jan 29, 2019

Choose a reason for hiding this comment

simonswine Jan 29, 2019

Choose a reason for hiding this comment

simonswine Jan 29, 2019

Choose a reason for hiding this comment

simonswine Jan 29, 2019

Choose a reason for hiding this comment

simonswine Jan 29, 2019

Choose a reason for hiding this comment

simonswine Jan 29, 2019

Choose a reason for hiding this comment

JoshVanL commented Jan 31, 2019

JoshVanL commented Feb 7, 2019

simonswine commented Feb 7, 2019

jetstack-bot commented Feb 7, 2019