-
-
Notifications
You must be signed in to change notification settings - Fork 103
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Structure flannel/Calico manifests consistently
* Organize flannel and Calico manifests to use consistent naming, structure, and ordering to align * Downside: Makes direct diff'ing with upstream harder, but that's become difficult lately anyway, since Calico uses a templating engine
- Loading branch information
Showing
7 changed files
with
100 additions
and
102 deletions.
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
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
resources/flannel/flannel-cfg.yaml → resources/flannel/config.yaml
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
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 |
---|---|---|
@@ -0,0 +1,83 @@ | ||
apiVersion: apps/v1 | ||
kind: DaemonSet | ||
metadata: | ||
name: flannel | ||
namespace: kube-system | ||
labels: | ||
k8s-app: flannel | ||
spec: | ||
selector: | ||
matchLabels: | ||
k8s-app: flannel | ||
updateStrategy: | ||
type: RollingUpdate | ||
rollingUpdate: | ||
maxUnavailable: 1 | ||
template: | ||
metadata: | ||
labels: | ||
k8s-app: flannel | ||
annotations: | ||
seccomp.security.alpha.kubernetes.io/pod: 'docker/default' | ||
spec: | ||
hostNetwork: true | ||
serviceAccountName: flannel | ||
tolerations: | ||
- effect: NoSchedule | ||
operator: Exists | ||
- effect: NoExecute | ||
operator: Exists | ||
containers: | ||
- name: flannel | ||
image: ${flannel_image} | ||
command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr", "--iface=$(POD_IP)"] | ||
env: | ||
- name: POD_NAME | ||
valueFrom: | ||
fieldRef: | ||
fieldPath: metadata.name | ||
- name: POD_NAMESPACE | ||
valueFrom: | ||
fieldRef: | ||
fieldPath: metadata.namespace | ||
- name: POD_IP | ||
valueFrom: | ||
fieldRef: | ||
fieldPath: status.podIP | ||
securityContext: | ||
privileged: true | ||
volumeMounts: | ||
- name: flannel-config | ||
mountPath: /etc/kube-flannel/ | ||
- name: cni-conf-dir | ||
mountPath: /etc/cni/net.d | ||
- name: run | ||
mountPath: /run | ||
- name: install-cni | ||
image: ${flannel_cni_image} | ||
command: ["/install-cni.sh"] | ||
env: | ||
- name: CNI_NETWORK_CONFIG | ||
valueFrom: | ||
configMapKeyRef: | ||
name: flannel-config | ||
key: cni-conf.json | ||
volumeMounts: | ||
- name: cni-bin-dir | ||
mountPath: /host/opt/cni/bin/ | ||
- name: cni-conf-dir | ||
mountPath: /host/etc/cni/net.d | ||
volumes: | ||
- name: run | ||
hostPath: | ||
path: /run | ||
- name: flannel-config | ||
configMap: | ||
name: flannel-config | ||
# Used by install-cni | ||
- name: cni-bin-dir | ||
hostPath: | ||
path: /opt/cni/bin | ||
- name: cni-conf-dir | ||
hostPath: | ||
path: /etc/kubernetes/cni/net.d |
This file was deleted.
Oops, something went wrong.
File renamed without changes.