Skip to content

Commit f7614ca

Browse files
committed
Add back some previous customizations
Signed-off-by: Ciprian Hacman <[email protected]>
1 parent 1467ee0 commit f7614ca

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
version: 9.99.0
6363
- id: k8s-1.19
6464
manifest: karpenter.sh/k8s-1.19.yaml
65-
manifestHash: 26c813cafbe19cd0463de37601b1d9636fb20b8a31b8932f0dce77059dd7501c
65+
manifestHash: 5b6411c7d7a742aa11ff41d0b62e769364543178fdadc5b1048f1d1c297d6353
6666
name: karpenter.sh
6767
prune:
6868
kinds:

tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2542,7 +2542,7 @@ spec:
25422542
- mountPath: /var/run/secrets/amazonaws.com/
25432543
name: token-amazonaws-com
25442544
readOnly: true
2545-
dnsPolicy: ClusterFirst
2545+
dnsPolicy: Default
25462546
nodeSelector:
25472547
kubernetes.io/os: linux
25482548
priorityClassName: system-cluster-critical

upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2075,7 +2075,7 @@ metadata:
20752075
app.kubernetes.io/version: "1.6.2"
20762076
app.kubernetes.io/managed-by: Helm
20772077
spec:
2078-
replicas: 1
2078+
replicas: {{ ControlPlaneControllerReplicas false }}
20792079
revisionHistoryLimit: 10
20802080
strategy:
20812081
rollingUpdate:
@@ -2098,7 +2098,12 @@ spec:
20982098
seccompProfile:
20992099
type: RuntimeDefault
21002100
priorityClassName: "system-cluster-critical"
2101+
{{ if not IsIPv6Only }}
2102+
dnsPolicy: Default
2103+
{{ else }}
2104+
# Must use ClusterFirst on IPv6 clusters in order to get DNS64
21012105
dnsPolicy: ClusterFirst
2106+
{{ end }}
21022107
schedulerName: "default-scheduler"
21032108
containers:
21042109
- name: controller

0 commit comments

Comments
 (0)