Skip to content

update to use GA labels in place of deprecated beta labels #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pfrcks merged 1 commit into from
Aug 9, 2022
+11 −11
Merged

update to use GA labels in place of deprecated beta labels #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
kubernetes.io/os: windows
{{- else }}
nodeSelector:
beta.kubernetes.io/os: windows
kubernetes.io/os: windows
{{- end }}
{{- if .Values.omsagent.rbac }}
serviceAccountName: omsagent
Expand Down
8 changes: 4 additions & 4 deletions charts/azuremonitor-containers/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ omsagent:
nodeSelectorTerms:
- labelSelector:
matchExpressions:
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
- key: type
operator: NotIn
values:
- virtual-kubelet
- key: beta.kubernetes.io/arch
- key: kubernetes.io/arch
operator: In
values:
- amd64
Expand Down Expand Up @@ -159,7 +159,7 @@ omsagent:
nodeSelectorTerms:
- labelSelector:
matchExpressions:
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
Expand All @@ -171,7 +171,7 @@ omsagent:
operator: NotIn
values:
- master
- key: beta.kubernetes.io/arch
- key: kubernetes.io/arch
operator: In
values:
- amd64
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/omsagent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ spec:
nodeSelectorTerms:
- labelSelector:
matchExpressions:
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- linux
Expand Down Expand Up @@ -970,7 +970,7 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: beta.kubernetes.io/os
- key: kubernetes.io/os
operator: In
values:
- windows
Expand Down
2 changes: 1 addition & 1 deletion test/scenario/yamls/many-containers-in-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,7 @@ spec:
sleep 1;
done
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
tolerations:
- key: "node-role.kubernetes.io/master"
operator: "Equal"
Expand Down
2 changes: 1 addition & 1 deletion test/scenario/yamls/nested-json.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ spec:
command: ["/bin/sh"]
args: ["-c", "while true; do echo '{\"container_name\": \"nested-json\", \"pod_name\": \"nested-json\", \"pod_namespace\": \"nested-json\", \"environment\": \"test\", \"logmessage\": { \"msg\": \"hello, world\", \"level\": \"info\"} }'; sleep 30; done"]
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
restartPolicy: OnFailure
2 changes: 1 addition & 1 deletion test/scenario/yamls/simple-json.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ spec:
command: ["/bin/sh"]
args: ["-c", "while true; do echo '{\"container_name\": \"simple-json\", \"pod_name\": \"simple-json\",\"pod_namespace\": \"simple-json\",\"environment\": \"test\"}'; sleep 30; done"]
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
restartPolicy: OnFailure
2 changes: 1 addition & 1 deletion test/scenario/yamls/two-containers-in-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ spec:
sleep 1;
done
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux