-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add
skaffold inspect build-env add googleCloudBuild command (#5824)
* add `skaffold inspect build-env add googleCloudBuild` command * fix function desc * improve tests
- Loading branch information
1 parent
ffb7d2b
commit d9b397e
Showing
24 changed files
with
1,071 additions
and
251 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| Copyright 2021 The Skaffold Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package inspect | ||
|
|
||
| import ( | ||
| "context" | ||
| "io" | ||
|
|
||
| "github.com/GoogleContainerTools/skaffold/pkg/skaffold/config" | ||
| "github.com/GoogleContainerTools/skaffold/pkg/skaffold/inspect" | ||
| "github.com/GoogleContainerTools/skaffold/pkg/skaffold/parser" | ||
| latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1" | ||
| "github.com/GoogleContainerTools/skaffold/pkg/skaffold/util" | ||
| ) | ||
|
|
||
| func AddGcbBuildEnv(ctx context.Context, out io.Writer, opts inspect.Options) error { | ||
| formatter := inspect.OutputFormatter(out, opts.OutFormat) | ||
| cfgs, err := inspect.ConfigSetFunc(config.SkaffoldOptions{ConfigurationFile: opts.Filename, ConfigurationFilter: opts.Modules, SkipConfigDefaults: true, MakePathsAbsolute: util.BoolPtr(false)}) | ||
| if err != nil { | ||
| return formatter.WriteErr(err) | ||
| } | ||
| if opts.Profile == "" { | ||
| // empty profile flag implies that the new build env needs to be added to the default pipeline. | ||
| // for these cases, don't add the new env definition to any configs imported as dependencies. | ||
| cfgs = cfgs.SelectRootConfigs() | ||
| for _, cfg := range cfgs { | ||
| if cfg.Build.GoogleCloudBuild != nil && (*cfg.Build.GoogleCloudBuild != latestV1.GoogleCloudBuild{}) { | ||
| return formatter.WriteErr(inspect.BuildEnvAlreadyExists(inspect.BuildEnvs.GoogleCloudBuild, cfg.SourceFile, "")) | ||
| } | ||
| cfg.Build.GoogleCloudBuild = constructGcbDefinition(cfg.Build.GoogleCloudBuild, opts.BuildEnvOptions) | ||
| cfg.Build.LocalBuild = nil | ||
| cfg.Build.Cluster = nil | ||
| } | ||
| } else { | ||
| for _, cfg := range cfgs { | ||
| index := -1 | ||
| for i := range cfg.Profiles { | ||
| if cfg.Profiles[i].Name == opts.Profile { | ||
| index = i | ||
| break | ||
| } | ||
| } | ||
| if index < 0 { | ||
| index = len(cfg.Profiles) | ||
| cfg.Profiles = append(cfg.Profiles, latestV1.Profile{Name: opts.Profile}) | ||
| } | ||
| if cfg.Profiles[index].Build.GoogleCloudBuild != nil && (*cfg.Profiles[index].Build.GoogleCloudBuild != latestV1.GoogleCloudBuild{}) { | ||
| return formatter.WriteErr(inspect.BuildEnvAlreadyExists(inspect.BuildEnvs.GoogleCloudBuild, cfg.SourceFile, opts.Profile)) | ||
| } | ||
| cfg.Profiles[index].Build.GoogleCloudBuild = constructGcbDefinition(cfg.Profiles[index].Build.GoogleCloudBuild, opts.BuildEnvOptions) | ||
| cfg.Profiles[index].Build.LocalBuild = nil | ||
| cfg.Profiles[index].Build.Cluster = nil | ||
|
|
||
| addProfileActivationStanza(cfg, opts.Profile) | ||
| } | ||
| } | ||
| return inspect.MarshalConfigSet(cfgs) | ||
| } | ||
|
|
||
| func constructGcbDefinition(existing *latestV1.GoogleCloudBuild, opts inspect.BuildEnvOptions) *latestV1.GoogleCloudBuild { | ||
| var b latestV1.GoogleCloudBuild | ||
| if existing != nil { | ||
| b = *existing | ||
| } | ||
| if opts.Concurrency >= 0 { | ||
| b.Concurrency = opts.Concurrency | ||
| } | ||
| if opts.DiskSizeGb > 0 { | ||
| b.DiskSizeGb = opts.DiskSizeGb | ||
| } | ||
| if opts.MachineType != "" { | ||
| b.MachineType = opts.MachineType | ||
| } | ||
| if opts.ProjectID != "" { | ||
| b.ProjectID = opts.ProjectID | ||
| } | ||
| if opts.Timeout != "" { | ||
| b.Timeout = opts.Timeout | ||
| } | ||
| return &b | ||
| } | ||
|
|
||
| func addProfileActivationStanza(cfg *parser.SkaffoldConfigEntry, profileName string) { | ||
| for i := range cfg.Dependencies { | ||
| if cfg.Dependencies[i].GitRepo != nil { | ||
| // setup profile activation stanza only for local config dependencies | ||
| continue | ||
| } | ||
| for j := range cfg.Dependencies[i].ActiveProfiles { | ||
| if cfg.Dependencies[i].ActiveProfiles[j].Name == profileName { | ||
| if !util.StrSliceContains(cfg.Dependencies[i].ActiveProfiles[j].ActivatedBy, profileName) { | ||
| cfg.Dependencies[i].ActiveProfiles[j].ActivatedBy = append(cfg.Dependencies[i].ActiveProfiles[j].ActivatedBy, profileName) | ||
| } | ||
| return | ||
| } | ||
| } | ||
| cfg.Dependencies[i].ActiveProfiles = append(cfg.Dependencies[i].ActiveProfiles, latestV1.ProfileDependency{Name: profileName, ActivatedBy: []string{profileName}}) | ||
| } | ||
| } |
Oops, something went wrong.