From edafd97e651d1483a95f3b38ba5dcd6b3af6a416 Mon Sep 17 00:00:00 2001 From: Mariusz Mazur Date: Tue, 3 Dec 2024 14:10:00 +0100 Subject: [PATCH 1/2] Make sure dns-default pods run on all nodes for 4.18+ clusters --- deploy/osd-26887-deamonset-tolerations/config.yaml | 6 ++++++ .../osd-26887-deamonset-tolerations/default.DNS.patch.yaml | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 deploy/osd-26887-deamonset-tolerations/config.yaml create mode 100644 deploy/osd-26887-deamonset-tolerations/default.DNS.patch.yaml diff --git a/deploy/osd-26887-deamonset-tolerations/config.yaml b/deploy/osd-26887-deamonset-tolerations/config.yaml new file mode 100644 index 000000000..36aa76953 --- /dev/null +++ b/deploy/osd-26887-deamonset-tolerations/config.yaml @@ -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"] diff --git a/deploy/osd-26887-deamonset-tolerations/default.DNS.patch.yaml b/deploy/osd-26887-deamonset-tolerations/default.DNS.patch.yaml new file mode 100644 index 000000000..f15facdf6 --- /dev/null +++ b/deploy/osd-26887-deamonset-tolerations/default.DNS.patch.yaml @@ -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 From e707642232ad4c5f49856b864e221c854ca7a1af Mon Sep 17 00:00:00 2001 From: mmazur Date: Fri, 6 Dec 2024 14:20:10 +0000 Subject: [PATCH 2/2] on push: make --- ...naged-cluster-config-integration.yaml.tmpl | 36 +++++++++++++++++++ ...anaged-cluster-config-production.yaml.tmpl | 36 +++++++++++++++++++ ...osd-managed-cluster-config-stage.yaml.tmpl | 36 +++++++++++++++++++ 3 files changed, 108 insertions(+) diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index 97e2b727d..a69784002 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -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: diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl index 97e2b727d..a69784002 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -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: diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl index 97e2b727d..a69784002 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -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: