Skip to content

Automated cherry pick of #18298: dns-controller: make priorityClassName configurable #18300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
May 10, 2026
Merged

Automated cherry pick of #18298: dns-controller: make priorityClassName configurable #18300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,6 +1461,11 @@ spec:
description: Disable indicates we do not wish to run the dns-controller
addon
type: boolean
priorityClassName:
description: |-
PriorityClassName overrides the priorityClassName on the dns-controller pod.
Defaults to "system-cluster-critical" when unset.
type: string
provider:
description: |-
Provider determines which implementation of ExternalDNS to use.
Expand Down
3 changes: 3 additions & 0 deletions pkg/apis/kops/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,9 @@ type ExternalDNSConfig struct {
// 'dns-controller' will use kOps DNS Controller.
// 'external-dns' will use kubernetes-sigs/external-dns.
Provider ExternalDNSProvider `json:"provider,omitempty"`
// PriorityClassName overrides the priorityClassName on the dns-controller pod.
// Defaults to "system-cluster-critical" when unset.
PriorityClassName *string `json:"priorityClassName,omitempty"`
}

// EtcdProviderType describes etcd cluster provisioning types (Standalone, Manager)
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/kops/fieldmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,5 @@ var clusterFieldMappings = []struct {
{V1Alpha2: "spec.masterPublicName", V1Alpha3: "spec.api.publicName"},
{V1Alpha2: "spec.topology.dns.type", V1Alpha3: "spec.networking.topology.dns"},
{V1Alpha2: "spec.externalDns.provider", V1Alpha3: "spec.externalDNS.provider"},
{V1Alpha2: "spec.externalDns.priorityClassName", V1Alpha3: "spec.externalDNS.priorityClassName"},
}
3 changes: 3 additions & 0 deletions pkg/apis/kops/v1alpha2/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,9 @@ type ExternalDNSConfig struct {
// 'dns-controller' will use kOps DNS Controller.
// 'external-dns' will use kubernetes-sigs/external-dns.
Provider ExternalDNSProvider `json:"provider,omitempty"`
// PriorityClassName overrides the priorityClassName on the dns-controller pod.
// Defaults to "system-cluster-critical" when unset.
PriorityClassName *string `json:"priorityClassName,omitempty"`
}

// EtcdProviderType describes etcd cluster provisioning types (Standalone, Manager)
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions pkg/apis/kops/v1alpha3/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,9 @@ type ExternalDNSConfig struct {
// 'dns-controller' will use kOps DNS Controller.
// 'external-dns' will use kubernetes-sigs/external-dns.
Provider ExternalDNSProvider `json:"provider,omitempty"`
// PriorityClassName overrides the priorityClassName on the dns-controller pod.
// Defaults to "system-cluster-critical" when unset.
PriorityClassName *string `json:"priorityClassName,omitempty"`
}

// EtcdClusterSpec is the etcd cluster specification
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/apis/kops/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
k8s-app: dns-controller
version: v{{ KopsVersion }}
spec:
priorityClassName: system-cluster-critical
priorityClassName: {{ DNSControllerPriorityClassName }}
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand Down
10 changes: 10 additions & 0 deletions upup/pkg/fi/cloudup/template_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
dest["OpenStackCCMTag"] = tf.OpenStackCCMTag
dest["OpenStackCSITag"] = tf.OpenStackCSITag
dest["DNSControllerEnvs"] = tf.DNSControllerEnvs
dest["DNSControllerPriorityClassName"] = tf.DNSControllerPriorityClassName
dest["ProxyEnv"] = tf.ProxyEnv

dest["KopsControllerEnv"] = tf.KopsControllerEnv
Expand Down Expand Up @@ -851,6 +852,15 @@ func (tf *TemplateFunctions) ExternalDNSArgv() ([]string, error) {
return argv, nil
}

// DNSControllerPriorityClassName returns the priorityClassName for the dns-controller pod,
// defaulting to "system-cluster-critical" when the spec leaves it unset.
func (tf *TemplateFunctions) DNSControllerPriorityClassName() string {
if tf.Cluster.Spec.ExternalDNS != nil && tf.Cluster.Spec.ExternalDNS.PriorityClassName != nil {
return *tf.Cluster.Spec.ExternalDNS.PriorityClassName
}
return "system-cluster-critical"
}

func (tf *TemplateFunctions) DNSControllerEnvs() map[string]string {
if tf.Cluster.GetCloudProvider() != kops.CloudProviderOpenstack {
return nil
Expand Down
Loading