Skip to content

Commit e32bb5d

Browse files
committed
ci: adds missing helm-values files to generate cm
1 parent d68d5fe commit e32bb5d

File tree

7 files changed

+134
-25
lines changed

7 files changed

+134
-25
lines changed

hack/addons/kustomize/cluster-autoscaler/manifests/helm-values.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@
44
# This is used to generate CRS
55
---
66
# This is a hack, but because a single cluster-autoscaler deployment can only monitor a single Kubernetes cluster
7+
<<<<<<< HEAD
78
# we expect 'tmp-clustername-tmpl', 'tmpl-clusternamespace-tmpl' and 'tmpl-clusteruuid-tmpl'
89
# to be replaced with the Cluster's name and namespace.
910
fullnameOverride: cluster-autoscaler-tmpl-clusteruuid-tmpl
11+
=======
12+
# we expect 'tmpl-clustername-tmpl' and 'tmpl-clusternamespace-tmpl'
13+
# to be replaced with the Cluster's name and namespace.
14+
fullnameOverride: cluster-autoscaler-tmpl-clustername-tmpl
15+
>>>>>>> c13903e (ci: adds missing helm-values files to generate cm)
1016

1117
cloudProvider: clusterapi
1218

@@ -33,7 +39,11 @@ clusterAPIMode: kubeconfig-incluster
3339
clusterAPIWorkloadKubeconfigPath: /cluster/kubeconfig
3440
extraVolumeSecrets:
3541
kubeconfig:
42+
<<<<<<< HEAD
3643
name: tmpl-clusteruuid-tmpl-kubeconfig
44+
=======
45+
name: tmpl-clustername-tmpl-kubeconfig
46+
>>>>>>> c13903e (ci: adds missing helm-values files to generate cm)
3747
mountPath: /cluster
3848
readOnly: true
3949
items:

hack/addons/kustomize/cluster-autoscaler/manifests/values-template.yaml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
<<<<<<< HEAD
21
---
32
fullnameOverride: "cluster-autoscaler-{{ index .Cluster.Annotations "caren.nutanix.com/cluster-uuid" }}
4-
=======
5-
# Copyright 2023 Nutanix. All rights reserved.
6-
# SPDX-License-Identifier: Apache-2.0
7-
8-
# This is used to generate CRS
9-
---
10-
# This is a hack, but because a single cluster-autoscaler deployment can only monitor a single Kubernetes cluster
11-
# we expect 'tmp-clustername-tmpl', 'tmpl-clusternamespace-tmpl' and 'tmpl-clusteruuid-tmpl'
12-
# to be replaced with the Cluster's name and namespace.
13-
fullnameOverride: cluster-autoscaler-tmpl-clusteruuid-tmpl
14-
>>>>>>> cefd0dc (ci: set structure for sync tool)
153

164
cloudProvider: clusterapi
175

@@ -26,31 +14,18 @@ tolerations:
2614

2715
# Limit a single cluster-autoscaler Deployment to a single Cluster.
2816
autoDiscovery:
29-
<<<<<<< HEAD
3017
clusterName: {{ .Cluster.Name }}
3118
# The controller failed with an RBAC error trying to watch CAPI objects at the cluster scope without this.
3219
labels:
3320
- namespace: {{ .Cluster.Namespace }}
3421

35-
=======
36-
clusterName: tmpl-clustername-tmpl
37-
# The controller failed with an RBAC error trying to watch CAPI objects at the cluster scope without this.
38-
labels:
39-
- namespace: tmpl-clusternamespace-tmpl
40-
41-
clusterAPIConfigMapsNamespace: tmpl-clusternamespace-tmpl
42-
>>>>>>> cefd0dc (ci: set structure for sync tool)
4322
# For workload clusters it is not possible to use the in-cluster client.
4423
# To simplify the configuration, use the admin kubeconfig generated by CAPI for all clusters.
4524
clusterAPIMode: kubeconfig-incluster
4625
clusterAPIWorkloadKubeconfigPath: /cluster/kubeconfig
4726
extraVolumeSecrets:
4827
kubeconfig:
49-
<<<<<<< HEAD
5028
name: "{{ .Cluster.Name }}-kubeconfig"
51-
=======
52-
name: tmpl-clusteruuid-tmpl-kubeconfig
53-
>>>>>>> cefd0dc (ci: set structure for sync tool)
5429
mountPath: /cluster
5530
readOnly: true
5631
items:
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright 2024 Nutanix. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
# Used to generate CRS.
5+
---
6+
cni:
7+
chainingMode: portmap
8+
hubble:
9+
enabled: false
10+
ipam:
11+
mode: kubernetes
12+
image:
13+
useDigest: false
14+
operator:
15+
image:
16+
useDigest: false
17+
certgen:
18+
image:
19+
useDigest: false
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright 2024 Nutanix. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
# Used to generate CRS
5+
---
6+
controller:
7+
affinity:
8+
nodeAffinity:
9+
requiredDuringSchedulingIgnoredDuringExecution:
10+
nodeSelectorTerms:
11+
- matchExpressions:
12+
- key: node-role.kubernetes.io/control-plane
13+
operator: Exists
14+
tolerations:
15+
- key: CriticalAddonsOnly
16+
operator: Exists
17+
- effect: NoExecute
18+
operator: Exists
19+
tolerationSeconds: 300
20+
- effect: NoSchedule
21+
key: node-role.kubernetes.io/master
22+
operator: Exists
23+
- effect: NoSchedule
24+
key: node-role.kubernetes.io/control-plane
25+
operator: Exists
26+
node:
27+
priorityClassName: system-node-critical
28+
sidecars:
29+
snapshotter:
30+
forceEnable: true
31+
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Copyright 2024 Nutanix. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
# Used to generate CRS
5+
---
6+
storageClass:
7+
create: false
8+
provisionerName: rancher.io/local-path
9+
helperImage:
10+
tag: 1.36.1
11+
tolerations:
12+
- key: CriticalAddonsOnly
13+
operator: Exists
14+
- effect: NoExecute
15+
operator: Exists
16+
tolerationSeconds: 300
17+
- effect: NoSchedule
18+
key: node-role.kubernetes.io/master
19+
operator: Exists
20+
- effect: NoSchedule
21+
key: node-role.kubernetes.io/control-plane
22+
operator: Exists
23+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Copyright 2024 Nutanix. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
# Used to generate CRS
5+
controller:
6+
priorityClassName: system-cluster-critical
7+
tolerations:
8+
- key: CriticalAddonsOnly
9+
operator: Exists
10+
- effect: NoExecute
11+
operator: Exists
12+
tolerationSeconds: 300
13+
- effect: NoSchedule
14+
key: node-role.kubernetes.io/master
15+
operator: Exists
16+
- effect: NoSchedule
17+
key: node-role.kubernetes.io/control-plane
18+
operator: Exists
19+
webhook:
20+
enabled: false
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright 2023 Nutanix. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
# used to generate CRS
5+
---
6+
master:
7+
extraLabelNs:
8+
- nvidia.com
9+
- beta.amd.com
10+
- amd.com
11+
12+
worker: ### <NFD-WORKER-CONF-START-DO-NOT-REMOVE>
13+
config:
14+
sources:
15+
pci:
16+
deviceLabelFields:
17+
- "class"
18+
- "vendor"
19+
tolerations:
20+
- effect: NoSchedule
21+
key: node-role.kubernetes.io/master
22+
- effect: NoSchedule
23+
key: node-role.kubernetes.io/control-plane
24+
### <NFD-WORKER-CONF-END-DO-NOT-REMOVE>
25+
26+
gc:
27+
tolerations:
28+
- effect: NoSchedule
29+
key: node-role.kubernetes.io/master
30+
- effect: NoSchedule
31+
key: node-role.kubernetes.io/control-plane

0 commit comments

Comments
 (0)