Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,8 @@ spec: | |
| # if it ever gets evicted. | ||
| scheduler.alpha.kubernetes.io/critical-pod: '' | ||
| spec: | ||
| nodeSelector: | ||
| beta.kubernetes.io/os: linux | ||
| hostNetwork: true | ||
| serviceAccountName: calico-node | ||
| # Minimize downtime during a rolling upgrade or deletion; tell Kubernetes to do a "force | ||
|
|
@@ -35,7 +37,7 @@ spec: | |
| # container programs network policy and routes on each | ||
| # host. | ||
| - name: calico-node | ||
| image: quay.io/calico/node:v3.3.5 | ||
| env: | ||
| # Use Kubernetes API as the backing datastore. | ||
| - name: DATASTORE_TYPE | ||
|
|
@@ -60,10 +62,6 @@ spec: | |
| # Set Felix endpoint to host default action to ACCEPT. | ||
| - name: FELIX_DEFAULTENDPOINTTOHOSTACTION | ||
| value: "ACCEPT" | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
kashook
|
||
| # Disable IPV6 on Kubernetes. | ||
| - name: FELIX_IPV6SUPPORT | ||
| value: "false" | ||
|
|
@@ -97,14 +95,18 @@ spec: | |
| initialDelaySeconds: 10 | ||
| failureThreshold: 6 | ||
| readinessProbe: | ||
| exec: | ||
| command: | ||
| - /bin/calico-node | ||
| - -felix-ready | ||
| periodSeconds: 10 | ||
| volumeMounts: | ||
| - mountPath: /lib/modules | ||
| name: lib-modules | ||
| readOnly: true | ||
| - mountPath: /run/xtables.lock | ||
| name: xtables-lock | ||
| readOnly: false | ||
| - mountPath: /var/run/calico | ||
| name: var-run-calico | ||
| readOnly: false | ||
|
|
@@ -116,9 +118,13 @@ spec: | |
| - name: var-run-calico | ||
| hostPath: | ||
| path: /var/run/calico | ||
| - name: xtables-lock | ||
| hostPath: | ||
| path: /run/xtables.lock | ||
| type: FileOrCreate | ||
| tolerations: | ||
| # Make sure calico/node gets scheduled on all nodes. | ||
| - operator: Exists | ||
|
|
||
| --- | ||
|
|
||
|
|
@@ -128,7 +134,7 @@ spec: | |
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: felixconfigurations.crd.projectcalico.org | ||
| spec: | ||
| scope: Cluster | ||
| group: crd.projectcalico.org | ||
|
|
@@ -263,6 +269,7 @@ rules: | |
| - apiGroups: [""] | ||
| resources: | ||
| - namespaces | ||
| - serviceaccounts | ||
| verbs: | ||
| - get | ||
| - list | ||
|
|
@@ -271,15 +278,14 @@ rules: | |
| resources: | ||
| - pods/status | ||
| verbs: | ||
| - patch | ||
| - apiGroups: [""] | ||
| resources: | ||
| - pods | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: [""] | ||
| resources: | ||
| - services | ||
|
|
@@ -342,9 +348,9 @@ roleRef: | |
| kind: ClusterRole | ||
| name: calico-node | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: calico-node | ||
| namespace: kube-system | ||
|
|
||
| --- | ||
|
|
||
|
|
@@ -363,67 +369,85 @@ spec: | |
| k8s-app: calico-typha | ||
| annotations: | ||
| scheduler.alpha.kubernetes.io/critical-pod: '' | ||
| cluster-autoscaler.kuberentes.io/safe-to-evict: 'true' | ||
| spec: | ||
| nodeSelector: | ||
| beta.kubernetes.io/os: linux | ||
| tolerations: | ||
| - operator: Exists | ||
| hostNetwork: true | ||
| serviceAccountName: calico-node | ||
| containers: | ||
| - image: quay.io/calico/typha:v3.3.5 | ||
| name: calico-typha | ||
| ports: | ||
| - containerPort: 5473 | ||
| name: calico-typha | ||
| protocol: TCP | ||
| env: | ||
| # Use eni not cali for interface prefix | ||
| - name: FELIX_INTERFACEPREFIX | ||
| value: "eni" | ||
| - name: TYPHA_LOGFILEPATH | ||
| value: "none" | ||
| - name: TYPHA_LOGSEVERITYSYS | ||
| value: "none" | ||
| - name: TYPHA_LOGSEVERITYSCREEN | ||
| value: "info" | ||
| - name: TYPHA_PROMETHEUSMETRICSENABLED | ||
| value: "true" | ||
| - name: TYPHA_CONNECTIONREBALANCINGMODE | ||
| value: "kubernetes" | ||
| - name: TYPHA_PROMETHEUSMETRICSPORT | ||
| value: "9093" | ||
| - name: TYPHA_DATASTORETYPE | ||
| value: "kubernetes" | ||
| - name: TYPHA_MAXCONNECTIONSLOWERLIMIT | ||
| value: "1" | ||
| - name: TYPHA_HEALTHENABLED | ||
| value: "true" | ||
| volumeMounts: | ||
| - mountPath: /etc/calico | ||
| name: etc-calico | ||
| readOnly: true | ||
| livenessProbe: | ||
| exec: | ||
| command: | ||
| - calico-typha | ||
| - check | ||
| - liveness | ||
| periodSeconds: 30 | ||
| initialDelaySeconds: 30 | ||
| readinessProbe: | ||
| exec: | ||
| command: | ||
| - calico-typha | ||
| - check | ||
| - readiness | ||
| periodSeconds: 10 | ||
| volumes: | ||
| - name: etc-calico | ||
| hostPath: | ||
| path: /etc/calico | ||
|
|
||
|
|
||
| --- | ||
|
|
||
| # This manifest creates a Pod Disruption Budget for Typha to allow K8s Cluster Autoscaler to evict | ||
| apiVersion: policy/v1beta1 | ||
| kind: PodDisruptionBudget | ||
| metadata: | ||
| name: calico-typha | ||
| namespace: kube-system | ||
| labels: | ||
| k8s-app: calico-typha | ||
| spec: | ||
| maxUnavailable: 1 | ||
| selector: | ||
| matchLabels: | ||
| k8s-app: calico-typha | ||
|
|
||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
| kind: ClusterRoleBinding | ||
| metadata: | ||
|
|
||
I was considering testing out the v1.4.0-rc1 release candidate, and when I compared the calico.yaml to the v1.2 version we are currently running, I noticed this had been removed, which I think means will cause calico to revert back to the default value of Accept. Any reason for concern?