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

Use state store for nodeup.Config in Gossip clusters

This commit is contained in:
John Gardiner Myers 2023-01-11 21:15:08 -08:00
parent ecb56b49bb
commit 1de02c56f1
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apis/kops/model/features.go
View File

@ -34,6 +34,14 @@ func UseKopsControllerForNodeBootstrap(cluster *kops.Cluster) bool {
} }
} }
// UseKopsControllerForNodeConfig checks if nodeup should use kops-controller to get nodeup.Config.
func UseKopsControllerForNodeConfig(cluster *kops.Cluster) bool {
if cluster.IsGossip() {
return false
}
return UseKopsControllerForNodeBootstrap(cluster)
}
// UseCiliumEtcd is true if we are using the Cilium etcd cluster. // UseCiliumEtcd is true if we are using the Cilium etcd cluster.
func UseCiliumEtcd(cluster *kops.Cluster) bool { func UseCiliumEtcd(cluster *kops.Cluster) bool {
if cluster.Spec.Networking.Cilium == nil { if cluster.Spec.Networking.Cilium == nil {

2
pkg/model/bootstrapscript.go
View File

@ -131,7 +131,7 @@ func (b *BootstrapScript) buildEnvironmentVariables(cluster *kops.Cluster) (map[
env["GOSSIP_DNS_CONN_LIMIT"] = os.Getenv("GOSSIP_DNS_CONN_LIMIT") env["GOSSIP_DNS_CONN_LIMIT"] = os.Getenv("GOSSIP_DNS_CONN_LIMIT")
} }
if os.Getenv("S3_ENDPOINT") != "" && (!model.UseKopsControllerForNodeBootstrap(cluster) || b.ig.HasAPIServer()) { if os.Getenv("S3_ENDPOINT") != "" && (!model.UseKopsControllerForNodeConfig(cluster) || b.ig.HasAPIServer()) {
env["S3_ENDPOINT"] = os.Getenv("S3_ENDPOINT") env["S3_ENDPOINT"] = os.Getenv("S3_ENDPOINT")
env["S3_REGION"] = os.Getenv("S3_REGION") env["S3_REGION"] = os.Getenv("S3_REGION")
env["S3_ACCESS_KEY_ID"] = os.Getenv("S3_ACCESS_KEY_ID") env["S3_ACCESS_KEY_ID"] = os.Getenv("S3_ACCESS_KEY_ID")

6
pkg/model/iam/iam_builder.go
View File

@ -698,10 +698,14 @@ func ReadableStatePaths(cluster *kops.Cluster, role Subject) ([]string, error) {
case *NodeRoleNode: case *NodeRoleNode:
// Give access to keys for client certificates as needed. // Give access to keys for client certificates as needed.
if !model.UseKopsControllerForNodeBootstrap(cluster) { if !model.UseKopsControllerForNodeConfig(cluster) {
paths = append(paths, paths = append(paths,
"/cluster-completed.spec", "/cluster-completed.spec",
"/igconfig/node/*", "/igconfig/node/*",
)
}
if !model.UseKopsControllerForNodeBootstrap(cluster) {
paths = append(paths,
"/secrets/dockerconfig", "/secrets/dockerconfig",
"/pki/private/kube-proxy/*", "/pki/private/kube-proxy/*",
) )

2
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -1426,7 +1426,7 @@ func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAddit
} }
} }
useConfigServer := apiModel.UseKopsControllerForNodeBootstrap(cluster) && !ig.HasAPIServer() useConfigServer := apiModel.UseKopsControllerForNodeConfig(cluster) && !ig.HasAPIServer()
if useConfigServer { if useConfigServer {
host := "kops-controller.internal." + cluster.ObjectMeta.Name host := "kops-controller.internal." + cluster.ObjectMeta.Name
if cluster.UsesNoneDNS() { if cluster.UsesNoneDNS() {