Skip to content
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.

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

Make sure dns-default pods run on all nodes for 4.18+ clusters #2286

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
6 changes: 6 additions & 0 deletions deploy/osd-26887-deamonset-tolerations/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
deploymentMode: "SelectorSyncSet"
selectorSyncSet:
matchExpressions:
- key: hive.openshift.io/version-major-minor
operator: NotIn
values: ["4.6", "4.7", "4.8", "4.9", "4.10", "4.11", "4.12", "4.13", "4.14", "4.15", "4.16", "4.17"]
6 changes: 6 additions & 0 deletions deploy/osd-26887-deamonset-tolerations/default.DNS.patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: operator.openshift.io/v1
kind: DNS
name: default
applyMode: AlwaysApply
patch: '{"spec":{"nodePlacement":{"tolerations":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/infra","operator":"Exists"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]}}}'
patchType: merge
36 changes: 36 additions & 0 deletions hack/00-osd-managed-cluster-config-integration.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -26890,6 +26890,42 @@ objects:
serviceAccountName: capa-annotator
automountServiceAccountToken: true
restartPolicy: Never
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
labels:
managed.openshift.io/gitHash: ${IMAGE_TAG}
managed.openshift.io/gitRepoName: ${REPO_NAME}
managed.openshift.io/osd: 'true'
name: osd-26887-deamonset-tolerations
spec:
clusterDeploymentSelector:
matchLabels:
api.openshift.com/managed: 'true'
matchExpressions:
- key: hive.openshift.io/version-major-minor
operator: NotIn
values:
- '4.6'
- '4.7'
- '4.8'
- '4.9'
- '4.10'
- '4.11'
- '4.12'
- '4.13'
- '4.14'
- '4.15'
- '4.16'
- '4.17'
resourceApplyMode: Sync
patches:
- apiVersion: operator.openshift.io/v1
kind: DNS
name: default
applyMode: AlwaysApply
patch: '{"spec":{"nodePlacement":{"tolerations":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/infra","operator":"Exists"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]}}}'
patchType: merge
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
Expand Down
36 changes: 36 additions & 0 deletions hack/00-osd-managed-cluster-config-production.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -26890,6 +26890,42 @@ objects:
serviceAccountName: capa-annotator
automountServiceAccountToken: true
restartPolicy: Never
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
labels:
managed.openshift.io/gitHash: ${IMAGE_TAG}
managed.openshift.io/gitRepoName: ${REPO_NAME}
managed.openshift.io/osd: 'true'
name: osd-26887-deamonset-tolerations
spec:
clusterDeploymentSelector:
matchLabels:
api.openshift.com/managed: 'true'
matchExpressions:
- key: hive.openshift.io/version-major-minor
operator: NotIn
values:
- '4.6'
- '4.7'
- '4.8'
- '4.9'
- '4.10'
- '4.11'
- '4.12'
- '4.13'
- '4.14'
- '4.15'
- '4.16'
- '4.17'
resourceApplyMode: Sync
patches:
- apiVersion: operator.openshift.io/v1
kind: DNS
name: default
applyMode: AlwaysApply
patch: '{"spec":{"nodePlacement":{"tolerations":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/infra","operator":"Exists"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]}}}'
patchType: merge
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
Expand Down
36 changes: 36 additions & 0 deletions hack/00-osd-managed-cluster-config-stage.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -26890,6 +26890,42 @@ objects:
serviceAccountName: capa-annotator
automountServiceAccountToken: true
restartPolicy: Never
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
labels:
managed.openshift.io/gitHash: ${IMAGE_TAG}
managed.openshift.io/gitRepoName: ${REPO_NAME}
managed.openshift.io/osd: 'true'
name: osd-26887-deamonset-tolerations
spec:
clusterDeploymentSelector:
matchLabels:
api.openshift.com/managed: 'true'
matchExpressions:
- key: hive.openshift.io/version-major-minor
operator: NotIn
values:
- '4.6'
- '4.7'
- '4.8'
- '4.9'
- '4.10'
- '4.11'
- '4.12'
- '4.13'
- '4.14'
- '4.15'
- '4.16'
- '4.17'
resourceApplyMode: Sync
patches:
- apiVersion: operator.openshift.io/v1
kind: DNS
name: default
applyMode: AlwaysApply
patch: '{"spec":{"nodePlacement":{"tolerations":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/infra","operator":"Exists"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]}}}'
patchType: merge
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
Expand Down