kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15282 from justinsb/prefix_rule_is_aws_only 

gce ipv6: nodeup should only run the AWS prefix assigner on AWS
This commit is contained in:
Kubernetes Prow Robot 2023-03-31 08:13:53 -07:00 committed by GitHub
parent 853165f6e6 d48d86f4a9
commit 0fa79bae0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nodeup/pkg/model/prefix.go
View File

@ -17,6 +17,9 @@ limitations under the License.
package model package model
import ( import (
"fmt"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
) )
@ -31,8 +34,15 @@ func (b *PrefixBuilder) Build(c *fi.NodeupModelBuilderContext) error {
if !b.IsKopsControllerIPAM() { if !b.IsKopsControllerIPAM() {
return nil return nil
} }
c.AddTask(&nodetasks.Prefix{ switch b.BootConfig.CloudProvider {
Name: "prefix", case kops.CloudProviderAWS:
}) c.AddTask(&nodetasks.Prefix{
Name: "prefix",
})
case kops.CloudProviderGCE:
// Prefix is assigned by GCE
default:
return fmt.Errorf("kOps IPAM controller not supported on cloud %q", b.BootConfig.CloudProvider)
}
return nil return nil
} }