Fix critical addons

Author: hakman

tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content

@@ -1112,6 +1112,10 @@ spec:
       - effect: NoExecute
         operator: Exists
         tolerationSeconds: 300
+      - key: node-role.kubernetes.io/master
+        operator: Exists
+      - key: node-role.kubernetes.io/control-plane
+        operator: Exists
       topologySpreadConstraints:
       - labelSelector:
           matchLabels:

tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

@@ -14,7 +14,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: coredns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e20290a5b4c7a1dd1596b4a9adb1e7ecbf9efbe0aa0a51b8e09334c97e1ec9cb
+    manifestHash: a9f7533d4e22fbdc3a01a228b1a66b0f8b3d220aebbd6b6ba5fec3c814ffbec4
     name: coredns.addons.k8s.io
     selector:
       k8s-addon: coredns.addons.k8s.io
@@ -55,7 +55,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.17
     manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 3f2710ec98ff2c62bf6073d9ef1539ee3643bf14d91e40dfe50b2bb04dfde329
+    manifestHash: 7252ac4317765fba0952341b3996690d1ae45c17e12b913e355c9684591b08af
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content

@@ -380,7 +380,6 @@ spec:
             memory: 10Mi
       nodeSelector:
         kubernetes.io/os: linux
-      priorityClassName: system-cluster-critical
       serviceAccountName: coredns-autoscaler
       tolerations:
       - key: CriticalAddonsOnly

upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template

@@ -726,6 +726,12 @@ spec:
         - effect: NoExecute
           operator: Exists
           tolerationSeconds: 300
+        {{- if KarpenterEnabled }}
+        - key: node-role.kubernetes.io/master
+          operator: Exists
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
+        {{- end }}
       {{ end }}
       securityContext:
         fsGroup: 1000

upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template

@@ -361,7 +361,9 @@ spec:
           - --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
           - --logtostderr=true
           - --v=2
+      {{- if not KarpenterEnabled }}
       priorityClassName: system-cluster-critical
+      {{- end }}
       tolerations:
         {{- if KubeDNS.Tolerations }}
 {{ ToYAML .KubeDNS.Tolerations | indent 8 }}