Skip to content

gce: Allow role=apiserver with dns=none #18162

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 2 commits into from
Apr 7, 2026
Merged

gce: Allow role=apiserver with dns=none #18162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
048aca0
Allow role=apiserver with dns=none on GCE
rifelpet Apr 5, 2026
a01ed09
Use dns=none for GCE role=apiserver E2E test
rifelpet Apr 5, 2026
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
2 changes: 1 addition & 1 deletion pkg/apis/kops/validation/instancegroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ func CrossValidateInstanceGroup(g *kops.InstanceGroup, cluster *kops.Cluster, cl
if cluster.GetCloudProvider() != kops.CloudProviderAWS && cluster.GetCloudProvider() != kops.CloudProviderGCE {
allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "role"), "APIServer role only supported on AWS and GCE"))
}
if cluster.UsesNoneDNS() {
if cluster.UsesNoneDNS() && cluster.GetCloudProvider() != kops.CloudProviderGCE {
allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "role"), "APIServer cannot be used with topology.dns.type=None"))
}
}
Expand Down
25 changes: 25 additions & 0 deletions pkg/apis/kops/validation/instancegroup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,7 @@ func createMinimalInstanceGroup() *kops.InstanceGroup {
}

func TestCrossValidateAPIServerRole(t *testing.T) {
noneDNSTopology := &kops.TopologySpec{DNS: kops.DNSTypeNone}
grid := []struct {
Description string
Cluster *kops.Cluster
Expand Down Expand Up @@ -539,6 +540,30 @@ func TestCrossValidateAPIServerRole(t *testing.T) {
},
ExpectedErrors: 0,
},
{
Description: "APIServer role allowed on GCE with dns=None",
Cluster: &kops.Cluster{
Spec: kops.ClusterSpec{
CloudProvider: kops.CloudProviderSpec{
GCE: &kops.GCESpec{},
},
Networking: kops.NetworkingSpec{Topology: noneDNSTopology},
},
},
ExpectedErrors: 0,
},
{
Description: "APIServer role forbidden on AWS with dns=None",
Cluster: &kops.Cluster{
Spec: kops.ClusterSpec{
CloudProvider: kops.CloudProviderSpec{
AWS: &kops.AWSSpec{},
},
Networking: kops.NetworkingSpec{Topology: noneDNSTopology},
},
},
ExpectedErrors: 1,
},
{
Description: "APIServer role forbidden on DO",
Cluster: &kops.Cluster{
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/templates/apiserver-gce.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
type: Public
topology:
dns:
type: Public
type: None

---

Expand Down
Loading