Merge pull request #31245 from luthermonson/fixdns-master

[master] adding dnspolicy and tolerations to shell/helm

pkg/api/steve/clusters/shell.go

@@ -103,6 +103,7 @@ func (s *shell) createPod() *v1.Pod {
 			Namespace:    s.namespace,
 		},
 		Spec: v1.PodSpec{
+			DNSPolicy:                     "Default",
 			TerminationGracePeriodSeconds: new(int64),
 			RestartPolicy:                 v1.RestartPolicyNever,
 			NodeSelector: map[string]string{
@@ -115,6 +116,18 @@ func (s *shell) createPod() *v1.Pod {
 					Value:    "linux",
 					Effect:   "NoSchedule",
 				},
+				{
+					Key:      "node-role.kubernetes.io/controlplane",
+					Operator: "Equal",
+					Value:    "true",
+					Effect:   "NoSchedule",
+				},
+				{
+					Key:      "node-role.kubernetes.io/etcd",
+					Operator: "Equal",
+					Value:    "true",
+					Effect:   "NoExecute",
+				},
 			},
 			Containers: []v1.Container{
 				{

pkg/catalogv2/helmop/operation.go

@@ -732,6 +732,7 @@ func (s *Operations) createPod(secretData map[string][]byte) (*v1.Pod, *podimper
 			Namespace:    s.namespace,
 		},
 		Spec: v1.PodSpec{
+			DNSPolicy: "Default",
 			Volumes: []v1.Volume{
 				{
 					Name: "data",
@@ -754,6 +755,18 @@ func (s *Operations) createPod(secretData map[string][]byte) (*v1.Pod, *podimper
 					Value:    "linux",
 					Effect:   "NoSchedule",
 				},
+				{
+					Key:      "node-role.kubernetes.io/controlplane",
+					Operator: "Equal",
+					Value:    "true",
+					Effect:   "NoSchedule",
+				},
+				{
+					Key:      "node-role.kubernetes.io/etcd",
+					Operator: "Equal",
+					Value:    "true",
+					Effect:   "NoExecute",
+				},
 			},
 			Containers: []v1.Container{
 				{

pkg/systemtemplate/template.go

@@ -161,6 +161,7 @@ spec:
                 - "true"
             weight: 1
       serviceAccountName: cattle
+      dnsPolicy: Default
       tolerations:
       {{- if .Tolerations }}
       # Tolerations added based on found taints on controlplane nodes