From c0b1688f36b4d8f5c8ce03f1b6b824fb47292046 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 22 Sep 2023 10:40:55 +0300 Subject: [PATCH] TMP --- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...t_minimal.example.com-addons-karpenter.sh-k8s-1.19_content | 2 +- .../resources/addons/karpenter.sh/k8s-1.19.yaml.template | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 03ac92b578cab..ab652b27d3c38 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -120,7 +120,7 @@ spec: version: 9.99.0 - id: k8s-1.19 manifest: karpenter.sh/k8s-1.19.yaml - manifestHash: 2c2ee765c4e9df0505ff1a3ee239f3f401cf21d78957fea2a1cd5bc05e67bbaa + manifestHash: 060a226341e590d2de371f409b43ace725fad5d4792453091ba92607a073f19b name: karpenter.sh prune: kinds: diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content index cbf69f6ef40a5..27c792304d874 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content @@ -1837,7 +1837,7 @@ spec: - mountPath: /var/run/secrets/amazonaws.com/ name: token-amazonaws-com readOnly: true - dnsPolicy: ClusterFirst + dnsPolicy: Default priorityClassName: system-cluster-critical securityContext: fsGroup: 65536 diff --git a/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template b/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template index cedf132e0bcdc..7934bce81ccd3 100644 --- a/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template +++ b/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template @@ -1534,8 +1534,12 @@ spec: seccompProfile: type: RuntimeDefault priorityClassName: "system-cluster-critical" + {{ if not IsIPv6Only }} + dnsPolicy: Default + {{ else }} # Must use ClusterFirst on IPv6 clusters in order to get DNS64 dnsPolicy: ClusterFirst + {{ end }} containers: - name: controller securityContext: