-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: Fixes CPU scheduling issues for 1.26 and 1.27 (#2172)
- Loading branch information
1 parent
0198f98
commit 2343d68
Showing
4 changed files
with
209 additions
and
17 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,23 +99,9 @@ jobs: | |
image: ${{ matrix.kind-image }} | ||
wait: 10s # Without default CNI, control-plane doesn't get ready until Cilium is installed | ||
config: .github/workflows/kind/config.yml | ||
- name: Setup Helm | ||
uses: azure/[email protected] | ||
- name: Install Cilium | ||
- name: Install kube-router for NetworkPolicy support | ||
run: | | ||
helm repo add cilium https://helm.cilium.io/ | ||
helm install cilium cilium/cilium --version 1.9.13 \ | ||
--namespace kube-system \ | ||
--set nodeinit.enabled=true \ | ||
--set kubeProxyReplacement=partial \ | ||
--set hostServices.enabled=false \ | ||
--set externalIPs.enabled=true \ | ||
--set nodePort.enabled=true \ | ||
--set hostPort.enabled=true \ | ||
--set bpf.masquerade=false \ | ||
--set image.pullPolicy=IfNotPresent \ | ||
--set ipam.mode=kubernetes \ | ||
--set operator.replicas=1 | ||
kubectl apply -f .github/workflows/kind/kube-router.yaml | ||
- name: Wait for cluster to finish bootstraping | ||
run: kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=300s | ||
- name: Create kube-prometheus stack | ||
|
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 |
---|---|---|
@@ -1,6 +1,15 @@ | ||
kind: Cluster | ||
apiVersion: kind.x-k8s.io/v1alpha4 | ||
networking: | ||
disableDefaultCNI: true | ||
podSubnet: "10.10.0.0/16" | ||
serviceSubnet: "10.11.0.0/16" | ||
nodes: | ||
- role: control-plane | ||
extraMounts: | ||
- hostPath: /home/runner/work/kube-prometheus/kube-prometheus/.github/workflows/kind/patches | ||
containerPath: /patches | ||
kubeadmConfigPatches: | ||
- | | ||
kind: InitConfiguration | ||
patches: | ||
directory: /patches |
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,186 @@ | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: kube-router-cfg | ||
namespace: kube-system | ||
labels: | ||
tier: node | ||
k8s-app: kube-router | ||
data: | ||
cni-conf.json: | | ||
{ | ||
"cniVersion":"0.3.0", | ||
"name":"mynet", | ||
"plugins":[ | ||
{ | ||
"name":"kubernetes", | ||
"type":"bridge", | ||
"bridge":"kube-bridge", | ||
"isDefaultGateway":true, | ||
"ipam":{ | ||
"type":"host-local" | ||
} | ||
} | ||
] | ||
} | ||
--- | ||
apiVersion: apps/v1 | ||
kind: DaemonSet | ||
metadata: | ||
labels: | ||
k8s-app: kube-router | ||
tier: node | ||
name: kube-router | ||
namespace: kube-system | ||
spec: | ||
selector: | ||
matchLabels: | ||
k8s-app: kube-router | ||
tier: node | ||
template: | ||
metadata: | ||
labels: | ||
k8s-app: kube-router | ||
tier: node | ||
spec: | ||
priorityClassName: system-node-critical | ||
serviceAccountName: kube-router | ||
containers: | ||
- name: kube-router | ||
image: docker.io/cloudnativelabs/kube-router | ||
imagePullPolicy: Always | ||
args: | ||
- --run-router=true | ||
- --run-firewall=true | ||
- --run-service-proxy=false | ||
- --bgp-graceful-restart=true | ||
env: | ||
- name: NODE_NAME | ||
valueFrom: | ||
fieldRef: | ||
fieldPath: spec.nodeName | ||
- name: KUBE_ROUTER_CNI_CONF_FILE | ||
value: /etc/cni/net.d/10-kuberouter.conflist | ||
livenessProbe: | ||
httpGet: | ||
path: /healthz | ||
port: 20244 | ||
initialDelaySeconds: 10 | ||
periodSeconds: 3 | ||
resources: | ||
requests: | ||
memory: 250Mi | ||
securityContext: | ||
privileged: true | ||
volumeMounts: | ||
- name: lib-modules | ||
mountPath: /lib/modules | ||
readOnly: true | ||
- name: cni-conf-dir | ||
mountPath: /etc/cni/net.d | ||
- name: kubeconfig | ||
mountPath: /var/lib/kube-router/kubeconfig | ||
readOnly: true | ||
- name: xtables-lock | ||
mountPath: /run/xtables.lock | ||
readOnly: false | ||
initContainers: | ||
- name: install-cni | ||
image: docker.io/cloudnativelabs/kube-router | ||
imagePullPolicy: Always | ||
command: | ||
- /bin/sh | ||
- -c | ||
- set -e -x; | ||
if [ ! -f /etc/cni/net.d/10-kuberouter.conflist ]; then | ||
if [ -f /etc/cni/net.d/*.conf ]; then | ||
rm -f /etc/cni/net.d/*.conf; | ||
fi; | ||
TMP=/etc/cni/net.d/.tmp-kuberouter-cfg; | ||
cp /etc/kube-router/cni-conf.json ${TMP}; | ||
mv ${TMP} /etc/cni/net.d/10-kuberouter.conflist; | ||
fi | ||
volumeMounts: | ||
- mountPath: /etc/cni/net.d | ||
name: cni-conf-dir | ||
- mountPath: /etc/kube-router | ||
name: kube-router-cfg | ||
hostNetwork: true | ||
tolerations: | ||
- effect: NoSchedule | ||
operator: Exists | ||
- key: CriticalAddonsOnly | ||
operator: Exists | ||
- effect: NoExecute | ||
operator: Exists | ||
volumes: | ||
- name: lib-modules | ||
hostPath: | ||
path: /lib/modules | ||
- name: cni-conf-dir | ||
hostPath: | ||
path: /etc/cni/net.d | ||
- name: kube-router-cfg | ||
configMap: | ||
name: kube-router-cfg | ||
- name: kubeconfig | ||
hostPath: | ||
path: /var/lib/kube-router/kubeconfig | ||
- name: xtables-lock | ||
hostPath: | ||
path: /run/xtables.lock | ||
type: FileOrCreate | ||
--- | ||
apiVersion: v1 | ||
kind: ServiceAccount | ||
metadata: | ||
name: kube-router | ||
namespace: kube-system | ||
--- | ||
kind: ClusterRole | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
metadata: | ||
name: kube-router | ||
namespace: kube-system | ||
rules: | ||
- apiGroups: | ||
- "" | ||
resources: | ||
- namespaces | ||
- pods | ||
- services | ||
- nodes | ||
- endpoints | ||
verbs: | ||
- list | ||
- get | ||
- watch | ||
- apiGroups: | ||
- "networking.k8s.io" | ||
resources: | ||
- networkpolicies | ||
verbs: | ||
- list | ||
- get | ||
- watch | ||
- apiGroups: | ||
- extensions | ||
resources: | ||
- networkpolicies | ||
verbs: | ||
- get | ||
- list | ||
- watch | ||
--- | ||
kind: ClusterRoleBinding | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
metadata: | ||
name: kube-router | ||
roleRef: | ||
apiGroup: rbac.authorization.k8s.io | ||
kind: ClusterRole | ||
name: kube-router | ||
subjects: | ||
- kind: ServiceAccount | ||
name: kube-router | ||
namespace: kube-system |
11 changes: 11 additions & 0 deletions
11
.github/workflows/kind/patches/kube-controller-manager.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
apiVersion: v1 | ||
kind: Pod | ||
metadata: | ||
name: kube-controller-manager | ||
namespace: kube-system | ||
spec: | ||
containers: | ||
- name: kube-controller-manager | ||
resources: | ||
requests: | ||
cpu: 1m |