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
2 changes: 1 addition & 1 deletion .pipelines/mdnc/azure-cns-cni-1.4.39.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:
operator: NotIn
values:
- virtual-kubelet
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/mdnc/azure-cns-cni-1.5.28.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:
operator: NotIn
values:
- virtual-kubelet
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/mdnc/azure-cns-cni-1.5.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:
operator: NotIn
values:
- virtual-kubelet
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/mdnc/azure-cns-cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:
operator: NotIn
values:
- virtual-kubelet
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
Expand Down
4 changes: 2 additions & 2 deletions cns/azure-cns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:
operator: NotIn
values:
- virtual-kubelet
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
Expand Down Expand Up @@ -189,4 +189,4 @@ data:
"ManageEndpointState": false,
"ProgramSNATIPTables" : false
}
# Toggle ManageEndpointState and ProgramSNATIPTables to true for delegated IPAM use case.
# Toggle ManageEndpointState and ProgramSNATIPTables to true for delegated IPAM use case.
2 changes: 1 addition & 1 deletion hack/manifests/cni-installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
operator: NotIn
values:
- virtual-kubelet
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
Expand Down
6 changes: 3 additions & 3 deletions hack/toolbox/manifests/agents.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
app: agent-pod-8085-tcp-host
spec:
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
kubernetes.io/role: agent
hostNetwork: true
containers:
Expand Down Expand Up @@ -47,7 +47,7 @@ spec:
app: agent-pod-8085-tcp
spec:
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
kubernetes.io/role: agent
containers:
- name: agent-pod-8085-tcp
Expand Down Expand Up @@ -77,7 +77,7 @@ spec:
app: agent-pod-8086-udp
spec:
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
kubernetes.io/role: agent
containers:
- name: agent-pod-8086-udp
Expand Down
2 changes: 1 addition & 1 deletion hack/toolbox/manifests/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
- key: CriticalAddonsOnly
operator: Exists
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
kubernetes.io/role: agent
containers:
- name: azure-npm
Expand Down
6 changes: 3 additions & 3 deletions hack/toolbox/manifests/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
app: master-pod-8085-tcp-host
spec:
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
kubernetes.io/role: master
hostNetwork: true
tolerations:
Expand Down Expand Up @@ -55,7 +55,7 @@ spec:
app: master-pod-8085-tcp
spec:
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
kubernetes.io/role: master
tolerations:
- operator: "Exists"
Expand Down Expand Up @@ -92,7 +92,7 @@ spec:
app: master-pod-8086-udp
spec:
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
kubernetes.io/role: master
tolerations:
- operator: "Exists"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/manifests/cilium/cns-write-ovly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:
operator: NotIn
values:
- virtual-kubelet
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
Expand Down
2 changes: 1 addition & 1 deletion test/integration/manifests/cns/daemonset-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
operator: NotIn
values:
- virtual-kubelet
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
Expand Down
1 change: 0 additions & 1 deletion test/scale/templates/kwok-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ metadata:
kwok.x-k8s.io/node: fake
labels:
beta.kubernetes.io/arch: amd64
beta.kubernetes.io/os: linux
kubernetes.io/arch: amd64
kubernetes.io/hostname: kwok-node-INSERT_NUMBER
kubernetes.io/os: linux
Expand Down
2 changes: 1 addition & 1 deletion tools/acncli/deployment/manager_swift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
acn: azure-cni-manager
spec:
nodeSelector:
"beta.kubernetes.io/os": linux
"kubernetes.io/os": linux
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
Expand Down
Loading