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

Merge pull request #11156 from olemarkus/apiserver-sideload-api-healthcheck 

Side load images also on apiserver
This commit is contained in:
Kubernetes Prow Robot 2021-03-30 21:58:58 -07:00 committed by GitHub
parent 9775182ee4 ff10bc3fc5
commit f8f34f4499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1155,6 +1155,7 @@ func newNodeUpConfigBuilder(cluster *kops.Cluster, assetBuilder *assets.AssetBui
for _, role := range kops.AllInstanceGroupRoles { for _, role := range kops.AllInstanceGroupRoles {
isMaster := role == kops.InstanceGroupRoleMaster isMaster := role == kops.InstanceGroupRoleMaster
isAPIServer := role == kops.InstanceGroupRoleAPIServer
images[role] = make(map[architectures.Architecture][]*nodeup.Image) images[role] = make(map[architectures.Architecture][]*nodeup.Image)
if components.IsBaseURL(cluster.Spec.KubernetesVersion) { if components.IsBaseURL(cluster.Spec.KubernetesVersion) {
@ -1163,6 +1164,9 @@ func newNodeUpConfigBuilder(cluster *kops.Cluster, assetBuilder *assets.AssetBui
if isMaster { if isMaster {
components = append(components, "kube-apiserver", "kube-controller-manager", "kube-scheduler") components = append(components, "kube-apiserver", "kube-controller-manager", "kube-scheduler")
} }
if isAPIServer {
components = append(components, "kube-apiserver")
}
for _, arch := range architectures.GetSupported() { for _, arch := range architectures.GetSupported() {
for _, component := range components { for _, component := range components {
@ -1212,6 +1216,29 @@ func newNodeUpConfigBuilder(cluster *kops.Cluster, assetBuilder *assets.AssetBui
} }
} }
} }
if os.Getenv("KOPS_BASE_URL") != "" && isAPIServer {
for _, arch := range architectures.GetSupported() {
for _, name := range []string{"kube-apiserver-healthcheck"} {
baseURL, err := url.Parse(os.Getenv("KOPS_BASE_URL"))
if err != nil {
return nil, err
}
baseURL.Path = path.Join(baseURL.Path, "/images/"+name+"-"+string(arch)+".tar.gz")
u, hash, err := assetBuilder.RemapFileAndSHA(baseURL)
if err != nil {
return nil, err
}
image := &nodeup.Image{
Sources: []string{u.String()},
Hash: hash.Hex(),
}
images[role][arch] = append(images[role][arch], image)
}
}
}
if isMaster { if isMaster {
for _, etcdCluster := range cluster.Spec.EtcdClusters { for _, etcdCluster := range cluster.Spec.EtcdClusters {