Sitelet https://github.com/kubernetes/kops/pull/18704/files
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.25
manifest: networking.flannel/k8s-1.25.yaml
manifestHash: a570d436240292d500900f0b57e54652f79830120a27fddc7dd20d4212eeaab4
manifestHash: 877b95315f08b59998ed5edbe5d015dee2f66038c0d6fa8460d256272a6c5d21
name: networking.flannel
prune:
kinds:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ spec:
- --ip-masq
- --kube-subnet-mgr
- --iptables-resync=5
- --healthz-port=8081
command:
- /opt/bin/flanneld
env:
Expand All @@ -174,8 +175,24 @@ spec:
value: "5000"
- name: CONT_WHEN_CACHE_NOT_READY
value: "false"
image: ghcr.io/flannel-io/flannel:v0.27.4
image: ghcr.io/flannel-io/flannel:v0.28.9
livenessProbe:
httpGet:
path: /healthz
port: healthz
initialDelaySeconds: 10
periodSeconds: 30
name: kube-flannel
ports:
- containerPort: 8081
name: healthz
protocol: TCP
readinessProbe:
httpGet:
path: /readyz
port: healthz
initialDelaySeconds: 5
periodSeconds: 10
resources:
requests:
cpu: 100m
Expand All @@ -201,18 +218,17 @@ spec:
- /opt/cni/bin/flannel
command:
- cp
image: ghcr.io/flannel-io/flannel-cni-plugin:v1.8.0-flannel1
image: ghcr.io/flannel-io/flannel-cni-plugin:v1.9.1-flannel3
name: install-cni-plugin
volumeMounts:
- mountPath: /opt/cni/bin
name: cni-plugin
- args:
- -f
- /etc/kube-flannel/cni-conf.json
- /etc/cni/net.d/10-flannel.conflist
command:
- cp
image: ghcr.io/flannel-io/flannel:v0.27.4
- /opt/bin/install-conf
image: ghcr.io/flannel-io/flannel:v0.28.9
name: install-cni
volumeMounts:
- mountPath: /etc/cni/net.d
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Pulled and modified from: https://raw.githubusercontent.com/coreos/flannel/v0.27.4/Documentation/kube-flannel.yml
# Pulled and modified from: https://raw.githubusercontent.com/coreos/flannel/v0.28.9/Documentation/kube-flannel.yml
---
kind: Namespace
apiVersion: v1
Expand Down Expand Up @@ -135,7 +135,7 @@ spec:
serviceAccountName: flannel
initContainers:
- name: install-cni-plugin
image: ghcr.io/flannel-io/flannel-cni-plugin:v1.8.0-flannel1
image: ghcr.io/flannel-io/flannel-cni-plugin:v1.9.1-flannel3
command:
- cp
args:
Expand All @@ -146,11 +146,10 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: ghcr.io/flannel-io/flannel:v0.27.4
image: ghcr.io/flannel-io/flannel:v0.28.9
command:
- cp
- /opt/bin/install-conf
args:
- -f
- /etc/kube-flannel/cni-conf.json
- /etc/cni/net.d/10-flannel.conflist
volumeMounts:
Expand All @@ -160,13 +159,30 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: ghcr.io/flannel-io/flannel:v0.27.4
image: ghcr.io/flannel-io/flannel:v0.28.9
command:
- /opt/bin/flanneld
args:
- --ip-masq
- --kube-subnet-mgr
- --iptables-resync={{- or .Networking.Flannel.IptablesResyncSeconds "5" }}
- --healthz-port=8081
ports:
- name: healthz
containerPort: 8081
protocol: TCP
livenessProbe:
httpGet:
path: /healthz
port: healthz
initialDelaySeconds: 10
periodSeconds: 30
readinessProbe:
httpGet:
path: /readyz
port: healthz
initialDelaySeconds: 5
periodSeconds: 10
resources:
requests:
cpu: "100m"
Expand Down
Loading