Merge pull request #65022 from jingax10/calico_addon_branch

Automatic merge from submit-queue (batch tested with PRs 64140, 64898, 65022, 65037, 65027). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update Calico addon yamls to make it work for both 2.x and 3.x. versions. **What this PR does / why we need it**: Without this PR, one could not run Calico 3.0+. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #65045 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #65022 from jingax10/calico_addon_branch
ec518c5f · Kubernetes Submit Queue · GitHub · 5cb2fef4 · b365408e · ec518c5f
Unverified Commit ec518c5f authored Jun 21, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 21, 2018
11 changed files
--- a/cluster/addons/calico-policy-controller/calico-clusterrole.yaml
+++ b/cluster/addons/calico-policy-controller/calico-clusterrole.yaml
@@ -36,6 +36,7 @@ rules:
      - get
      - list
      - watch
+      - patch
  - apiGroups: [""]
    resources:
      - nodes
@@ -51,17 +52,28 @@ rules:
      - get
      - list
      - watch
+  - apiGroups: ["networking.k8s.io"]
+    resources:
+      - networkpolicies
+    verbs:
+      - watch
+      - list
  - apiGroups: ["crd.projectcalico.org"]
    resources:
      - globalfelixconfigs
+      - felixconfigurations
+      - bgppeers
      - globalbgpconfigs
+      - bgpconfigurations
      - ippools
      - globalnetworkpolicies
+      - globalnetworksets
+      - networkpolicies
+      - clusterinformations
+      - hostendpoints
    verbs:
      - create
      - get
      - list
      - update
-      - patch
-      - delete
      - watch
--- a/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml
+++ b/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml
@@ -41,18 +41,22 @@ spec:
              value: "none"
            - name: DATASTORE_TYPE
              value: "kubernetes"
-            - name: FELIX_TYPHAK8SSERVICENAME
-              value: "calico-typha"
            - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
              value: "ACCEPT"
+            - name: FELIX_HEALTHENABLED
+              value: "true"
            - name: FELIX_IPV6SUPPORT
              value: "false"
            - name: FELIX_LOGSEVERITYSYS
              value: "none"
+            - name: FELIX_LOGSEVERITYSCREEN
+              value: "info"
            - name: FELIX_PROMETHEUSMETRICSENABLED
              value: "true"
-            - name: FELIX_HEALTHENABLED
-              value: "true"
+            - name: FELIX_REPORTINGINTERVALSECS
+              value: "0"
+            - name: FELIX_TYPHAK8SSERVICENAME
+              value: "calico-typha"
            - name: IP
              value: ""
            - name: NO_DEFAULT_POOLS
@@ -84,6 +88,12 @@ spec:
            - mountPath: /etc/calico
              name: etc-calico
              readOnly: true
+            - mountPath: /var/run/calico
+              name: var-run-calico
+              readOnly: false
+            - mountPath: /var/lib/calico
+              name: var-lib-calico
+              readOnly: false
        # This container installs the Calico CNI binaries
        # and CNI network config file on each node.
        - name: install-cni
@@ -149,6 +159,12 @@ spec:
        - name: cni-net-dir
          hostPath:
            path: /etc/cni/net.d
+        - name: var-run-calico
+          hostPath:
+            path: /var/run/calico
+        - name: var-lib-calico
+          hostPath:
+            path: /var/lib/calico
      tolerations:
        # Make sure calico/node gets scheduled on all nodes.
        - effect: NoSchedule

--- a/cluster/addons/calico-policy-controller/clusterinformations-crd.yaml
+++ b/cluster/addons/calico-policy-controller/clusterinformations-crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterinformations.crd.projectcalico.org
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
+spec:
+  scope: Cluster
+  group: crd.projectcalico.org
+  version: v1
+  names:
+    kind: ClusterInformation
+    plural: clusterinformations
+    singular: clusterinformation
--- a/cluster/addons/calico-policy-controller/felixconfigurations-crd.yaml
+++ b/cluster/addons/calico-policy-controller/felixconfigurations-crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: felixconfigurations.crd.projectcalico.org
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
+spec:
+  scope: Cluster
+  group: crd.projectcalico.org
+  version: v1
+  names:
+    kind: FelixConfiguration
+    plural: felixconfigurations
+    singular: felixconfiguration
--- a/cluster/addons/calico-policy-controller/globalnetworksets-crd.yaml
+++ b/cluster/addons/calico-policy-controller/globalnetworksets-crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: globalnetworksets.crd.projectcalico.org
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
+spec:
+  scope: Cluster
+  group: crd.projectcalico.org
+  version: v1
+  names:
+    kind: GlobalNetworkSet
+    plural: globalnetworksets
+    singular: globalnetworkset
--- a/cluster/addons/calico-policy-controller/hostendpoints-crd.yaml
+++ b/cluster/addons/calico-policy-controller/hostendpoints-crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: hostendpoints.crd.projectcalico.org
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
+spec:
+  scope: Cluster
+  group: crd.projectcalico.org
+  version: v1
+  names:
+    kind: HostEndpoint
+    plural: hostendpoints
+    singular: hostendpoint
--- a/cluster/addons/calico-policy-controller/networkpolicies-crd.yaml
+++ b/cluster/addons/calico-policy-controller/networkpolicies-crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: networkpolicies.crd.projectcalico.org
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
+spec:
+  scope: Namespaced
+  group: crd.projectcalico.org
+  version: v1
+  names:
+    kind: NetworkPolicy
+    plural: networkpolicies
+    singular: networkpolicy
--- a/cluster/addons/calico-policy-controller/typha-deployment.yaml
+++ b/cluster/addons/calico-policy-controller/typha-deployment.yaml
@@ -44,6 +44,8 @@ spec:
            value: "9093"
          - name: TYPHA_DATASTORETYPE
            value: "kubernetes"
+          - name: TYPHA_REPORTINGINTERVALSECS
+            value: "0"
          - name: TYPHA_MAXCONNECTIONSLOWERLIMIT
            value: "1"
          - name: TYPHA_HEALTHENABLED

--- a/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrole.yaml
+++ b/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrole.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: typha-cpva
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
+rules:
+  - apiGroups: [""]
+    resources: ["nodes"]
+    verbs: ["list"]
+  - apiGroups: ["apps", "extensions"]
+    resources: ["deployments"]
+    verbs: ["patch"]
--- a/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrolebinding.yaml
+++ b/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrolebinding.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: typha-cpva
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: typha-cpva
+subjects:
+  - kind: ServiceAccount
+    name: typha-cpva
+    namespace: kube-system
--- a/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-serviceaccount.yaml
+++ b/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: typha-cpva
+  namespace: kube-system
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile