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

Merge pull request #11620 from johngmyers/no-stage-kops 

Don't stage kops as file assets
This commit is contained in:
Kubernetes Prow Robot 2021-05-28 02:58:24 -07:00 committed by GitHub
parent 4f0ade6cb6 4bae3ee5b7
commit d93bafce05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,13 +363,6 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
return err
}
// Only setup transfer of kops assets if using a FileRepository
if c.Cluster.Spec.Assets != nil && c.Cluster.Spec.Assets.FileRepository != nil {
if err := SetKopsAssetsLocations(assetBuilder); err != nil {
return err
}
}
checkExisting := true
project := ""

14
upup/pkg/fi/cloudup/urls.go
View File

@ -83,20 +83,6 @@ func copyBaseURL(base *url.URL) (*url.URL, error) {
return u, nil
}
// SetKopsAssetsLocations sets the kops assets locations
// This func adds kops binary to the list of file assets, and stages the binary in the assets file repository
func SetKopsAssetsLocations(assetsBuilder *assets.AssetBuilder) error {
for _, s := range []string{
"linux/amd64/kops", "darwin/amd64/kops",
} {
_, _, err := KopsFileURL(s, assetsBuilder)
if err != nil {
return err
}
}
return nil
}
// NodeUpAsset returns the asset for where nodeup should be downloaded
func NodeUpAsset(assetsBuilder *assets.AssetBuilder, arch architectures.Architecture) (*mirrors.MirroredAsset, error) {
if nodeUpAsset == nil {